michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-03-20 16:50:24 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Added missing DMARC tags (fr ri)

Browse Source 
Committer: danci <danci@barbie.agenda.si>

 On branch dmarc_tags
 Changes to be committed:
	modified:   bind8/bind8-lib.pl
	modified:   bind8/lang/en
	modified:   bind8/records-lib.pl
	modified:   bind8/save_record.cgi
This commit is contained in:
danci
2022-01-22 20:10:41 +01:00
parent 89f6c07ce3
commit 72fdc331a6
4 changed files with 27 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
bind8/bind8-lib.pl
View File

@@ -1281,6 +1281,14 @@ elsif ($type eq "DMARC") {
print &ui_table_row($text{'value_dmarcruf'},
&ui_opt_textbox("dmarcruf", $ruf, 50, $text{'value_dmarcnor'}), 3);
print &ui_table_row($text{'value_dmarcrf'},
&ui_select("dmarcrf", $dmarc->{'rf'},
[ [ undef, $text{'default'} ],
[ 'afrf', $text{'value_dmarcafrf'} ] ]));
print &ui_table_row($text{'value_dmarcri'},
&ui_textbox("dmarcri", $dmarc->{'ri'}, 5)."s");
print &ui_table_row($text{'value_dmarcfo'},
&ui_select("dmarcfo", $dmarc->{'fo'},
[ [ undef, $text{'default'} ],

3
bind8/lang/en
View File

@@ -528,6 +528,9 @@ value_CAA3=CA domain name
value_caa_issue=Single domain cert
value_caa_issuewild=Wildcard cert
value_caa_iodef=Policy violation URL
+value_dmarcri=Reporting interval
+value_dmarcrf=Report format
+value_dmarcafrf=Authentication Failure Reporting Format
tlsa_usage0=Certificate authority
tlsa_usage1=End entity

4
bind8/records-lib.pl
View File

@@ -863,7 +863,7 @@ if ($txt =~ /^v=dmarc1/i) {
my $dmarc = { };
foreach my $w (@w) {
$w = lc($w);
if ($w =~ /^(v|pct|ruf|rua|p|sp|adkim|aspf|fo)=(\S+)$/i) {
if ($w =~ /^(v|pct|ruf|rua|p|sp|adkim|aspf|fo|rf|ri)=(\S+)$/i) {
$dmarc->{$1} = $2;
}
else {
@@ -883,7 +883,7 @@ sub join_dmarc
{
my ($dmarc) = @_;
my @rv = ( "v=DMARC1" );
foreach my $s ("p", "pct", "ruf", "rua", "sp", "adkim", "aspf", "fo") {
foreach my $s ("p", "pct", "ruf", "rua", "sp", "adkim", "aspf", "fo", "rf", "ri") {
if ($dmarc->{$s} && $dmarc->{$s} ne '') {
push(@rv, $s."=".$dmarc->{$s});
}

14
bind8/save_record.cgi
View File

@@ -422,6 +422,20 @@ else {
$dmarc->{'fo'} = $in{'dmarcfo'};
}
if ($in{'dmarcrf'} eq '') {
delete($dmarc->{'rf'});
}
else {
$dmarc->{'rf'} = $in{'dmarcrf'};
}
if ($in{'dmarcri'} eq '') {
delete($dmarc->{'ri'});
}
else {
$dmarc->{'ri'} = $in{'dmarcri'};
}
$vals = "\"".&join_dmarc($dmarc)."\"";
}
elsif ($in{'type'} eq 'NSEC3PARAM') {