SMT: Show status on vulnerabilities.cgi

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/doc/language_issues.de b/doc/language_issues.de
index f7904ae3f369a2874fd3fafe9cc39046bf6d4785..e72ad7e2b0619ddb2a993dd1647a05a4a6eb6d93 100644 (file)
--- a/doc/language_issues.de
+++ b/doc/language_issues.de
@@ -811,6 +811,9 @@ WARNING: untranslated string: routing config added = unknown string
 WARNING: untranslated string: routing config changed = unknown string
 WARNING: untranslated string: routing table = unknown string
 WARNING: untranslated string: show tls-auth key = Show tls-auth key
 WARNING: untranslated string: routing config changed = unknown string
 WARNING: untranslated string: routing table = unknown string
 WARNING: untranslated string: show tls-auth key = Show tls-auth key

+WARNING: untranslated string: smt disabled = unknown string
+WARNING: untranslated string: smt enabled = unknown string
+WARNING: untranslated string: smt not supported = unknown string

 WARNING: untranslated string: spectre variant 1 = Spectre Variant 1
 WARNING: untranslated string: spectre variant 2 = Spectre Variant 2
 WARNING: untranslated string: spectre variant 4 = Spectre Variant 4
 WARNING: untranslated string: spectre variant 1 = Spectre Variant 1
 WARNING: untranslated string: spectre variant 2 = Spectre Variant 2
 WARNING: untranslated string: spectre variant 4 = Spectre Variant 4

diff --git a/doc/language_issues.en b/doc/language_issues.en
index cc0e99dd2cc15cc6ffb11460df269cc5c150e19c..1268039971d8e7d75fdbff96e3594ea84d511f50 100644 (file)
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -1631,6 +1631,9 @@ WARNING: untranslated string: smartwarn2 = reports S.M.A.R.T. error
 WARNING: untranslated string: smbrestart = Restart samba
 WARNING: untranslated string: smbstart = Start samba
 WARNING: untranslated string: smbstop = Stop samba
 WARNING: untranslated string: smbrestart = Restart samba
 WARNING: untranslated string: smbstart = Start samba
 WARNING: untranslated string: smbstop = Stop samba

+WARNING: untranslated string: smt disabled = unknown string
+WARNING: untranslated string: smt enabled = unknown string
+WARNING: untranslated string: smt not supported = unknown string

 WARNING: untranslated string: snat new source ip address = New source IP address
 WARNING: untranslated string: socket options = Socket options
 WARNING: untranslated string: software version = Software Version
 WARNING: untranslated string: snat new source ip address = New source IP address
 WARNING: untranslated string: socket options = Socket options
 WARNING: untranslated string: software version = Software Version

diff --git a/doc/language_issues.es b/doc/language_issues.es
index 7f02f588ea595ea17077e58a40e56d8666806e7b..f015ac7dfd2803622ab17225b0c8c4b1734a45c7 100644 (file)
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -1224,6 +1224,9 @@ WARNING: untranslated string: search = Search
 WARNING: untranslated string: server restart = You are not able to save any changes while the OpenVPN server is running.
 WARNING: untranslated string: show dh = Show Diffie-Hellman parameters
 WARNING: untranslated string: show tls-auth key = Show tls-auth key
 WARNING: untranslated string: server restart = You are not able to save any changes while the OpenVPN server is running.
 WARNING: untranslated string: show dh = Show Diffie-Hellman parameters
 WARNING: untranslated string: show tls-auth key = Show tls-auth key

+WARNING: untranslated string: smt disabled = unknown string
+WARNING: untranslated string: smt enabled = unknown string
+WARNING: untranslated string: smt not supported = unknown string

 WARNING: untranslated string: snat new source ip address = New source IP address
 WARNING: untranslated string: software version = Software Version
 WARNING: untranslated string: source ip country = Source IP Country
 WARNING: untranslated string: snat new source ip address = New source IP address
 WARNING: untranslated string: software version = Software Version
 WARNING: untranslated string: source ip country = Source IP Country

diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index 839802f000873fedb2f83824155fad017ff88087..0503c82412377ea546e9c45d0c114c47129510c3 100644 (file)
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -866,6 +866,9 @@ WARNING: untranslated string: route config changed = unknown string
 WARNING: untranslated string: routing config added = unknown string
 WARNING: untranslated string: routing config changed = unknown string
 WARNING: untranslated string: routing table = unknown string
 WARNING: untranslated string: routing config added = unknown string
 WARNING: untranslated string: routing config changed = unknown string
 WARNING: untranslated string: routing table = unknown string

+WARNING: untranslated string: smt disabled = unknown string
+WARNING: untranslated string: smt enabled = unknown string
+WARNING: untranslated string: smt not supported = unknown string

 WARNING: untranslated string: spectre variant 1 = Spectre Variant 1
 WARNING: untranslated string: spectre variant 2 = Spectre Variant 2
 WARNING: untranslated string: spectre variant 4 = Spectre Variant 4
 WARNING: untranslated string: spectre variant 1 = Spectre Variant 1
 WARNING: untranslated string: spectre variant 2 = Spectre Variant 2
 WARNING: untranslated string: spectre variant 4 = Spectre Variant 4

diff --git a/doc/language_issues.it b/doc/language_issues.it
index b79e5f3276d931f022ac8ddfdc6614c7523e087a..ac213f0b1e9eba654b50b7ea99168af90c83a71c 100644 (file)
--- a/doc/language_issues.it
+++ b/doc/language_issues.it
@@ -989,6 +989,9 @@ WARNING: untranslated string: routing table = unknown string
 WARNING: untranslated string: samba join a domain = Join a domain
 WARNING: untranslated string: samba join domain = Join domain
 WARNING: untranslated string: search = Search
 WARNING: untranslated string: samba join a domain = Join a domain
 WARNING: untranslated string: samba join domain = Join domain
 WARNING: untranslated string: search = Search

+WARNING: untranslated string: smt disabled = unknown string
+WARNING: untranslated string: smt enabled = unknown string
+WARNING: untranslated string: smt not supported = unknown string

 WARNING: untranslated string: spectre variant 1 = Spectre Variant 1
 WARNING: untranslated string: spectre variant 2 = Spectre Variant 2
 WARNING: untranslated string: spectre variant 4 = Spectre Variant 4
 WARNING: untranslated string: spectre variant 1 = Spectre Variant 1
 WARNING: untranslated string: spectre variant 2 = Spectre Variant 2
 WARNING: untranslated string: spectre variant 4 = Spectre Variant 4

diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index cdfde8a5582bd9921b06a50057228739d1df6c96..741c1c39fff163eccc44316579cade4e3d20cee7 100644 (file)
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -1028,6 +1028,9 @@ WARNING: untranslated string: samba join domain = Join domain
 WARNING: untranslated string: search = Search
 WARNING: untranslated string: show dh = Show Diffie-Hellman parameters
 WARNING: untranslated string: show tls-auth key = Show tls-auth key
 WARNING: untranslated string: search = Search
 WARNING: untranslated string: show dh = Show Diffie-Hellman parameters
 WARNING: untranslated string: show tls-auth key = Show tls-auth key

+WARNING: untranslated string: smt disabled = unknown string
+WARNING: untranslated string: smt enabled = unknown string
+WARNING: untranslated string: smt not supported = unknown string

 WARNING: untranslated string: software version = Software Version
 WARNING: untranslated string: source ip country = Source IP Country
 WARNING: untranslated string: spectre variant 1 = Spectre Variant 1
 WARNING: untranslated string: software version = Software Version
 WARNING: untranslated string: source ip country = Source IP Country
 WARNING: untranslated string: spectre variant 1 = Spectre Variant 1

diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index 7f02f588ea595ea17077e58a40e56d8666806e7b..f015ac7dfd2803622ab17225b0c8c4b1734a45c7 100644 (file)
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -1224,6 +1224,9 @@ WARNING: untranslated string: search = Search
 WARNING: untranslated string: server restart = You are not able to save any changes while the OpenVPN server is running.
 WARNING: untranslated string: show dh = Show Diffie-Hellman parameters
 WARNING: untranslated string: show tls-auth key = Show tls-auth key
 WARNING: untranslated string: server restart = You are not able to save any changes while the OpenVPN server is running.
 WARNING: untranslated string: show dh = Show Diffie-Hellman parameters
 WARNING: untranslated string: show tls-auth key = Show tls-auth key

+WARNING: untranslated string: smt disabled = unknown string
+WARNING: untranslated string: smt enabled = unknown string
+WARNING: untranslated string: smt not supported = unknown string

 WARNING: untranslated string: snat new source ip address = New source IP address
 WARNING: untranslated string: software version = Software Version
 WARNING: untranslated string: source ip country = Source IP Country
 WARNING: untranslated string: snat new source ip address = New source IP address
 WARNING: untranslated string: software version = Software Version
 WARNING: untranslated string: source ip country = Source IP Country

diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index 26bd7b26b71f5f2fe99254c3e11f684de83ccc80..f8f4e105148a87ae3329a11441bd66aafa54af85 100644 (file)
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -1220,6 +1220,9 @@ WARNING: untranslated string: search = Search
 WARNING: untranslated string: server restart = You are not able to save any changes while the OpenVPN server is running.
 WARNING: untranslated string: show dh = Show Diffie-Hellman parameters
 WARNING: untranslated string: show tls-auth key = Show tls-auth key
 WARNING: untranslated string: server restart = You are not able to save any changes while the OpenVPN server is running.
 WARNING: untranslated string: show dh = Show Diffie-Hellman parameters
 WARNING: untranslated string: show tls-auth key = Show tls-auth key

+WARNING: untranslated string: smt disabled = unknown string
+WARNING: untranslated string: smt enabled = unknown string
+WARNING: untranslated string: smt not supported = unknown string

 WARNING: untranslated string: snat new source ip address = New source IP address
 WARNING: untranslated string: software version = Software Version
 WARNING: untranslated string: source ip country = Source IP Country
 WARNING: untranslated string: snat new source ip address = New source IP address
 WARNING: untranslated string: software version = Software Version
 WARNING: untranslated string: source ip country = Source IP Country

diff --git a/doc/language_issues.tr b/doc/language_issues.tr
index cd175f3a8d7ee1614d06297e9c98e0cc7442da05..2f1699d59925880ce002b8c53cf592ecd32dead5 100644 (file)
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -891,6 +891,9 @@ WARNING: untranslated string: route config changed = unknown string
 WARNING: untranslated string: routing config added = unknown string
 WARNING: untranslated string: routing config changed = unknown string
 WARNING: untranslated string: routing table = unknown string
 WARNING: untranslated string: routing config added = unknown string
 WARNING: untranslated string: routing config changed = unknown string
 WARNING: untranslated string: routing table = unknown string

+WARNING: untranslated string: smt disabled = unknown string
+WARNING: untranslated string: smt enabled = unknown string
+WARNING: untranslated string: smt not supported = unknown string

 WARNING: untranslated string: spectre variant 1 = Spectre Variant 1
 WARNING: untranslated string: spectre variant 2 = Spectre Variant 2
 WARNING: untranslated string: spectre variant 4 = Spectre Variant 4
 WARNING: untranslated string: spectre variant 1 = Spectre Variant 1
 WARNING: untranslated string: spectre variant 2 = Spectre Variant 2
 WARNING: untranslated string: spectre variant 4 = Spectre Variant 4

diff --git a/html/cgi-bin/vulnerabilities.cgi b/html/cgi-bin/vulnerabilities.cgi
index 27643d16cccf7d5bd8cdf0541d8d2f754106976f..371ffa5473d73139986070f1f15c3f677e1ad548 100644 (file)
--- a/html/cgi-bin/vulnerabilities.cgi
+++ b/html/cgi-bin/vulnerabilities.cgi
@@ -170,12 +170,20 @@ print "<form method='post' action='$ENV{'SCRIPT_NAME'}'>\n";
 
 &Header::openbox('100%', 'center', $Lang::tr{'settings'});
 
 
 &Header::openbox('100%', 'center', $Lang::tr{'settings'});
 

+my $smt_status = &smt_status();
+

 print <<END;
        <table class="tbl" width="66%">
                <tbody>
 print <<END;
        <table class="tbl" width="66%">
                <tbody>

+                       <tr>
+                               <th colspan="2" align="center">
+                                       <strong>$smt_status</strong>
+                               </th>
+                       </tr>
+

                        <tr>
                                <td width="50%" align="left">
                        <tr>
                                <td width="50%" align="left">

-                                       <strong>$Lang::tr{'enable smt'}</strong>
+                                       $Lang::tr{'enable smt'}

                                </td>
 
                                <td width="50%" align="center">
                                </td>
 
                                <td width="50%" align="center">


@@ -222,3 +230,21 @@ sub check_status($) {
 
        return $status;
 }
 
        return $status;
 }

+
+sub smt_status() {
+       open(FILE, "/sys/devices/system/cpu/smt/control");
+       my $status = <FILE>;
+       close(FILE);
+
+       chomp($status);
+
+       if ($status eq "on") {
+               return $Lang::tr{'smt enabled'};
+       } elsif (($status eq "off") || ($status eq "forceoff")) {
+               return $Lang::tr{'smt disabled'};
+       } elsif ($status eq "notsupported") {
+               return $Lang::tr{'smt not supported'};
+       }
+
+       return $status;
+}

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index a717a4f1eed8927bf7b5eb239feb4d1263b9cf33..5f32a7ab1f8b4941a9902792a998ca0708a38f93 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -17,6 +17,9 @@
 'Captive activate' => 'Activate',
 'Captive activated' => 'Activated',
 'Captive active on' => 'Activated on',
 'Captive activate' => 'Activate',
 'Captive activated' => 'Activated',
 'Captive active on' => 'Activated on',

+'smt enabled' => 'Simultaneous Multi-Threading (SMT) is enabled',
+'smt disabled' => 'Simultaneous Multi-Threading (SMT) is disabled',
+'smt not supported' => 'Simultaneous Multi-Threading (SMT) is not supported',

 'Captive agree tac' => 'I agree with the terms & conditions below.',
 'Captive auth_lic' => 'License',
 'Captive auth_vou' => 'Voucher',
 'Captive agree tac' => 'I agree with the terms & conditions below.',
 'Captive auth_lic' => 'License',
 'Captive auth_vou' => 'Voucher',