feat: add caa record

This commit is contained in:
Adrien Waksberg 2018-03-17 10:47:25 +01:00
parent ff39078d6f
commit 3cdd9cb10c
4 changed files with 11 additions and 0 deletions

View file

@ -42,6 +42,7 @@ bind_zones:
entries: entries:
- { name: '@', type: ns, value: localhost. } - { name: '@', type: ns, value: localhost. }
- { name: hello, type: a, ttl: 5m, value: 1.2.3.4 } - { name: hello, type: a, ttl: 5m, value: 1.2.3.4 }
- { name: hello, type: caa, flag: 0, tag: issue, value: letsencrypt.org }
hello.local: hello.local:
ns_primary: ns1.hello.local ns_primary: ns1.hello.local
mail: root@hello.local mail: root@hello.local

View file

@ -12,6 +12,8 @@ $TTL {{ item.value.ttl|default(3600) }}
{% for entry in item.value.entries %} {% for entry in item.value.entries %}
{% if entry.type|upper == 'MX' %} {% if entry.type|upper == 'MX' %}
{{ entry.name }} {{ entry.ttl|default(' ') }} IN MX {{ entry.priority }} {{ entry.value }} {{ entry.name }} {{ entry.ttl|default(' ') }} IN MX {{ entry.priority }} {{ entry.value }}
{% elif entry.type|upper == 'CAA' %}
{{ entry.name }} {{ entry.ttl|default(' ') }} CAA {{ entry.flag }} {{ entry.tag }} "{{ entry.value }}"
{% elif entry.type|upper == 'TXT' %} {% elif entry.type|upper == 'TXT' %}
{{ entry.name }} {{ entry.ttl|default(' ') }} IN TXT ( {{ entry.name }} {{ entry.ttl|default(' ') }} IN TXT (
{% for charset in entry.value|batch(64) %} {% for charset in entry.value|batch(64) %}

View file

@ -20,6 +20,8 @@
- { name: '@', type: mx, priority: 20, value: mail.test.local. } - { name: '@', type: mx, priority: 20, value: mail.test.local. }
- { name: '@', type: ns, value: localhost. } - { name: '@', type: ns, value: localhost. }
- { name: hello, type: a, ttl: 5m, value: 1.2.3.4 } - { name: hello, type: a, ttl: 5m, value: 1.2.3.4 }
- { name: hello, type: caa, flag: 0, tag: issue, value: letsencrypt.org }
- { name: hello, type: caa, flag: 0, tag: iodef, value: 'mailto:root@test.local' }
hello.local: hello.local:
ns_primary: ns1.hello.local ns_primary: ns1.hello.local
mail: root@hello.local mail: root@hello.local

View file

@ -66,6 +66,12 @@ describe command('dig +nocmd +noall +answer -t mx test.local @127.0.0.1') do
its(:stdout) { should contain(/test\.local\.\s+3600\s+IN\s+MX\s+20 mail\.test\.local\./) } its(:stdout) { should contain(/test\.local\.\s+3600\s+IN\s+MX\s+20 mail\.test\.local\./) }
end end
describe command('dig +nocmd +noall +answer -t caa hello.test.local @127.0.0.1') do
its(:exit_status) { should eq 0 }
its(:stdout) { should contain(/hello\.test\.local\.\s+3600\s+IN\s+CAA\s+0 issue "letsencrypt\.org"/) }
its(:stdout) { should contain(/hello\.test\.local\.\s+3600\s+IN\s+CAA\s+0 iodef "mailto:root@test\.local"/) }
end
describe command('dig +nocmd +noall +answer hello.hello.local @127.0.0.1') do describe command('dig +nocmd +noall +answer hello.hello.local @127.0.0.1') do
its(:exit_status) { should eq 0 } its(:exit_status) { should eq 0 }
its(:stdout) { should contain(/hello\.hello\.local\.\s+3600\s+IN\s+A\s+4\.3\.2\.1/) } its(:stdout) { should contain(/hello\.hello\.local\.\s+3600\s+IN\s+A\s+4\.3\.2\.1/) }