1berry/webmin
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add ability to clean all modules with websockets=1 on the .info

Browse Source
This commit is contained in:
Ilia Ross 2024-06-04 19:55:25 +03:00
parent af912d9539
commit 71e37adfed
No known key found for this signature in database
GPG Key ID: 121E166DD9C821AB
4 changed files with 32 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
WebminCore.pm
View File

File diff suppressed because one or more lines are too long

5
cron/cron-lib.pl
View File

@ -1605,9 +1605,8 @@ foreach my $f (readdir(DIR)) {
closedir(DIR);
# Cleanup old websockets
if (&foreign_check("xterm")) {
&foreign_require("xterm");
&xterm::cleanup_miniserv_websockets();
foreach (&get_miniserv_websockets_modules) {
&cleanup_miniserv_websockets(undef, $_);
}
}

44
web-lib-funcs.pl
View File

@ -13522,11 +13522,13 @@ my $dir = $var_directory."/locks/".$$;
return $dir;
}
# allocate_miniserv_websocket()
# allocate_miniserv_websocket([module])
# Allocate a new websocket and
# stores it miniserv.conf file
sub allocate_miniserv_websocket
{
my ($module) = @_;
$module ||= $module_name;
# Find ports already in use
&lock_file(&get_miniserv_config_file());
my %miniserv;
@ -13548,8 +13550,7 @@ while(1) {
}
$port++;
}
my $module_theme_name = $module_name || $current_theme;
my $wspath = "/$module_theme_name/ws-".$port;
my $wspath = "/$module/ws-".$port;
my $now = time();
$miniserv{'websockets_'.$wspath} = "host=127.0.0.1 port=$port wspath=/ user=$remote_user time=$now";
&put_miniserv_config(\%miniserv);
@ -13558,11 +13559,12 @@ $miniserv{'websockets_'.$wspath} = "host=127.0.0.1 port=$port wspath=/ user=$rem
return $port;
}
# get_miniserv_websocket_url(port, [host])
# get_miniserv_websocket_url(port, [host], [module])
# Returns the URL for a websocket
sub get_miniserv_websocket_url
{
my ($port, $host) = @_;
my ($port, $host, $module) = @_;
$module ||= $module_name;
my $ws_proto = lc($ENV{'HTTPS'}) eq 'on' ? 'wss' : 'ws';
my %miniserv;
&get_miniserv_config(\%miniserv);
@ -13574,21 +13576,20 @@ if ($http_host_conf) {
$http_host_conf =~ s/[\/]+$//g;
}
my $http_host = $http_host_conf || "$ws_proto://$ENV{'HTTP_HOST'}";
return "$http_host/$module_name/ws-$port";
return "$http_host/$module/ws-$port";
}
# remove_miniserv_websocket(port)
# Remove old websocket
# from miniserv.conf
# remove_miniserv_websocket(port, [module])
# Remove old websocket from miniserv.conf
sub remove_miniserv_websocket
{
my ($port) = @_;
my ($port, $module) = @_;
$module ||= $module_name;
my %miniserv;
if ($port) {
&lock_file(&get_miniserv_config_file());
&get_miniserv_config(\%miniserv);
my $module_theme_name = $module_name || $current_theme;
my $wspath = "/$module_theme_name/ws-".$port;
my $wspath = "/$module/ws-".$port;
if ($miniserv{'websockets_'.$wspath}) {
delete($miniserv{'websockets_'.$wspath});
&put_miniserv_config(\%miniserv);
@ -13598,21 +13599,21 @@ if ($port) {
}
}
# cleanup_miniserv_websockets([&skip-ports])
# cleanup_miniserv_websockets([&skip-ports], [module])
# Called by scheduled status collection to remove any
# websockets in miniserv.conf that are no longer used
sub cleanup_miniserv_websockets
{
my ($skip) = @_;
my ($skip, $module) = @_;
$skip ||= [ ];
$module ||= $module_name;
&lock_file(&get_miniserv_config_file());
my %miniserv;
&get_miniserv_config(\%miniserv);
my $now = time();
my @clean;
my $module_theme_name = $module_name || $current_theme;
foreach my $k (keys %miniserv) {
$k =~ /^websockets_\/$module_theme_name\/ws-(\d+)$/ || next;
$k =~ /^websockets_\/$module\/ws-(\d+)$/ || next;
my $port = $1;
next if (&indexof($port, @$skip) >= 0);
my $when = 0;
@ -13643,6 +13644,17 @@ if (@clean) {
&unlock_file(&get_miniserv_config_file());
}
# get_miniserv_websockets_modules()
# Returns a list of modules and themes that use websockets
sub get_miniserv_websockets_modules
{
my @rv;
foreach (&get_all_module_infos(), &list_themes()) {
push(@rv, $_->{'dir'}) if ($_->{'websockets'});
}
return @rv;
}
$done_web_lib_funcs = 1;
1;

1
xterm/module.info
View File

@ -1,3 +1,4 @@
desc=Terminal
name=xterm
longdesc=Access the shell on your system without the need for a separate SSH client, using Xterm.js over Webmin WebSockets
websockets=1