Skip to content

dns/bind: add dedicated DDNS TSIG key support #5199

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
leifnel wants to merge 1 commit into
base: master
Choose a base branch
from
Open

dns/bind: add dedicated DDNS TSIG key support #5199

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
6 changes: 6 additions & 0 deletions ...bind/src/opnsense/mvc/app/controllers/OPNsense/Bind/forms/dialogEditBindPrimaryDomain.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,12 @@
<type>checkbox</type>
<help>Allow updates via the RDNC key named "rndc-key". The key is shown in the general tab.</help>
</field>
<field>
<id>domain.allowddnsupdate</id>
<label>Allow DDNS update (TSIG)</label>
<type>checkbox</type>
<help>Generates an update-policy grant for the configured DDNS TSIG key (e.g. Kea). If all update options are disabled, no update-policy will be generated (use named.conf.d drop-ins).</help>
</field>
<field>
<id>domain.ttl</id>
<label>TTL</label>
Expand Down
28 changes: 28 additions & 0 deletions dns/bind/src/opnsense/mvc/app/controllers/OPNsense/Bind/forms/general.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,4 +195,32 @@
<advanced>true</advanced>
<help>The base64-encoded RNDC key. This requires a restart of the Bind Service.</help>
</field>
<field>
<type>header</type>
<label>DDNS TSIG Key</label>
<advanced>true</advanced>
</field>
<field>
<id>general.ddnskeyname</id>
<label>Name</label>
<type>text</type>
<advanced>true</advanced>
<help>TSIG key name used for dynamic DNS updates (e.g. from Kea).</help>
</field>

<field>
<id>general.ddnskeyalgo</id>
<label>Algorithm</label>
<type>dropdown</type>
<advanced>true</advanced>
<help>TSIG algorithm for the DDNS key.</help>
</field>

<field>
<id>general.ddnskeysecret</id>
<label>Secret</label>
<type>text</type>
<advanced>true</advanced>
<help>Base64-encoded TSIG secret for the DDNS key. This requires a restart of the Bind Service.</help>
</field>
</form>
4 changes: 4 additions & 0 deletions dns/bind/src/opnsense/mvc/app/models/OPNsense/Bind/Domain.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,10 @@
<Default>1</Default>
<Required>Y</Required>
</allowrndcupdate>
<allowddnsupdate type="BooleanField">
<DefaultValue>0</DefaultValue>
</allowddnsupdate>

<serial type="TextField"/>
<ttl type="IntegerField">
<Default>86400</Default>
Expand Down
16 changes: 16 additions & 0 deletions dns/bind/src/opnsense/mvc/app/models/OPNsense/Bind/General.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,5 +167,21 @@
<Required>Y</Required>
<Default>VxtIzJevSQXqnr7h2qerrcwjnZlMWSGGFBndKeNIDfw=</Default>
</rndcsecret>
<ddnskeyname type="TextField"/>
<ddnskeyalgo type="OptionField">
<Default>hmac-sha256</Default>
<OptionValues>
<hmac-sha512>HMAC-SHA512</hmac-sha512>
<hmac-sha384>HMAC-SHA384</hmac-sha384>
<hmac-sha256>HMAC-SHA256</hmac-sha256>
<hmac-sha224>HMAC-SHA224</hmac-sha224>
<hmac-sha1>HMAC-SHA1</hmac-sha1>
<hmac-md5>HMAC-MD5</hmac-md5>
</OptionValues>
</ddnskeyalgo>
<ddnskeysecret type="Base64Field">
<Required>false</Required>
</ddnskeysecret>

</items>
</model>
29 changes: 27 additions & 2 deletions dns/bind/src/opnsense/service/templates/OPNsense/Bind/named.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,13 @@ controls {
allow { 127.0.0.1; } keys { "rndc-key"; };
};
{% endif %}
{% if helpers.exists('OPNsense.bind.general.ddnskeyname') and OPNsense.bind.general.ddnskeyname != ''
and helpers.exists('OPNsense.bind.general.ddnskeysecret') and OPNsense.bind.general.ddnskeysecret != '' %}
key "{{ OPNsense.bind.general.ddnskeyname }}" {
algorithm "{{ OPNsense.bind.general.ddnskeyalgo }}";
secret "{{ OPNsense.bind.general.ddnskeysecret }}";
};
{% endif %}

include "/usr/local/etc/namedb/named.conf.d/*.conf";

Expand Down Expand Up @@ -189,11 +196,29 @@ zone "{{ domain.domainname }}" {
{% endfor %}
};
{% endif %}
{% if domain.allowrndcupdate is defined and domain.allowrndcupdate == "1" and domain.type == 'primary' %}
{% set ddns_key_ok = (helpers.exists('OPNsense.bind.general.ddnskeyname')
and OPNsense.bind.general.ddnskeyname != ''
and helpers.exists('OPNsense.bind.general.ddnskeysecret')
and OPNsense.bind.general.ddnskeysecret != '') %}

{% set ddns_ok = (domain.type == 'primary'
and domain.allowddnsupdate is defined and domain.allowddnsupdate == "1"
and ddns_key_ok) %}

{% set rndc_ok = (domain.type == 'primary'
and domain.allowrndcupdate is defined and domain.allowrndcupdate == "1") %}

{% if ddns_ok or rndc_ok %}
update-policy {
grant rndc-key zonesub ANY;
{% if ddns_ok %}
grant {{ OPNsense.bind.general.ddnskeyname }} zonesub ANY;
{% endif %}
{% if rndc_ok %}
grant rndc-key zonesub ANY;
{% endif %}
};
{% endif %}

};
{% if domain.type == 'secondary' and domain.transferkey is defined and not(domain.transferkeyname in usedkeys) %}
{% do usedkeys.append(domain.transferkeyname) %}
Expand Down