diff --git a/src/opnsense/mvc/app/controllers/OPNsense/CaptivePortal/forms/dialogZone.xml b/src/opnsense/mvc/app/controllers/OPNsense/CaptivePortal/forms/dialogZone.xml index 71c3c2c9a..c83111975 100644 --- a/src/opnsense/mvc/app/controllers/OPNsense/CaptivePortal/forms/dialogZone.xml +++ b/src/opnsense/mvc/app/controllers/OPNsense/CaptivePortal/forms/dialogZone.xml @@ -92,20 +92,6 @@ true true - - zone.transparentHTTPProxy - - checkbox - - true - - - zone.transparentHTTPSProxy - - checkbox - - true - zone.extendedPreAuthData checkbox diff --git a/src/opnsense/mvc/app/models/OPNsense/CaptivePortal/CaptivePortal.xml b/src/opnsense/mvc/app/models/OPNsense/CaptivePortal/CaptivePortal.xml index 534e5401b..de9b76664 100644 --- a/src/opnsense/mvc/app/models/OPNsense/CaptivePortal/CaptivePortal.xml +++ b/src/opnsense/mvc/app/models/OPNsense/CaptivePortal/CaptivePortal.xml @@ -72,14 +72,6 @@ Y - - 0 - Y - - - 0 - Y - 0 Y diff --git a/src/opnsense/service/templates/OPNsense/IPFW/ipfw.conf b/src/opnsense/service/templates/OPNsense/IPFW/ipfw.conf index 332faeeea..0309547f1 100644 --- a/src/opnsense/service/templates/OPNsense/IPFW/ipfw.conf +++ b/src/opnsense/service/templates/OPNsense/IPFW/ipfw.conf @@ -215,8 +215,6 @@ add {{loop.index + 60000}} {{ helpers.getUUIDtag(rule.target) }} {{ {% endfor %} {% endif %} -{% include "OPNsense/IPFW/ipfw.fw.conf" ignore missing with context %} - # pass authorized add 65533 pass ip from any to any diff --git a/src/opnsense/service/templates/OPNsense/IPFW/ipfw.fw.conf b/src/opnsense/service/templates/OPNsense/IPFW/ipfw.fw.conf deleted file mode 100644 index 9cbf60189..000000000 --- a/src/opnsense/service/templates/OPNsense/IPFW/ipfw.fw.conf +++ /dev/null @@ -1,16 +0,0 @@ - -{# - parse all active captive portal zones and create redirect rules where transparent mode is enabled -#} -{% for cp_zone in cp_interface_list %} -{% if cp_zone.obj.transparentHTTPProxy|default('0') == '1' %} -# HTTP redirect {{ cp_zone.zone }} -add 60005 skipto 65533 tcp from me to any dst-port 80 via {{ cp_zone.if }} -add 65532 fwd 127.0.0.1,{{ OPNsense.proxy.forward.port }} tcp from any to any dst-port 80 via {{ cp_zone.if }} -{% endif %} -{% if cp_zone.obj.transparentHTTPSProxy|default('0') == '1' %} -# HTTPS redirect {{ cp_zone.zone }} -add 60005 skipto 65533 tcp from me to any dst-port 443 via {{ cp_zone.if }} -add 65532 fwd 127.0.0.1,{{ OPNsense.proxy.forward.sslbumpport }} tcp from any to any dst-port 443 via {{ cp_zone.if }} -{% endif %} -{% endfor %}