lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-13 16:14:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Services: Unbound DNS: Overrides / Domain - add forward-tcp-upstream in advanced. closes https://github.com/opnsense/core/issues/6465

Browse Source
This commit is contained in:
Ad Schellevis 2023-04-02 14:17:06 +02:00
parent a5c4de07b0
commit a556df4a85
3 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/opnsense/mvc/app/controllers/OPNsense/Unbound/forms/dialogDomainOverride.xml
View File

@ -24,6 +24,17 @@
append an '@' with the port number.
</help>
</field>
<field>
<id>domain.forward_tcp_upstream</id>
<label>Forward TCP upstream</label>
<type>checkbox</type>
<advanced>true</advanced>
<help>
Upstream queries use TCP only for transport regardless of global flag tcp-upstream.
Please note this setting applies to the domain, so when multiple forwarders are defined for the same domaine,
all are assumed to use tcp only.
</help>
</field>
<field>
<id>domain.description</id>
<label>Description</label>

6
src/opnsense/mvc/app/models/OPNsense/Unbound/Unbound.xml
View File

@ -1,7 +1,7 @@
<model>
<mount>//OPNsense/unboundplus</mount>
<description>Unbound configuration</description>
<version>1.0.5</version>
<version>1.0.6</version>
<items>
<general>
<enabled type="BooleanField">
@ -445,6 +445,10 @@
<Required>Y</Required>
<ValidationMessage>A valid IP must be specified.</ValidationMessage>
</server>
<forward_tcp_upstream type="BooleanField">
<default>0</default>
<Required>Y</Required>
</forward_tcp_upstream>
<description type="TextField">
<Required>N</Required>
<mask>/^(.){1,255}$/u</mask>

16
src/opnsense/service/templates/OPNsense/Unbound/core/domainoverrides.conf
View File

@ -1,17 +1,23 @@
{% if not helpers.empty('OPNsense.unboundplus.domains.domain') %}
{% set forwardlocal = namespace(found=false) %}
{% set prev_domain = namespace(name='') %}
{% set forwardlocal = namespace(found=False) %}
{% set domain_opts = namespace(forward_tcp_upstream=False) %}
{% for domain in helpers.toList('OPNsense.unboundplus.domains.domain', 'domain') %}
{% if domain.enabled == '1' %}
{% if prev_domain.name != domain.domain %}
{% if not loop.previtem or loop.previtem.domain != domain.domain %}
{% set domain_opts.forward_tcp_upstream = False %}
forward-zone:
name: "{{ domain.domain }}"
{% set prev_domain.name = domain.domain %}
{% if domain.server.startswith('127.') or domain.server == '::1' %}
{% set forwardlocal.found = true %}
{% set forwardlocal.found = True %}
{% endif %}
{% set domain_opts.forward_tcp_upstream = domain_opts.forward_tcp_upstream or domain.forward_tcp_upstream == '1' %}
{% endif %}
forward-addr: {{ domain.server }}
{% if not loop.nextitem or loop.nextitem.domain != domain.domain %}
{% if domain_opts.forward_tcp_upstream %}
forward-tcp-upstream: yes
{% endif %}
{% endif %}
{% endif %}
{% endfor %}
{% if forwardlocal.found %}