Commit 62438642 authored by Jos Schellevis's avatar Jos Schellevis

Proxy work in progress, split regex and domain acls

parent e51362cf
...@@ -80,7 +80,7 @@ acl bannedHosts src {{ip}} ...@@ -80,7 +80,7 @@ acl bannedHosts src {{ip}}
{% if ('^' or '\\' or '$' or '[') in element %} {% if ('^' or '\\' or '$' or '[') in element %}
acl whiteList url_regex {{element}} acl whiteList url_regex {{element}}
{% else %} {% else %}
acl whiteList dstdomain {{element}} acl whiteList_dom dstdomain {{element}}
{% endif %} {% endif %}
{% endfor %} {% endfor %}
{% endif %} {% endif %}
...@@ -91,7 +91,7 @@ acl whiteList dstdomain {{element}} ...@@ -91,7 +91,7 @@ acl whiteList dstdomain {{element}}
{% if ('^' or '\\' or '$' or '[') in element %} {% if ('^' or '\\' or '$' or '[') in element %}
acl blackList url_regex {{element}} acl blackList url_regex {{element}}
{% else %} {% else %}
acl blackList dstdomain {{element}} acl blackList_dom dstdomain {{element}}
{% endif %} {% endif %}
{% endfor %} {% endfor %}
{% endif %} {% endif %}
...@@ -155,6 +155,7 @@ http_access allow unrestricted ...@@ -155,6 +155,7 @@ http_access allow unrestricted
# ACL list (Allow) whitelist # ACL list (Allow) whitelist
http_access allow whiteList http_access allow whiteList
http_access allow whiteList_dom
{% endif %} {% endif %}
{% if helpers.exists('OPNsense.proxy.forward.acl.blackList') %} {% if helpers.exists('OPNsense.proxy.forward.acl.blackList') %}
...@@ -162,6 +163,7 @@ http_access allow whiteList ...@@ -162,6 +163,7 @@ http_access allow whiteList
# #
# ACL list (Deny) blacklist # ACL list (Deny) blacklist
http_access deny blackList http_access deny blackList
http_access deny blackList_dom
{% endif %} {% endif %}
{% if helpers.exists('OPNsense.proxy.forward.acl.browser') %} {% if helpers.exists('OPNsense.proxy.forward.acl.browser') %}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment