DNS: Show DNSSEC status on index page if deavtivated

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

diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-functions.pl
index 188bb7f8b6455209fe3c90a33816429807305681..5e5417d0971f4ec19f93a0d724611681e4831042 100644 (file)
--- a/config/cfgroot/general-functions.pl
+++ b/config/cfgroot/general-functions.pl
@@ -1128,4 +1128,16 @@ sub get_red_interface() {
        return $interface;
 }
 
        return $interface;
 }
 

+sub dnssec_status() {
+       my $path = "${General::swroot}/red/dnssec-status";
+
+       open(STATUS, $path) or return 0;
+       my $status = <STATUS>;
+       close(STATUS);
+
+       chomp($status);
+
+       return $status;
+}
+

 1;
 1;

diff --git a/doc/language_issues.es b/doc/language_issues.es
index def789e33305fd52156ead4b21f09bac72bd00e5..3dec2dbb360e850b4e72b4124ff92c6be2af0c39 100644 (file)
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -716,6 +716,7 @@ WARNING: untranslated string: dnsforward entries
 WARNING: untranslated string: dnsforward forward_server
 WARNING: untranslated string: dnsforward zone
 WARNING: untranslated string: dnssec aware
 WARNING: untranslated string: dnsforward forward_server
 WARNING: untranslated string: dnsforward zone
 WARNING: untranslated string: dnssec aware

+WARNING: untranslated string: dnssec disabled warning

 WARNING: untranslated string: dnssec information
 WARNING: untranslated string: dnssec not supported
 WARNING: untranslated string: dnssec validating
 WARNING: untranslated string: dnssec information
 WARNING: untranslated string: dnssec not supported
 WARNING: untranslated string: dnssec validating

diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index 25ee84103f87753a4b510e9c740431cc8d1d8f01..fa5387c8b1f46a65675b1a16f9cf8893766eeba3 100644 (file)
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -726,6 +726,7 @@ WARNING: untranslated string: dnsforward entries
 WARNING: untranslated string: dnsforward forward_server
 WARNING: untranslated string: dnsforward zone
 WARNING: untranslated string: dnssec aware
 WARNING: untranslated string: dnsforward forward_server
 WARNING: untranslated string: dnsforward zone
 WARNING: untranslated string: dnssec aware

+WARNING: untranslated string: dnssec disabled warning

 WARNING: untranslated string: dnssec information
 WARNING: untranslated string: dnssec not supported
 WARNING: untranslated string: dnssec validating
 WARNING: untranslated string: dnssec information
 WARNING: untranslated string: dnssec not supported
 WARNING: untranslated string: dnssec validating

diff --git a/doc/language_issues.it b/doc/language_issues.it
index 83268a3c734c10e338aef9dbb47c0b13eb75a5cc..09338a28abc7dbb17a3ec59273a3171a90f995cc 100644 (file)
--- a/doc/language_issues.it
+++ b/doc/language_issues.it
@@ -714,6 +714,7 @@ WARNING: untranslated string: dhcp dns update
 WARNING: untranslated string: dhcp dns update algo
 WARNING: untranslated string: dhcp dns update secret
 WARNING: untranslated string: dl client arch insecure
 WARNING: untranslated string: dhcp dns update algo
 WARNING: untranslated string: dhcp dns update secret
 WARNING: untranslated string: dl client arch insecure

+WARNING: untranslated string: dnssec disabled warning

 WARNING: untranslated string: email config
 WARNING: untranslated string: email empty field
 WARNING: untranslated string: email invalid
 WARNING: untranslated string: email config
 WARNING: untranslated string: email empty field
 WARNING: untranslated string: email invalid

diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index 54653728d49cc0a4f7731546786f9107af0302e5..3390ef368df4e8ac4df511323fa5817042d3d89f 100644 (file)
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -721,6 +721,7 @@ WARNING: untranslated string: dhcp dns update secret
 WARNING: untranslated string: dl client arch insecure
 WARNING: untranslated string: dns servers
 WARNING: untranslated string: dnssec aware
 WARNING: untranslated string: dl client arch insecure
 WARNING: untranslated string: dns servers
 WARNING: untranslated string: dnssec aware

+WARNING: untranslated string: dnssec disabled warning

 WARNING: untranslated string: dnssec information
 WARNING: untranslated string: dnssec not supported
 WARNING: untranslated string: dnssec validating
 WARNING: untranslated string: dnssec information
 WARNING: untranslated string: dnssec not supported
 WARNING: untranslated string: dnssec validating

diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index def789e33305fd52156ead4b21f09bac72bd00e5..3dec2dbb360e850b4e72b4124ff92c6be2af0c39 100644 (file)
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -716,6 +716,7 @@ WARNING: untranslated string: dnsforward entries
 WARNING: untranslated string: dnsforward forward_server
 WARNING: untranslated string: dnsforward zone
 WARNING: untranslated string: dnssec aware
 WARNING: untranslated string: dnsforward forward_server
 WARNING: untranslated string: dnsforward zone
 WARNING: untranslated string: dnssec aware

+WARNING: untranslated string: dnssec disabled warning

 WARNING: untranslated string: dnssec information
 WARNING: untranslated string: dnssec not supported
 WARNING: untranslated string: dnssec validating
 WARNING: untranslated string: dnssec information
 WARNING: untranslated string: dnssec not supported
 WARNING: untranslated string: dnssec validating

diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index 3d2b3566865bc785f25442fb3e95390375c45744..303e19b9593cfe1e170e24d2b4d92700566ac84c 100644 (file)
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -720,6 +720,7 @@ WARNING: untranslated string: dnsforward entries
 WARNING: untranslated string: dnsforward forward_server
 WARNING: untranslated string: dnsforward zone
 WARNING: untranslated string: dnssec aware
 WARNING: untranslated string: dnsforward forward_server
 WARNING: untranslated string: dnsforward zone
 WARNING: untranslated string: dnssec aware

+WARNING: untranslated string: dnssec disabled warning

 WARNING: untranslated string: dnssec information
 WARNING: untranslated string: dnssec not supported
 WARNING: untranslated string: dnssec validating
 WARNING: untranslated string: dnssec information
 WARNING: untranslated string: dnssec not supported
 WARNING: untranslated string: dnssec validating

diff --git a/doc/language_issues.tr b/doc/language_issues.tr
index 51ba00de4d0f3a02df4b51bd5c0031f2aad6330f..af17e3756c8035d6df572535fd9cc4770b7ee1bf 100644 (file)
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -706,6 +706,7 @@ WARNING: translation string unused: yearly firewallhits
 WARNING: untranslated string: Scan for Songs
 WARNING: untranslated string: application layer gateways
 WARNING: untranslated string: bytes
 WARNING: untranslated string: Scan for Songs
 WARNING: untranslated string: application layer gateways
 WARNING: untranslated string: bytes

+WARNING: untranslated string: dnssec disabled warning

 WARNING: untranslated string: fwhost cust geoipgrp
 WARNING: untranslated string: fwhost err hostip
 WARNING: untranslated string: guardian
 WARNING: untranslated string: fwhost cust geoipgrp
 WARNING: untranslated string: fwhost err hostip
 WARNING: untranslated string: guardian

diff --git a/doc/language_missings b/doc/language_missings
index acec27520de55f31d85d93cea5dc577b1007e1da..a6c7188a669201b83566c9ac185102cca1cb6a9e 100644 (file)
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -106,6 +106,7 @@
 < dnsforward forward_server
 < dnsforward zone
 < dnssec aware
 < dnsforward forward_server
 < dnsforward zone
 < dnssec aware

+< dnssec disabled warning

 < dnssec information
 < dnssec not supported
 < dnssec validating
 < dnssec information
 < dnssec not supported
 < dnssec validating


@@ -721,6 +722,7 @@
 < dnsforward forward_server
 < dnsforward zone
 < dnssec aware
 < dnsforward forward_server
 < dnsforward zone
 < dnssec aware

+< dnssec disabled warning

 < dnssec information
 < dnssec not supported
 < dnssec validating
 < dnssec information
 < dnssec not supported
 < dnssec validating


@@ -1318,6 +1320,7 @@
 < dnsforward forward_server
 < dnsforward zone
 < dnssec aware
 < dnsforward forward_server
 < dnsforward zone
 < dnssec aware

+< dnssec disabled warning

 < dnssec information
 < dnssec not supported
 < dnssec validating
 < dnssec information
 < dnssec not supported
 < dnssec validating


@@ -1904,6 +1907,7 @@
 < dnsforward forward_server
 < dnsforward zone
 < dnssec aware
 < dnsforward forward_server
 < dnsforward zone
 < dnssec aware

+< dnssec disabled warning

 < dnssec information
 < dnssec not supported
 < dnssec validating
 < dnssec information
 < dnssec not supported
 < dnssec validating

diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi
index 85a0c94cd9ebfaee93f6b7482b42a3c886f7f06b..7c1746259d34bf653f86bd0033d801bfe3d09e09 100644 (file)
--- a/html/cgi-bin/index.cgi
+++ b/html/cgi-bin/index.cgi
@@ -500,6 +500,11 @@ END
 &Header::closebox();
 }
 
 &Header::closebox();
 }
 

+my $dnssec_status = &General::dnssec_status();
+if ($dnssec_status eq "off") {
+       $warnmessage .= "<li>$Lang::tr{'dnssec disabled warning'}</li>";
+}
+

 # Fireinfo
 if ( ! -e "/var/ipfire/main/send_profile") {
        $warnmessage .= "<li><a style='color: white;' href='fireinfo.cgi'>$Lang::tr{'fireinfo please enable'}</a></li>";
 # Fireinfo
 if ( ! -e "/var/ipfire/main/send_profile") {
        $warnmessage .= "<li><a style='color: white;' href='fireinfo.cgi'>$Lang::tr{'fireinfo please enable'}</a></li>";

diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index ad8db192bbbbb2cb3e8a212113631a70b5028830..bda0e26923a22422d930654bf0816406e4ca2209 100644 (file)
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -767,6 +767,7 @@
 'dnsforward forward_server' => 'DNS-Server',
 'dnsforward zone' => 'Zone',
 'dnssec aware' => 'DNSSEC-aware',
 'dnsforward forward_server' => 'DNS-Server',
 'dnsforward zone' => 'Zone',
 'dnssec aware' => 'DNSSEC-aware',

+'dnssec disabled warning' => 'WARNING: DNSSEC wurde deaktiviert',

 'dnssec information' => 'DNSSEC-Informationen',
 'dnssec not supported' => 'DNSSEC wird nicht unterstützt',
 'dnssec validating' => 'DNSSEC-validierend',
 'dnssec information' => 'DNSSEC-Informationen',
 'dnssec not supported' => 'DNSSEC wird nicht unterstützt',
 'dnssec validating' => 'DNSSEC-validierend',

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 3deb4b555a1b3fcf00bc4550ebfba8dd9df3d19a..6608ceb63991c54c70fdcb2d5e210f711afd3a0b 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -792,6 +792,7 @@
 'dnsforward forward_server' => 'Nameserver',
 'dnsforward zone' => 'Zone',
 'dnssec aware' => 'DNSSEC Aware',
 'dnsforward forward_server' => 'Nameserver',
 'dnsforward zone' => 'Zone',
 'dnssec aware' => 'DNSSEC Aware',

+'dnssec disabled warning' => 'WARNING: DNSSEC has been disabled',

 'dnssec information' => 'DNSSEC Information',
 'dnssec not supported' => 'DNSSEC Not supported',
 'dnssec validating' => 'DNSSEC Validating',
 'dnssec information' => 'DNSSEC Information',
 'dnssec not supported' => 'DNSSEC Not supported',
 'dnssec validating' => 'DNSSEC Validating',

diff --git a/src/initscripts/system/unbound b/src/initscripts/system/unbound
index 7e804291852e11f18b815f53646963d989674dd1..a1763a1fed7564532991e176ee542fc6125674c2 100644 (file)
--- a/src/initscripts/system/unbound
+++ b/src/initscripts/system/unbound
@@ -439,12 +439,18 @@ enable_dnssec() {
        # Don't do anything if DNSSEC is already activated
        [ "${status}" = "no" ] && return 0
 
        # Don't do anything if DNSSEC is already activated
        [ "${status}" = "no" ] && return 0
 

+       # Log DNSSEC status
+       echo "on" > /var/ipfire/red/dnssec-status
+

        # Activate DNSSEC and flush cache with any stale and unvalidated data
        unbound-control -q set_option val-permissive-mode: no
        unbound-control -q flush_zone .
 }
 
 disable_dnssec() {
        # Activate DNSSEC and flush cache with any stale and unvalidated data
        unbound-control -q set_option val-permissive-mode: no
        unbound-control -q flush_zone .
 }
 
 disable_dnssec() {

+       # Log DNSSEC status
+       echo "off" > /var/ipfire/red/dnssec-status
+

        unbound-control -q set_option val-permissive-mode: yes
 }
 
        unbound-control -q set_option val-permissive-mode: yes
 }