OpenVPN: Show indication when OpenVPN certificates expire

This will help with #11742 - OpenVPN: No method to replace expired
certificates.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Acked-by: Peter Müller <peter.mueller@ipfire.org>

diff --git a/doc/language_issues.en b/doc/language_issues.en
index 08fda35b7c33fbd893a2c19beb5ec3ff192a84c3..131278a2042132b91b25d6ee25e8db38359e61c2 100644 (file)
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -1413,6 +1413,8 @@ WARNING: untranslated string: only digits allowed in max retries field = Only di
 WARNING: untranslated string: only digits allowed in the idle timeout = Only digits allowed in the idle timeout.
 WARNING: untranslated string: open connections = Open Connections
 WARNING: untranslated string: openssl produced an error = OpenSSL produced an error
+WARNING: untranslated string: openvpn cert expires soon = Expires Soon
+WARNING: untranslated string: openvpn cert has expired = Expired
 WARNING: untranslated string: openvpn client = OpenVPN client
 WARNING: untranslated string: openvpn default = Default
 WARNING: untranslated string: openvpn destination port used = The destination port is already used by another OpenVPN server.

diff --git a/doc/language_issues.es b/doc/language_issues.es
index ffe423bd1d6a118d89aa9c2520829be62d4f7b15..501f607647e1860ac5989137d60fe91fbf742b3f 100644 (file)
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -982,6 +982,8 @@ WARNING: untranslated string: hardware vulnerabilities = Hardware Vulnerabilitie
 WARNING: untranslated string: info messages = unknown string
 WARNING: untranslated string: invalid ip or hostname = Invalid IP Address or Hostname
 WARNING: untranslated string: no data = unknown string
+WARNING: untranslated string: openvpn cert expires soon = Expires Soon
+WARNING: untranslated string: openvpn cert has expired = Expired
 WARNING: untranslated string: pakfire ago = ago.
 WARNING: untranslated string: route config changed = unknown string
 WARNING: untranslated string: routing config added = unknown string

diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index cb06f0ab3908f75fb84e6ef0f0cc6955c82a7dfe..bbf686b74e9a7a9c97fc3e30f656a384b3aa26a3 100644 (file)
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -946,6 +946,8 @@ WARNING: untranslated string: guardian logtarget_file = unknown string
 WARNING: untranslated string: guardian logtarget_syslog = unknown string
 WARNING: untranslated string: guardian no entries = unknown string
 WARNING: untranslated string: guardian service = unknown string
+WARNING: untranslated string: openvpn cert expires soon = Expires Soon
+WARNING: untranslated string: openvpn cert has expired = Expired
 WARNING: untranslated string: pakfire ago = ago.
 WARNING: untranslated string: route config changed = unknown string
 WARNING: untranslated string: routing config added = unknown string

diff --git a/doc/language_issues.it b/doc/language_issues.it
index dd794f57aa5c8784e5dda4ff21c1416680b173df..f9fa74de1117ae3265807fd25d3a976df991dcf5 100644 (file)
--- a/doc/language_issues.it
+++ b/doc/language_issues.it
@@ -1174,6 +1174,8 @@ WARNING: untranslated string: one month = One Month
 WARNING: untranslated string: one week = One Week
 WARNING: untranslated string: one year = One Year
 WARNING: untranslated string: open connections = Open Connections
+WARNING: untranslated string: openvpn cert expires soon = Expires Soon
+WARNING: untranslated string: openvpn cert has expired = Expired
 WARNING: untranslated string: optional = Optional
 WARNING: untranslated string: otp qrcode = OTP QRCode
 WARNING: untranslated string: outgoing compression in bytes per second = Outgoing compression

diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index 4f100abd2578da7608cbd3f34e8531febaab5c79..d406e72994fb0df1a486fce2784eeb59052cfdd1 100644 (file)
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -1197,6 +1197,8 @@ WARNING: untranslated string: one month = One Month
 WARNING: untranslated string: one week = One Week
 WARNING: untranslated string: one year = One Year
 WARNING: untranslated string: open connections = Open Connections
+WARNING: untranslated string: openvpn cert expires soon = Expires Soon
+WARNING: untranslated string: openvpn cert has expired = Expired
 WARNING: untranslated string: optional = Optional
 WARNING: untranslated string: otp qrcode = OTP QRCode
 WARNING: untranslated string: outgoing compression in bytes per second = Outgoing compression

diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index e91e62c5b34b951d270bf61d8540dfff27b3e298..54aba0c6613dd47899ecfbad40ef9094e8643256 100644 (file)
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -1355,6 +1355,8 @@ WARNING: untranslated string: one month = One Month
 WARNING: untranslated string: one week = One Week
 WARNING: untranslated string: one year = One Year
 WARNING: untranslated string: open connections = Open Connections
+WARNING: untranslated string: openvpn cert expires soon = Expires Soon
+WARNING: untranslated string: openvpn cert has expired = Expired
 WARNING: untranslated string: openvpn default = Default
 WARNING: untranslated string: openvpn destination port used = The destination port is already used by another OpenVPN server.
 WARNING: untranslated string: openvpn fragment allowed with udp = Using fragment is only allowed when using the UDP protocol.

diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index 7dd1a63d7b4302bffd3f334739320529ca6de41a..05ee8461e945c04ec3db94a8ee2399490b7424e6 100644 (file)
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -1353,6 +1353,8 @@ WARNING: untranslated string: one month = One Month
 WARNING: untranslated string: one week = One Week
 WARNING: untranslated string: one year = One Year
 WARNING: untranslated string: open connections = Open Connections
+WARNING: untranslated string: openvpn cert expires soon = Expires Soon
+WARNING: untranslated string: openvpn cert has expired = Expired
 WARNING: untranslated string: openvpn default = Default
 WARNING: untranslated string: openvpn destination port used = The destination port is already used by another OpenVPN server.
 WARNING: untranslated string: openvpn fragment allowed with udp = Using fragment is only allowed when using the UDP protocol.

diff --git a/doc/language_issues.tr b/doc/language_issues.tr
index 3443b1f1a0adae3ba9e1703f38d49a6f8d49cdd3..6871ea35aa59a81b088b61046c64b0fd2b878319 100644 (file)
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -1091,6 +1091,8 @@ WARNING: untranslated string: no entries = No entries at the moment.
 WARNING: untranslated string: not affected = Not Affected
 WARNING: untranslated string: not validating = Not validating
 WARNING: untranslated string: open connections = Open Connections
+WARNING: untranslated string: openvpn cert expires soon = Expires Soon
+WARNING: untranslated string: openvpn cert has expired = Expired
 WARNING: untranslated string: optional = Optional
 WARNING: untranslated string: otp qrcode = OTP QRCode
 WARNING: untranslated string: ovpn connection name = Connection Name

diff --git a/doc/language_missings b/doc/language_missings
index 78b9e8a2d5ed626a3899b46e9da6769ab7ffd8d0..956303c927df5f932e29f7714c82f689929d2bc0 100644 (file)
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -107,6 +107,8 @@
 < dns servers
 < hardware vulnerabilities
 < invalid ip or hostname
+< openvpn cert expires soon
+< openvpn cert has expired
 < service boot setting unavailable
 < transport mode does not support vti
 < wlanap
@@ -123,6 +125,12 @@
 < dhcp fixed ip address in dynamic range
 < g.dtm
 < g.lite
+< guaranteed bandwidth
+< retbleed
+< service boot setting unavailable
+< show dh
+< openvpn cert expires soon
+< openvpn cert has expired
 < upload fcdsl.o
 ############################################################################
 # Checking cgi-bin translations for language: it                           #
@@ -467,6 +475,8 @@
 < one week
 < one year
 < open connections
+< openvpn cert expires soon
+< openvpn cert has expired
 < optional
 < otp qrcode
 < outgoing compression in bytes per second
@@ -995,6 +1005,8 @@
 < one week
 < one year
 < open connections
+< openvpn cert expires soon
+< openvpn cert has expired
 < optional
 < otp qrcode
 < outgoing compression in bytes per second
@@ -1828,6 +1840,8 @@
 < one week
 < one year
 < open connections
+< openvpn cert expires soon
+< openvpn cert has expired
 < openvpn default
 < openvpn destination port used
 < openvpn disabled
@@ -2812,6 +2826,8 @@
 < one week
 < one year
 < open connections
+< openvpn cert expires soon
+< openvpn cert has expired
 < openvpn default
 < openvpn destination port used
 < openvpn disabled
@@ -3317,6 +3333,8 @@
 < not validating
 < okay
 < open connections
+< openvpn cert expires soon
+< openvpn cert has expired
 < optional
 < otp qrcode
 < ovpn connection name

diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi
index 42a7354fc9368efc249c24613dab2286b96de46a..87bda4f1efda44c926f04bc8393283e23637a6af 100644 (file)
--- a/html/cgi-bin/ovpnmain.cgi
+++ b/html/cgi-bin/ovpnmain.cgi
@@ -33,6 +33,7 @@ use File::Temp qw/ tempfile tempdir /;
 use strict;
 use Archive::Zip qw(:ERROR_CODES :CONSTANTS);
 use Sort::Naturally;
+use Date::Parse;
 require '/var/ipfire/general-functions.pl';
 require "${General::swroot}/lang.pl";
 require "${General::swroot}/header.pl";
@@ -5352,31 +5353,45 @@ END
 END
                }
        if ($confighash{$key}[0] eq 'on') { $gif = 'on.gif'; } else { $gif = 'off.gif'; }
-       if ($id % 2) {
-               print "<tr>";
-               $col="bgcolor='$color{'color20'}'";
-       } else {
-               print "<tr>";
-               $col="bgcolor='$color{'color22'}'";
-       }
-       print "<td align='center' nowrap='nowrap' $col>$confighash{$key}[1]</td>";
-       print "<td align='center' nowrap='nowrap' $col>" . $Lang::tr{"$confighash{$key}[3]"} . " (" . $Lang::tr{"$confighash{$key}[4]"} . ")</td>";
-       #if ($confighash{$key}[4] eq 'cert') {
-           #print "<td align='left' nowrap='nowrap'>$confighash{$key}[2]</td>";
-       #} else {
-           #print "<td align='left'>&nbsp;</td>";
-       #}
-       my @cavalid = &General::system_output("/usr/bin/openssl", "x509", "-text", "-in", "${General::swroot}/ovpn/certs/$confighash{$key}[1]cert.pem");
-       my $cavalid;
 
+       # Fetch information about the certificate
+       my @cavalid = &General::system_output("/usr/bin/openssl", "x509", "-text",
+               "-in", "${General::swroot}/ovpn/certs/$confighash{$key}[1]cert.pem");
+
+       my $expiryDate = 0;
+
+       # Parse the certificate information
        foreach my $line (@cavalid) {
                if ($line =~ /Not After : (.*)[\n]/) {
-                       $cavalid    = $1;
-
+                       $expiryDate = &Date::Parse::str2time($1);
                        last;
                }
        }
 
+       # Calculate the remaining time
+       my $remainingTime = $expiryDate - time();
+
+       # Create some simple booleans to check the status
+       my $hasExpired = ($remainingTime <= 0);
+       my $expiresSoon = ($remainingTime <= 30 * 24 * 3600);
+
+       print "<tr>";
+
+       if ($hasExpired || $expiresSoon) {
+               $col="bgcolor='$color{'color14'}'";
+       } elsif ($id % 2) {
+               $col="bgcolor='$color{'color20'}'";
+       } else {
+               $col="bgcolor='$color{'color22'}'";
+       }
+       print "<td align='center' nowrap='nowrap' $col>$confighash{$key}[1]";
+       if ($hasExpired) {
+               print " ($Lang::tr{'openvpn cert has expired'})";
+       } elsif ($expiresSoon) {
+               print " ($Lang::tr{'openvpn cert expires soon'})";
+       }
+       print "</td>";
+       print "<td align='center' nowrap='nowrap' $col>" . $Lang::tr{"$confighash{$key}[3]"} . " (" . $Lang::tr{"$confighash{$key}[4]"} . ")</td>";
        print "<td align='center' $col>$confighash{$key}[25]</td>";
        $col1="bgcolor='${Header::colourred}'";
        my $active = "<b><font color='#FFFFFF'>$Lang::tr{'capsclosed'}</font></b>";

diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 5fbab2ff8a71b70624e8d1f04c74ffe4017f49ce..a57b62ad8f0dd893500cca5310dfdbf959664a6c 100644 (file)
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -1884,6 +1884,8 @@
 'open connections' => 'Offene Verbindungen',
 'open to all' => 'Überschreibe externen Zugang zu ALL',
 'openssl produced an error' => 'OpenSSL hat einen Fehler verursacht',
+'openvpn cert expires soon' => 'Läuft bald ab',
+'openvpn cert has expired' => 'Abgelaufen',
 'openvpn client' => 'OpenVPN-Client',
 'openvpn default' => 'Vorgabe',
 'openvpn destination port used' => 'Der Zielport wird bereits von einer anderen OpenVPN-Server-Instanz genutzt.',

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 5a72f53b8c8b37fa6f36d53160dcf5f8af4c9dcd..cc7704e9dcf1c06dbbaccbb174743c197d2195a7 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -1941,6 +1941,8 @@
 'open connections' => 'Open Connections',
 'open to all' => 'Override external access to ALL',
 'openssl produced an error' => 'OpenSSL produced an error',
+'openvpn cert expires soon' => 'Expires Soon',
+'openvpn cert has expired' => 'Expired',
 'openvpn client' => 'OpenVPN client',
 'openvpn default' => 'Default',
 'openvpn destination port used' => 'The destination port is already used by another OpenVPN server.',