Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Export CAA correctly to BIND format and... #193

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
msimerson merged 2 commits into from
Jul 26, 2017
Merged

Export CAA correctly to BIND format and... #193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2c303dc
* export tag correctly (do not coerse to port)
Jul 26, 2017
f3b5b1f
try with precise
msimerson Jul 26, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ perl:
- "5.18"
- "5.10"

dist: precise

services:
- mysql

Expand Down
4 changes: 2 additions & 2 deletions server/lib/NicToolServer/Export/BIND.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -463,8 +463,8 @@ sub zr_caa {
my ($self, $r) = @_;

my $crit = $self->{nte}->is_ip_port( $r->{weight} );
my $tag = $self->{nte}->is_ip_port( $r->{other} );
my $tag = $r->{other};

# Owner Name TTL CLASS Type Issue-Crit Tag Property
return "$r->{name} $r->{ttl} IN CAA $crit $tag \"$r->{address}\"\n";
}
Expand Down
8 changes: 8 additions & 0 deletions server/lib/NicToolServer/Zone/Record/Sanity.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,14 @@ sub _duplicate_record {
grep { $_->{address} eq $address }
@$collisions;

if (scalar @matches == 0) { return; }

if ($data->{type} eq 'CAA') {
# same address is tolerated if property tag is different, allows
# setting 'issue' and 'issuewild' for the same CA
@matches = grep { $_->{other} eq $data->{other} } @matches;
}

if (scalar @matches) {
$self->error( 'name', "Duplicate Resource Records are not allowed: RFC 2181");
}
Expand Down