manager: datamodel: views render to Lua

diff --git a/manager/etc/knot-resolver/config.policy.dev.yml b/manager/etc/knot-resolver/config.policy.dev.yml
index c6ed53c3cfccc7893f2545a0a1efe3f24e044136..8fb7a691412dc554cb2aa53439fc29053913c7c1 100644 (file)
--- a/manager/etc/knot-resolver/config.policy.dev.yml
+++ b/manager/etc/knot-resolver/config.policy.dev.yml
@@ -13,16 +13,15 @@ network:
   listen:
     - interface: 127.0.0.1@5353
 
-# views:
-#   - subnets: [ 0.0.0.0/0, "::/0" ]
-#     answer: refused
-  # - subnets: [ 0.0.0.0/0, "::/0" ]
-  #   tags: [t01, t02, t03]
-  #   options:
-  #     minimize: true  # default
-  #     dns64: true     # default
-  # - subnets: [10.0.10.0/24] # can be single value
-  #   answer: allow
+views:
+  - subnets: [127.0.0.0/24]
+    tags: [t01, t02, t03]
+    options:
+      dns64: false
+  - subnets: [ 0.0.0.0/0, "::/0" ]
+    answer: refused
+  - subnets: [10.0.10.0/24]
+    answer: allow
 
 # local-data:
 #   ttl: 1d

diff --git a/manager/knot_resolver_manager/datamodel/templates/config.lua.j2 b/manager/knot_resolver_manager/datamodel/templates/config.lua.j2
index bb7e5e34101843f0fa9d79f355e8780547e33c28..b741ed266ef2dd1c66c557bb9b5571c8585ef542 100644 (file)
--- a/manager/knot_resolver_manager/datamodel/templates/config.lua.j2
+++ b/manager/knot_resolver_manager/datamodel/templates/config.lua.j2
@@ -1,5 +1,8 @@
 {% if not cfg.lua.script_only %}
 
+-- FFI library
+local C = require('ffi').C
+
 -- hostname
 hostname('{{ cfg.hostname }}')
 
@@ -25,7 +28,7 @@ nsid.name('{{ cfg.nsid }}_' .. worker.id)
 {% include "network.lua.j2" %}
 
 -- VIEWS section ------------------------------------
-{# {% include "views.lua.j2" %} #}
+{% include "views.lua.j2" %}
 
 -- LOCAL-DATA section -------------------------------
 {# {% include "local_data.lua.j2" %} #}

diff --git a/manager/knot_resolver_manager/datamodel/templates/macros/common_macros.lua.j2 b/manager/knot_resolver_manager/datamodel/templates/macros/common_macros.lua.j2
index 1084a9b74dd83eba544a16848ca4283816e2c2b8..d576e6ba7d21f702d134312e1c1a2d9ecb6ba9db 100644 (file)
--- a/manager/knot_resolver_manager/datamodel/templates/macros/common_macros.lua.j2
+++ b/manager/knot_resolver_manager/datamodel/templates/macros/common_macros.lua.j2
@@ -1,3 +1,7 @@
+{% macro quotes(string) -%}
+'{{ string }}'
+{%- endmacro %}
+
 {# Return string or table of strings #}
 {% macro string_table(table) -%}
 {%- if table is string -%}

diff --git a/manager/knot_resolver_manager/datamodel/templates/macros/policy_macros.lua.j2 b/manager/knot_resolver_manager/datamodel/templates/macros/policy_macros.lua.j2
index e327d183680f2b7c2a4132ba92d9f962274a5b27..ba5c1be1eea909597e51f71312dabbfc858e629e 100644 (file)
--- a/manager/knot_resolver_manager/datamodel/templates/macros/policy_macros.lua.j2
+++ b/manager/knot_resolver_manager/datamodel/templates/macros/policy_macros.lua.j2
@@ -37,13 +37,7 @@ policy.slice_randomize_psl()
 
 {% macro policy_flags(flags) -%}
 policy.FLAGS({
-{%- if flags is string -%}
-'{{ flags.upper().replace("-", "_")|string }}'
-{%- else -%}
-{%- for flag in flags|list -%}
-'{{ flag.upper().replace("-", "_") }}',
-{%- endfor -%}
-{%- endif -%}
+{{- flags -}}
 })
 {%- endmacro %}
 

diff --git a/manager/knot_resolver_manager/datamodel/templates/macros/view_macros.lua.j2 b/manager/knot_resolver_manager/datamodel/templates/macros/view_macros.lua.j2
index 160a8247c0b690824dad46d2ae9de41617113d7c..efd032113a5cbb493c715912860d1d6de5f2aea3 100644 (file)
--- a/manager/knot_resolver_manager/datamodel/templates/macros/view_macros.lua.j2
+++ b/manager/knot_resolver_manager/datamodel/templates/macros/view_macros.lua.j2
@@ -2,25 +2,21 @@
 assert(C.kr_view_insert_action('{{ subnet }}',{{ action }})==0)
 {%- endmacro %}
 
-
-{% macro view_options_flags(options) -%}
-policy.FLAGS({
-{%- if not options.minimize -%}
-'NO_MINIMIZE',
-{%- endif -%}
-{%- if not options.dns64 -%}
-'DNS64_DISABLE',
-{%- endif -%}
-})
+{% macro view_flags(options) -%}
+{% if not options.minimize -%}
+"NO_MINIMIZE",
+{%- endif %}
+{% if not options.dns64 -%}
+"DNS64_DISABLE",
+{%- endif %}
 {%- endmacro %}
 
-
 {% macro view_answer(answer) -%}
 {%- if answer == 'allow' -%}
 policy.TAGS_ASSIGN({})
 {%- elif answer == 'refused' -%}
-policy.REFUSE
+'policy.REFUSE'
 {%- elif answer == 'noanswer' -%}
-policy.NO_ANSWER
+'policy.NO_ANSWER'
 {%- endif -%}
 {%- endmacro %}

diff --git a/manager/knot_resolver_manager/datamodel/templates/views.lua.j2 b/manager/knot_resolver_manager/datamodel/templates/views.lua.j2
index d9a13241be8e57c761fa07dba3155f06f7353bf5..99c654c920495db70d51a6f2a53308aeb7793c7d 100644 (file)
--- a/manager/knot_resolver_manager/datamodel/templates/views.lua.j2
+++ b/manager/knot_resolver_manager/datamodel/templates/views.lua.j2
@@ -1,18 +1,22 @@
-{% from 'macros/view_macros.lua.j2' import view_insert_action, view_options_flags, view_answer %}
-{% from 'macros/policy_macros.lua.j2' import policy_tags_assign %}
-
-local C = require('ffi').C
+{% from 'macros/common_macros.lua.j2' import quotes %}
+{% from 'macros/view_macros.lua.j2' import view_insert_action, view_flags, view_answer %}
+{% from 'macros/policy_macros.lua.j2' import policy_flags, policy_tags_assign %}
 
+{% if cfg.views %}
 {% for view in cfg.views %}
 {% for subnet in view.subnets %}
 
 {% if view.tags -%}
 {{ view_insert_action(subnet, policy_tags_assign(view.tags)) }}
-{% elif view.answer -%}
+{% elif view.answer %}
 {{ view_insert_action(subnet, view_answer(view.answer)) }}
 {%- endif %}
 
-{{ view_insert_action(subnet, view_options_flags(view.options)) }}
+{%- set flags = view_flags(view.options) -%}
+{% if flags -%}
+{{ view_insert_action(subnet, quotes(policy_flags(flags))) }}
+{%- endif %}
 
 {% endfor %}
 {% endfor %}
+{% endif %}

diff --git a/manager/knot_resolver_manager/datamodel/view_schema.py b/manager/knot_resolver_manager/datamodel/view_schema.py
index 2ed8fa1d7cc7dcd6771aaebbbbe43d43c737f16c..bb8f7b5cdf14cd2cdff13a81a9839e08edecee3e 100644 (file)
--- a/manager/knot_resolver_manager/datamodel/view_schema.py
+++ b/manager/knot_resolver_manager/datamodel/view_schema.py
@@ -1,4 +1,5 @@
-from typing import List, Optional, Union
+from typing import List, Optional
+
 from typing_extensions import Literal
 from knot_resolver_manager.utils.modeling import ConfigSchema
 from knot_resolver_manager.datamodel.types import IDPattern, IPNetwork
@@ -28,7 +29,7 @@ class ViewSchema(ConfigSchema):
     options: Configuration options for clients identified by the view.
     """
 
-    subnets: Optional[Union[List[IPNetwork], IPNetwork]]
+    subnets: List[IPNetwork]
     tags: Optional[List[IDPattern]] = None
     answer: Optional[Literal["allow", "refused", "noanswer"]] = None
     options: ViewOptionsSchema = ViewOptionsSchema()

diff --git a/manager/tests/unit/datamodel/templates/test_policy_macros.py b/manager/tests/unit/datamodel/templates/test_policy_macros.py
index 3c2161a2b9d72c11e57ae2030b9b45b23cc24fab..2920a2069b1cd96846fd434c8bf17d5bedbc37f8 100644 (file)
--- a/manager/tests/unit/datamodel/templates/test_policy_macros.py
+++ b/manager/tests/unit/datamodel/templates/test_policy_macros.py
@@ -16,18 +16,6 @@ def test_policy_add():
     assert tmpl.render(rule=rule, postrule=True) == f"policy.add({rule},true)"
 
 
-def test_policy_flags():
-    flags: List[PolicyFlagEnum] = ["no-cache", "no-edns"]
-    tmpl_str = """{% from 'macros/policy_macros.lua.j2' import policy_flags %}
-{{ policy_flags(flags) }}"""
-
-    tmpl = template_from_str(tmpl_str)
-    assert tmpl.render(flags=flags[1]) == f"policy.FLAGS({{'{flags[1].upper().replace('-', '_')}'}})"
-    assert (
-        tmpl.render(flags=flags) == f"policy.FLAGS({{{str(flags).upper().replace('-', '_').replace(' ', '')[1:-1]},}})"
-    )
-
-
 def test_policy_tags_assign():
     tags: List[str] = ["t01", "t02", "t03"]
     tmpl_str = """{% from 'macros/policy_macros.lua.j2' import policy_tags_assign %}

diff --git a/manager/tests/unit/datamodel/templates/test_view_macros.py b/manager/tests/unit/datamodel/templates/test_view_macros.py
index f496784eec01c92c0bfbe6a2e2da156849501f60..3a3f35f93c0dae645851ccd9b823cacdffac4fe3 100644 (file)
--- a/manager/tests/unit/datamodel/templates/test_view_macros.py
+++ b/manager/tests/unit/datamodel/templates/test_view_macros.py
@@ -16,14 +16,14 @@ def test_view_insert_action():
     assert tmpl.render(subnet=subnet, action=action) == f"assert(C.kr_view_insert_action('{ subnet }',{ action })==0)"
 
 
-def test_view_options_flags():
-    tmpl_str = """{% from 'macros/view_macros.lua.j2' import view_options_flags %}
-{{ view_options_flags(options) }}"""
+def test_view_flags():
+    tmpl_str = """{% from 'macros/view_macros.lua.j2' import view_flags %}
+{{ view_flags(options) }}"""
 
     tmpl = template_from_str(tmpl_str)
     options = ViewOptionsSchema({"dns64": False, "minimize": False})
-    assert tmpl.render(options=options) == "policy.FLAGS({'NO_MINIMIZE','DNS64_DISABLE',})"
-    assert tmpl.render(options=ViewOptionsSchema()) == "policy.FLAGS({})"
+    assert tmpl.render(options=options) == '"NO_MINIMIZE","DNS64_DISABLE",'
+    assert tmpl.render(options=ViewOptionsSchema()) == ""
 
 
 def test_view_answer():
@@ -40,8 +40,8 @@ def test_view_answer():
     "val,res",
     [
         ("allow", "policy.TAGS_ASSIGN({})"),
-        ("refused", "policy.REFUSE"),
-        ("noanswer", "policy.NO_ANSWER"),
+        ("refused", "'policy.REFUSE'"),
+        ("noanswer", "'policy.NO_ANSWER'"),
     ],
 )
 def test_view_answer(val: Any, res: Any):
@@ -49,5 +49,5 @@ def test_view_answer(val: Any, res: Any):
 {{ view_answer(view.answer) }}"""
 
     tmpl = template_from_str(tmpl_str)
-    view = ViewSchema({"subnets": "10.0.0.0/8", "answer": val})
+    view = ViewSchema({"subnets": ["10.0.0.0/8"], "answer": val})
     assert tmpl.render(view=view) == res