upstream/opnsense-plugins
1
0
Fork 0
mirror of https://github.com/opnsense/plugins.git synced 2026-06-04 14:26:13 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

www/squid: patch up squid wanting SafePorts out of the box

Browse source 
> ERROR: ACL not found: Safe_ports
This commit is contained in:
Franco Fichtner 2024-07-30 11:51:39 +02:00
parent ee3fa0bc38
commit 3ab6e06aaa
2 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
www/squid/src/opnsense/mvc/app/models/OPNsense/Proxy/Proxy.xml
View file

@ -1,6 +1,6 @@
<model>
<mount>//OPNsense/proxy</mount>
<version>1.0.6</version>
<version>1.0.7</version>
<description>Squid web proxy settings</description>
<items>
<general>
@ -362,7 +362,9 @@
</OptionValues>
</youtube>
<safePorts type="CSVListField">
<Mask>/^([ \-0-9a-zA-Z:,])*/u</Mask>
<default>80:http,21:ftp,443:https,70:gopher,210:wais,1025-65535:unregistered ports,280:http-mgmt,488:gss-http,591:filemaker,777:multiling http</default>
<mask>/^([ \-0-9a-zA-Z:,])*/u</mask>
<Required>Y</Required>
</safePorts>
<sslPorts type="CSVListField">
<Mask>/^([ \-0-9a-zA-Z:,])*/u</Mask>

7
www/squid/src/opnsense/service/templates/OPNsense/Proxy/squid.conf
View file

@ -227,13 +227,10 @@ acl SSL_ports port {{element.split(":")[0]}} # {{element.split(":")[1]|default('
{% endif %}
# Default Safe ports are now defined in config.xml
# Configured Safe ports (if defaults are not listed, then they have been removed from the configuration!):
{% if helpers.exists('OPNsense.proxy.forward.acl.safePorts') %}
# ACL - Safe_ports
{% for element in OPNsense.proxy.forward.acl.safePorts.split(",") %}
{% for element in OPNsense.proxy.forward.acl.safePorts.split(",") %}
acl Safe_ports port {{element.split(":")[0]}} # {{element.split(":")[1]|default('unknown')}}
{% endfor %}
{% endif %}
{% endfor %}
acl CONNECT method CONNECT
# ICAP SETTINGS