Skip to content

Commit 2d6190e

Browse files
committed
datamodel: forward: server: added 'insecure' config
This commit is related to GitHub issue #123.
1 parent 7779e85 commit 2d6190e

File tree

4 files changed

+13
-1
lines changed

4 files changed

+13
-1
lines changed

doc/_static/config.schema.json

+5
Original file line numberDiff line numberDiff line change
@@ -1022,6 +1022,11 @@
10221022
"description": "Transport protocol for a forward server.",
10231023
"default": null
10241024
},
1025+
"insecure": {
1026+
"type": "boolean",
1027+
"description": "Allow insecure TLS configuration.",
1028+
"default": false
1029+
},
10251030
"pin-sha256": {
10261031
"anyOf": [
10271032
{

python/knot_resolver/datamodel/forward_schema.py

+2
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,15 @@ class ForwardServerSchema(ConfigSchema):
1111
---
1212
address: IP address(es) of a forward server.
1313
transport: Transport protocol for a forward server.
14+
insecure: Allow insecure TLS configuration.
1415
pin_sha256: Hash of accepted CA certificate.
1516
hostname: Hostname of the Forward server.
1617
ca_file: Path to CA certificate file.
1718
"""
1819

1920
address: ListOrItem[IPAddressOptionalPort]
2021
transport: Optional[Literal["tls"]] = None
22+
insecure: bool = False
2123
pin_sha256: Optional[ListOrItem[PinSha256]] = None
2224
hostname: Optional[DomainName] = None
2325
ca_file: Optional[ReadableFile] = None

python/knot_resolver/datamodel/templates/macros/forward_macros.lua.j2

+5
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@ tls=true,
1313
{%- else -%}
1414
tls=false,
1515
{%- endif -%}
16+
{%- if server.insecure -%}
17+
insecure=true,
18+
{%- else -%}
19+
insecure=false,
20+
{%- endif -%}
1621
{%- if server.hostname -%}
1722
hostname='{{ server.hostname }}',
1823
{%- endif -%}

tests/manager/datamodel/templates/test_forward_macros.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ def test_policy_rule_forward_add():
1717
},
1818
}
1919
)
20-
result = "policy.rule_forward_add('.',{dnssec=true,auth=false},{{'2001:148f:fffe::1',tls=false,hostname='odvr.nic.cz',},{'185.43.135.1',tls=false,hostname='odvr.nic.cz',},})"
20+
result = "policy.rule_forward_add('.',{dnssec=true,auth=false},{{'2001:148f:fffe::1',tls=false,insecure=false,hostname='odvr.nic.cz',},{'185.43.135.1',tls=false,insecure=false,hostname='odvr.nic.cz',},})"
2121

2222
tmpl = template_from_str(tmpl_str)
2323
assert tmpl.render(rule=rule) == result

0 commit comments

Comments
 (0)