From 2b4199e558f578750d7895043d16d95838a81907 Mon Sep 17 00:00:00 2001 From: Michael Kaufmann Date: Fri, 4 Jan 2019 20:58:20 +0100 Subject: [PATCH] drop ADSP support, fixes #622 Signed-off-by: Michael Kaufmann --- actions/admin/settings/180.dkim.php | 22 ---------------------- install/froxlor.sql | 2 -- lib/Froxlor/Dns/Dns.php | 23 ----------------------- lng/dutch.lng.php | 4 ---- lng/english.lng.php | 4 ---- lng/german.lng.php | 4 ---- lng/italian.lng.php | 4 ---- 7 files changed, 63 deletions(-) diff --git a/actions/admin/settings/180.dkim.php b/actions/admin/settings/180.dkim.php index 0027af48..36625d16 100644 --- a/actions/admin/settings/180.dkim.php +++ b/actions/admin/settings/180.dkim.php @@ -109,28 +109,6 @@ return array( 'default' => '', 'save_method' => 'storeSettingFieldInsertBindTask' ), - 'dkim_add_adsp' => array( - 'label' => $lng['dkim']['dkim_add_adsp'], - 'settinggroup' => 'dkim', - 'varname' => 'dkim_add_adsp', - 'type' => 'bool', - 'default' => true, - 'save_method' => 'storeSettingFieldInsertBindTask' - ), - 'dkim_add_adsppolicy' => array( - 'label' => $lng['dkim']['dkim_add_adsppolicy'], - 'settinggroup' => 'dkim', - 'varname' => 'dkim_add_adsppolicy', - 'type' => 'option', - 'default' => '1', - 'option_mode' => 'one', - 'option_options' => array( - '0' => 'Unknown', - '1' => 'All', - '2' => 'Discardable' - ), - 'save_method' => 'storeSettingFieldInsertBindTask' - ), 'dkimrestart_command' => array( 'label' => $lng['dkim']['dkimrestart_command'], 'settinggroup' => 'dkim', diff --git a/install/froxlor.sql b/install/froxlor.sql index c1144f10..8c958416 100644 --- a/install/froxlor.sql +++ b/install/froxlor.sql @@ -378,10 +378,8 @@ INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('spf', 'use_spf', '0'), ('spf', 'spf_entry', '"v=spf1 a mx -all"'), ('dkim', 'dkim_algorithm', 'all'), - ('dkim', 'dkim_add_adsp', '1'), ('dkim', 'dkim_keylength', '1024'), ('dkim', 'dkim_servicetype', '0'), - ('dkim', 'dkim_add_adsppolicy', '1'), ('dkim', 'dkim_notes', ''), ('defaultwebsrverrhandler', 'enabled', '0'), ('defaultwebsrverrhandler', 'err401', ''), diff --git a/lib/Froxlor/Dns/Dns.php b/lib/Froxlor/Dns/Dns.php index e9cb5968..b5fc61d8 100644 --- a/lib/Froxlor/Dns/Dns.php +++ b/lib/Froxlor/Dns/Dns.php @@ -139,10 +139,6 @@ class Dns if (Settings::Get('dkim.use_dkim') == '1') { // check for DKIM content later self::addRequiredEntry('dkim_' . $domain['dkim_id'] . '._domainkey', 'TXT', $required_entries); - // check for ASDP - if (Settings::Get('dkim.dkim_add_adsp') == "1") { - self::addRequiredEntry('_adsp._domainkey', 'TXT', $required_entries); - } } } @@ -277,8 +273,6 @@ class Dns $multiline = true; } $zonerecords[] = new DnsEntry($record, 'TXT', self::encloseTXTContent($dkim_entries[0], $multiline)); - } elseif ($record == '_adsp._domainkey' && ! empty($dkim_entries) && isset($dkim_entries[1])) { - $zonerecords[] = new DnsEntry($record, 'TXT', self::encloseTXTContent($dkim_entries[1])); } } } @@ -401,23 +395,6 @@ class Dns // dkim-entry $zone_dkim[] = $dkim_txt; - - // adsp-entry - if (Settings::Get('dkim.dkim_add_adsp') == "1") { - $adsp = '"dkim='; - switch ((int) Settings::Get('dkim.dkim_add_adsppolicy')) { - case 0: - $adsp .= 'unknown"'; - break; - case 1: - $adsp .= 'all"'; - break; - case 2: - $adsp .= 'discardable"'; - break; - } - $zone_dkim[] = $adsp; - } } return $zone_dkim; diff --git a/lng/dutch.lng.php b/lng/dutch.lng.php index fb3141cd..07a3b0a6 100644 --- a/lng/dutch.lng.php +++ b/lng/dutch.lng.php @@ -910,10 +910,6 @@ $lng['dkim']['dkim_keylength']['title'] = 'Lengte sleutel'; $lng['dkim']['dkim_keylength']['description'] = 'Let op: Indien u deze waarde wijzigt, dient u allen geheime en publieke sleutels in "%s" te verwijderen'; $lng['dkim']['dkim_notes']['title'] = 'Notities voor DKIM'; $lng['dkim']['dkim_notes']['description'] = 'Notities die van belang kunnen zijn voor mensen, bijvoorbeeld een URL als http://www.dnswatch.info. Geen enkel programma zal deze informatie verwerken. Deze informatie dient schaars te zijn gezien de beperkte ruimte in DNS. Dit is bedoeld voor beheerders, niet voor eindgebruikers.'; -$lng['dkim']['dkim_add_adsp']['title'] = 'DKIM ADSP toevoegen'; -$lng['dkim']['dkim_add_adsp']['description'] = 'Indien u niet weet wat dit is, laat het op "actief" staan.'; -$lng['dkim']['dkim_add_adsppolicy']['title'] = 'ADSP beleid'; -$lng['dkim']['dkim_add_adsppolicy']['description'] = 'Voor meer informatie inzake deze instelling zie DKIM ADSP policies'; $lng['admin']['cron']['cronsettings'] = 'Instellingen cron-taken'; $lng['cron']['cronname'] = 'naam cron-taak'; diff --git a/lng/english.lng.php b/lng/english.lng.php index c0fd1b7c..089679b2 100644 --- a/lng/english.lng.php +++ b/lng/english.lng.php @@ -998,10 +998,6 @@ $lng['dkim']['dkim_keylength']['title'] = 'Key-length'; $lng['dkim']['dkim_keylength']['description'] = 'Attention: If you change this values, you need to delete all the private/public keys in "%s"'; $lng['dkim']['dkim_notes']['title'] = 'DKIM Notes'; $lng['dkim']['dkim_notes']['description'] = 'Notes that might be of interest to a human, e.g. a URL like http://www.dnswatch.info. No interpretation is made by any program. This tag should be used sparingly due to space limitations in DNS. This is intended for use by administrators, not end users.'; -$lng['dkim']['dkim_add_adsp']['title'] = 'Add DKIM ADSP entry'; -$lng['dkim']['dkim_add_adsp']['description'] = 'If you don\'t know what this is, leave it "enabled"'; -$lng['dkim']['dkim_add_adsppolicy']['title'] = 'ADSP policy'; -$lng['dkim']['dkim_add_adsppolicy']['description'] = 'For more information about this setting see DKIM ADSP policies'; $lng['admin']['cron']['cronsettings'] = 'Cronjob settings'; $lng['cron']['cronname'] = 'cronjob-name'; diff --git a/lng/german.lng.php b/lng/german.lng.php index 13a3feec..3492c832 100644 --- a/lng/german.lng.php +++ b/lng/german.lng.php @@ -970,10 +970,6 @@ $lng['dkim']['dkim_keylength']['title'] = 'Schlüssel-Länge'; $lng['dkim']['dkim_keylength']['description'] = 'Achtung: Bei Änderung dieser Einstellung müssen alle private/public Schlüssel in "%s" gelöscht werden.'; $lng['dkim']['dkim_notes']['title'] = 'DKIM Notiz'; $lng['dkim']['dkim_notes']['description'] = 'Eine Notiz, welche für Menschen interessant sein könnte, z.B. eine URL wie http://www.dnswatch.info. Es gibt keine programmgesteuerte Interpretation für dieses Feld. Gehen Sie sparsam mit der Anzahl der Zeichen um, da es Einschränkungen seitens des DNS-Dienstes gibt. Dieses Feld ist für Administratoren gedacht, nicht für Benutzer.'; -$lng['dkim']['dkim_add_adsp']['title'] = 'DKIM-ADSP Eintrag hinzufügen'; -$lng['dkim']['dkim_add_adsp']['description'] = 'Wenn unsicher oder unbekannt, belassen Sie es auf "aktiviert"'; -$lng['dkim']['dkim_add_adsppolicy']['title'] = 'ADSP-Richtlinie'; -$lng['dkim']['dkim_add_adsppolicy']['description'] = 'Mehr Informationen zu dieser Einstellung (englisch) DKIM-ADSP-Policies'; $lng['admin']['cron']['cronsettings'] = 'Cronjob-Einstellungen'; $lng['cron']['cronname'] = 'Cronjob-Name'; diff --git a/lng/italian.lng.php b/lng/italian.lng.php index 7c1d5de1..90d953cd 100644 --- a/lng/italian.lng.php +++ b/lng/italian.lng.php @@ -932,10 +932,6 @@ $lng['dkim']['dkim_keylength']['title'] = 'Lunghezza Chiave'; $lng['dkim']['dkim_keylength']['description'] = 'Attenzione: Se si modifica questo valore è necessario eliminare tutte le chiavi private/pubbliche in "%s"'; $lng['dkim']['dkim_notes']['title'] = 'Note DKIM'; $lng['dkim']['dkim_notes']['description'] = 'Nota potrebbe essere di interesse, es. un URL come http://www.dnswatch.info. Nessuna interpretazione è fatta da nessun programma. Questo tag deve essere usato con parsimonia per ragioni di spazio nel DNS. Questo è destinato ad essere utilizzato dagli amministratori e non dagli utenti finali.'; -$lng['dkim']['dkim_add_adsp']['title'] = 'Aggiungi un valore DKIM ADSP'; -$lng['dkim']['dkim_add_adsp']['description'] = 'Se non si sa di cosa si tratta, lasciare "enabled"'; -$lng['dkim']['dkim_add_adsppolicy']['title'] = 'Regola ADSP'; -$lng['dkim']['dkim_add_adsppolicy']['description'] = 'Per ulteriori informazioni su questa impostazione leggere DKIM ADSP policies'; $lng['admin']['cron']['cronsettings'] = 'Impostazioni Cronjob'; $lng['cron']['cronname'] = 'Nome cronjob';