diff -urN smeserver-smeadmin-1.6.old/root/etc/e-smith/web/functions/smeadmin smeserver-smeadmin-1.6/root/etc/e-smith/web/functions/smeadmin --- smeserver-smeadmin-1.6.old/root/etc/e-smith/web/functions/smeadmin 2022-07-17 22:35:59.000000000 +0400 +++ smeserver-smeadmin-1.6/root/etc/e-smith/web/functions/smeadmin 2022-07-18 00:17:05.275000000 +0400 @@ -44,6 +44,7 @@ my $imgdir="/etc/e-smith/web/panels/manager/html/smeadmin"; #my $maxping=0.1; my $maxping=0.5; +my $SshPort; #---------------------------------------------------------------- #declaration des fonctions #webpages-funcs @@ -550,7 +551,9 @@ foreach my $key (keys(%params)){ $params{$key} = $smeadmindb->prop($key); } -} + + $SshPort = $smedb->get('sshd')->prop('TCPPort'); +} #---------------------------------------------------------------- #affiche le formulaire permettant de parametrer smeadmin @@ -870,7 +873,7 @@ $q->Tr($q->td(gettext("Test ftp service")), $q->td($q->a ({href => "$progname?state=advanced&service=ftp"},"telnet 21\n"))), $q->Tr($q->td(gettext("Test ssh service")), - $q->td($q->a ({href => "$progname?state=advanced&service=ssh"},"telnet 22"))), + $q->td($q->a ({href => "$progname?state=advanced&service=ssh"},"telnet ${SshPort}\n"))), $q->Tr($q->td(gettext("Test pop service")), $q->td($q->a ({href => "$progname?state=advanced&service=pop"},"telnet 110\n"))), $q->Tr($q->td(gettext("Test smtp service")), @@ -933,8 +936,8 @@ } elsif ($q->param('service') eq 'ssh') { - print $q->p($q->b(sprintf(gettext("Execution of 'echo \"hello\" | nc %s 22' (ssh opened to the external network):"),$ip))),$q->br; - foreach (`/bin/echo "hello" | /usr/bin/nc $ip 22 2>&1`) + print $q->p($q->b(sprintf(gettext("Execution of 'echo \"hello\" | nc %s %s' (ssh opened to the external network):"),$ip,$SshPort))),$q->br; + foreach (`/bin/echo "hello" | /usr/bin/nc $ip $SshPort 2>&1`) { print $q->p($_); } @@ -1633,7 +1636,7 @@ "DEF:ftp=$rrddir/sessions.rrd:ftp:AVERAGE", "DEF:maxftp=$rrddir/sessions.rrd:ftp:MAX", "DEF:minftp=$rrddir/sessions.rrd:ftp:MIN", "DEF:netbios=$rrddir/sessions.rrd:netbios:AVERAGE", "DEF:maxnetbios=$rrddir/sessions.rrd:netbios:MAX", "DEF:minnetbios=$rrddir/sessions.rrd:netbios:MIN", "DEF:afp=$rrddir/sessions.rrd:afp:AVERAGE", "DEF:maxafp=$rrddir/sessions.rrd:afp:MAX", "DEF:minafp=$rrddir/sessions.rrd:afp:MIN", - "COMMENT: ","LINE2:ssh#0000FF:ssh (22)","LINE2:ftp#FF2222:ftp (21)","LINE2:vpn#AA3300:vpn (1723)", + "COMMENT: ","LINE2:ssh#0000FF:ssh ($SshPort)","LINE2:ftp#FF2222:ftp (21)","LINE2:vpn#AA3300:vpn (1723)", "LINE2:netbios#33B010:netbios (139)","LINE2:afp#FFD700:afp (548)","COMMENT:\\n", "COMMENT:Max\\: ","GPRINT:maxssh:MAX:%4.0lf ","GPRINT:maxftp:MAX:%4.0lf ","GPRINT:maxvpn:MAX:%4.0lf ", "GPRINT:maxnetbios:MAX:%4.0lf ","GPRINT:maxafp:MAX:%4.0lf ","COMMENT:\\n", diff -urN smeserver-smeadmin-1.6.old/root/usr/bin/smeadmind smeserver-smeadmin-1.6/root/usr/bin/smeadmind --- smeserver-smeadmin-1.6.old/root/usr/bin/smeadmind 2022-07-17 22:35:59.000000000 +0400 +++ smeserver-smeadmin-1.6/root/usr/bin/smeadmind 2022-07-17 23:04:00.882000000 +0400 @@ -29,6 +29,8 @@ #variables d'environnement du serveur my ($DomainName,$SystemName,$SystemMode,$InternalInterface,$ExternalInterface,$InternalIP,$ExternalIP,@MailDomainsMatch); +my $SshPort; + #---------------------------------- #hash faisant correspondre la cle (nom du param) a sa valeur [ICI, CE SONT LES VALEURS PAR DEFAUT !!] #idem dans le panel /etc-e-smith/web/functions/smeadmin @@ -372,6 +374,8 @@ my $InternalIP = $smedb->get("LocalIP")->value; $InternalInterface = $smedb->get("InternalInterface")->prop('Name'); + $SshPort = $smedb->get("sshd")->prop('TCPPort'); + my $smeadmindb = $smedb->get('smeadmind') || die "Error opening smeadmind db\n"; foreach my $key (keys(%params)){ @@ -1252,7 +1256,7 @@ # par contre, a surveiller le passage de samba du port 139 a 445 my @netstat=`/bin/netstat --inet --tcp --numeric`; foreach (@netstat) { - if (/tcp\s+\d+\s+\d+\s\S+:22\s+\S+\s+ESTABLISHED/){$sessions_ssh++;} + if (/tcp\s+\d+\s+\d+\s\S+:${SshPort}\s+\S+\s+ESTABLISHED/){$sessions_ssh++;} if (/tcp\s+\d+\s+\d+\s\S+:21\s+\S+\s+ESTABLISHED/){$sessions_ftp++;} if (/tcp\s+\d+\s+\d+\s\S+:1723\s+\S+\s+ESTABLISHED/){$sessions_vpn++;} if (/tcp\s+\d+\s+\d+\s\S+:548\s+\S+\s+ESTABLISHED/){$sessions_afp++;} @@ -1640,7 +1644,7 @@ "\n#who\n", `who`, "#netstat -n |grep :22\n", - `netstat -n |grep :22`; + `netstat -n |grep :${SshPort}`; }], [ "($params{'MaxFtp'} && $sessions_ftp >= $params{'MaxFtp'})",