Skip to content

dns/bind: Forwarding feature expansion #4894

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

dns/bind: Forwarding feature expansion #4894

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
12 changes: 9 additions & 3 deletions ...bind/src/opnsense/mvc/app/controllers/OPNsense/Bind/forms/dialogEditBindForwardDomain.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,20 @@
<id>domain.domainname</id>
<label>Zone Name</label>
<type>text</type>
<help>Set the name for this zone. Both forward and reverse zones may be specified, i.e. example.com or 0.168.192.in-addr.arpa.</help>
<help>Set the name for this zone. Both forward and reverse zones may be specified, e.g. "example.com" or "0.168.192.in-addr.arpa"</help>
</field>
<field>
<id>domain.forwardonly</id>
<label>Forward Only</label>
<type>checkbox</type>
<help>Disables recursion if forwarding fails. The default is to attempt resolution via forwarders first and only perform recursive lookups if forwarding fails. This setting is only meaningful if the list of forwarders is not empty. Can be used to override global forwarding behaviour for this domain by specifying the same servers below as those on the General tab.</help>
</field>
<field>
<id>domain.forwardserver</id>
<label>Primary IP</label>
<label>Forwarder IPs</label>
<style>tokenize</style>
<type>select_multiple</type>
<allownew>true</allownew>
<help>Set the IP address of server to forward requests to.</help>
<help>Set any combination of IPv4 and IPv6 addresses. Queries for this domain will be forwarded to these addresses. Used to override global forwarders for this domain.</help>
</field>
</form>
11 changes: 9 additions & 2 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 @@ -61,13 +61,20 @@
<advanced>true</advanced>
<help>Specify the IPv6 address used as a source for zone transfers.</help>
</field>
<field>
<id>general.forwardonly</id>
<label>Forward Only</label>
<type>checkbox</type>
<advanced>true</advanced>
<help>Disables recursion if forwarding fails. The default is to attempt resolution via forwarders first and only perform recursive lookups if forwarding fails. This setting is only meaningful if the list of forwarders is not empty.</help>
</field>
<field>
<id>general.forwarders</id>
<label>DNS Forwarders</label>
<label>Forwarders</label>
<style>tokenize</style>
<type>select_multiple</type>
<allownew>true</allownew>
<help>Set one or more hosts to send your DNS queries if the request is unknown.</help>
<help>Set any combination of IPv4 and IPv6 addresses to forward queries to when the answer is unknown.</help>
</field>
<field>
<id>general.filteraaaav4</id>
Expand Down
6 changes: 5 additions & 1 deletion 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
@@ -1,7 +1,7 @@
<model>
<mount>//OPNsense/bind/domain</mount>
<description>BIND domain configuration</description>
<version>1.1.2</version>
<version>1.1.3</version>
<items>
<domains>
<domain type="ArrayField">
Expand All @@ -21,6 +21,10 @@
<primaryip type="NetworkField">
<AsList>Y</AsList>
</primaryip>
<forwardonly type="BooleanField">
<Default>0</Default>
<Required>Y</Required>
</forwardonly>
<forwardserver type="NetworkField">
<AsList>Y</AsList>
</forwardserver>
Expand Down
6 changes: 5 additions & 1 deletion 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
@@ -1,7 +1,7 @@
<model>
<mount>//OPNsense/bind/general</mount>
<description>BIND configuration</description>
<version>1.0.12</version>
<version>1.0.13</version>
<items>
<enabled type="BooleanField">
<Default>0</Default>
Expand Down Expand Up @@ -45,6 +45,10 @@
<Default>53530</Default>
<Required>Y</Required>
</port>
<forwardonly type="BooleanField">
<Default>0</Default>
<Required>Y</Required>
</forwardonly>
<forwarders type="NetworkField">
<AsList>Y</AsList>
</forwarders>
Expand Down
1 change: 1 addition & 0 deletions dns/bind/src/opnsense/mvc/app/views/OPNsense/Bind/general.volt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,7 @@
<tr>
<th data-column-id="enabled" data-type="string" data-formatter="rowtoggle">{{ lang._('Enabled') }}</th>
<th data-column-id="domainname" data-type="string" data-visible="true">{{ lang._('Zone') }}</th>
<th data-column-id="forwardonly" data-type="string" data-formatter="boolean" data-visible="true">{{ lang._('Forward Only') }}</th>
<th data-column-id="forwardserver" data-type="string" data-visible="true">{{ lang._('Forwarder IPs') }}</th>
<th data-column-id="uuid" data-type="string" data-identifier="true" data-visible="false">{{ lang._('ID') }}</th>
<th data-column-id="commands" data-formatter="commands" data-sortable="false">{{ lang._('Commands') }}</th>
Expand Down
10 changes: 9 additions & 1 deletion 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 @@ -39,7 +39,10 @@ options {
{% endif -%}

{% if helpers.exists('OPNsense.bind.general.forwarders') and OPNsense.bind.general.forwarders != '' %}
forwarders { {{ OPNsense.bind.general.forwarders.replace(',', '; ') }}; };
{% if helpers.exists('OPNsense.bind.general.forwardonly') and OPNsense.bind.general.forwardonly == '1' %}
forward only
{% endif -%}
forwarders { {{ OPNsense.bind.general.forwarders.replace(',', '; ') }}; };
{% endif -%}

{% if helpers.exists('OPNsense.bind.dnsbl.enabled') and OPNsense.bind.dnsbl.enabled == '1' %}
Expand Down Expand Up @@ -154,6 +157,11 @@ zone "rpzbing" { type primary; file "/usr/local/etc/namedb/primary/bing.db"; not
zone "{{ domain.domainname }}" {
type {{ domain.type }};
{% if domain.type == 'forward' %}
{% if domain.forwardonly == '1' %}
forward only;
{% else %}
forward first;
{% endif %}
forwarders { {{ domain.forwardserver.replace(',', '; ') }}; };
{% elif domain.type == 'secondary' %}
{% if domain.transferkey is defined %}
Expand Down