Skip to content

generate separate Zonemaster profiles for DNS & DNSSEC #260

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

Open
gbicann wants to merge 1 commit into
base: main
Choose a base branch
from
Open

generate separate Zonemaster profiles for DNS & DNSSEC #260

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ tmp
rst-test-specs.html
rst-test-specs.json
rst-test-specs.yaml
rst.json
rst_dns.json
rst_dnssec.json
rdapct_config*.json
releases.json
releases.md
10 changes: 6 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,11 @@ yaml: export ZM_VERSION=$(ZONEMASTER_VERSION)
all: zonemaster-profile rdapct-config includes yaml lint json html

zonemaster-profile:
@echo Generating Zonemaster profile...
@tools/generate-zonemaster-profile.pl "--version=$(ZONEMASTER_ENGINE_VERSION)" > rst.json
@echo wrote rst.json
@echo Generating Zonemaster profiles...
@tools/generate-zonemaster-profile.pl --suite=dns "--version=$(ZONEMASTER_ENGINE_VERSION)" > rst_dns.json
@echo wrote rst_dns.json
@tools/generate-zonemaster-profile.pl --suite=dnssec "--version=$(ZONEMASTER_ENGINE_VERSION)" > rst_dnssec.json
@echo wrote rst_dnssec.json

rdapct-config:
@echo Generating RDAP Conformance Tool configuration files...
Expand Down Expand Up @@ -71,4 +73,4 @@ pages: rdapct-config zonemaster-profile

clean:
@echo Cleaning up...
@rm -rf tmp zonemaster _site tmp rst.json rst-test-specs.html rst-test-specs.json rst-test-specs.yaml rdapct_config*.json releases.md releases.json
@rm -rf tmp zonemaster _site tmp rst_dns.json rst_dnssec.json rst-test-specs.html rst-test-specs.json rst-test-specs.yaml rdapct_config*.json releases.md releases.json
8 changes: 5 additions & 3 deletions etc/index.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,12 @@ This site hosts the specifications for ICANN's [Registry System Testing

Additional resources:

* [rst.json](rst.json) is the [Zonemaster
* [rst_dns.json](rst_dns.json) is the [Zonemaster
profile](https://github.com/zonemaster/zonemaster/blob/master/docs/public/configuration/profiles.md)
used by the [DNS](rst-test-specs.html#Test-Suite-StandardDNS) and
[DNSSEC](rst-test-specs.html#Test-Suite-StandardDNSSEC) test suites.
used by the [DNS](rst-test-specs.html#Test-Suite-StandardDNS) test suite.
* [rst_dnssec.json](rst_dnssec.json) is the [Zonemaster
profile](https://github.com/zonemaster/zonemaster/blob/master/docs/public/configuration/profiles.md)
used by the [DNSSEC](rst-test-specs.html#Test-Suite-StandardDNSSEC) test suite.
* [rdapct_config.json](rdapct_config.json)
is the configuration file used by the [RDAP Conformance
Tool](https://github.com/icann/rdap-conformance-tool) during production tests.
Expand Down
4 changes: 2 additions & 2 deletions tools/build-pages
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,8 @@ tools/generate-superschema.pl > "$SITEDIR/epp-extensions/xsd/super.xsd"
echo "Copying RDAP Conformance Tool configuration files..."
cp rdapct_config*.json "$SITEDIR/"

echo "Copying Zonemaster profile..."
cp rst.json "$SITEDIR/"
echo "Copying Zonemaster profiles..."
cp rst_dns.json rst_dnssec.json "$SITEDIR/"

chmod -R 0755 "$SITEDIR"

Expand Down
13 changes: 12 additions & 1 deletion tools/generate-zonemaster-profile.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,15 @@
};
use strict;

my $version;
my ($version, $suite);
GetOptions(
'version=s' => \$version,
'help' => sub { pod2usage() },
'--suite=s' => \$suite,
) || pod2usage();

pod2usage({-message => "Bad suite '$suite'"}) unless ($suite =~ /^(dns|dnssec)$/);

my $config = YAML::XS::LoadFile(dirname(dirname(realpath(__FILE__)))
.'/zonemaster-test-policies.yaml');

Expand All @@ -43,6 +46,14 @@
}
}

if ('dnssec' eq $suite) {
$profile->{'test_cases'} = [ grep { $_ =~ /^dnssec/ } @{$profile->{'test_cases'}} ];

} else {
$profile->{'test_cases'} = [ grep { $_ !~ /^dnssec/ } @{$profile->{'test_cases'}} ];

}

#
# change severity levels for messages we've overridden
#
Expand Down
Loading