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

Services: Captive Portal: Administration - remove Transparent proxy settings, closes https://github.com/opnsense/core/issues/7557

Browse Source
This commit is contained in:
Ad Schellevis 2024-06-26 15:34:10 +02:00
parent 818b0412f5
commit 167a2eb985
4 changed files with 0 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/opnsense/mvc/app/controllers/OPNsense/CaptivePortal/forms/dialogZone.xml
View File

@ -92,20 +92,6 @@
<allownew>true</allownew>
<advanced>true</advanced>
</field>
<field>
<id>zone.transparentHTTPProxy</id>
<label>Transparent proxy (HTTP)</label>
<type>checkbox</type>
<help><![CDATA[Forward HTTP traffic to transparent proxy]]></help>
<allownew>true</allownew>
</field>
<field>
<id>zone.transparentHTTPSProxy</id>
<label>Transparent proxy (HTTPS)</label>
<type>checkbox</type>
<help><![CDATA[Forward HTTPS traffic to transparent proxy]]></help>
<allownew>true</allownew>
</field>
<field>
<id>zone.extendedPreAuthData</id>
<type>checkbox</type>

8
src/opnsense/mvc/app/models/OPNsense/CaptivePortal/CaptivePortal.xml
View File

@ -72,14 +72,6 @@
<allowedMACAddresses type="MacAddressField">
<asList>Y</asList>
</allowedMACAddresses>
<transparentHTTPProxy type="BooleanField">
<Default>0</Default>
<Required>Y</Required>
</transparentHTTPProxy>
<transparentHTTPSProxy type="BooleanField">
<Default>0</Default>
<Required>Y</Required>
</transparentHTTPSProxy>
<extendedPreAuthData type="BooleanField">
<Default>0</Default>
<Required>Y</Required>

2
src/opnsense/service/templates/OPNsense/IPFW/ipfw.conf
View File

@ -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

16
src/opnsense/service/templates/OPNsense/IPFW/ipfw.fw.conf
View File

@ -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 %}