From 1d4262579eccfacf375b7c110366bd6e7a273b68 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Mon, 20 Nov 2017 04:39:21 +0100 Subject: [PATCH] www/web-proxy-useracl: merge version 0.0.2 from master --- www/web-proxy-useracl/Makefile | 2 +- .../opnsense/scripts/OPNsense/ProxyUserACL/reconfigure.php | 4 ++-- .../templates/OPNsense/ProxyUserACL/ProxyUserACL.conf | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/www/web-proxy-useracl/Makefile b/www/web-proxy-useracl/Makefile index aa41f51f0..b6dd831ad 100644 --- a/www/web-proxy-useracl/Makefile +++ b/www/web-proxy-useracl/Makefile @@ -1,5 +1,5 @@ PLUGIN_NAME= web-proxy-useracl -PLUGIN_VERSION= 0.0.1 +PLUGIN_VERSION= 0.0.2 PLUGIN_COMMENT= Group and user ACL for the web proxy PLUGIN_MAINTAINER= kekek2@ya.ru PLUGIN_WWW= http://smart-soft.ru diff --git a/www/web-proxy-useracl/src/opnsense/scripts/OPNsense/ProxyUserACL/reconfigure.php b/www/web-proxy-useracl/src/opnsense/scripts/OPNsense/ProxyUserACL/reconfigure.php index 4cdf96245..013f38074 100755 --- a/www/web-proxy-useracl/src/opnsense/scripts/OPNsense/ProxyUserACL/reconfigure.php +++ b/www/web-proxy-useracl/src/opnsense/scripts/OPNsense/ProxyUserACL/reconfigure.php @@ -37,9 +37,9 @@ use \OPNsense\Core\Config; $mdlProxyUserACL = new ProxyUserACL(); $domain = strtoupper((string) Config::getInstance()->object()->system->domain); -array_map('unlink', glob("/usr/local/etc/squid/ACL_*.txt")); +array_map('unlink', glob("/usr/local/etc/squid/ACL_useracl_*.txt")); foreach ($mdlProxyUserACL->getNodeByReference('general.ACLs.ACL')->getNodes() as $acl) { - file_put_contents("/usr/local/etc/squid/ACL_" . + file_put_contents("/usr/local/etc/squid/ACL_useracl_" . $acl["Priority"] . ".txt", $acl["Name"] . "\n" . ($acl["Group"]["user"]["selected"] == "1" ? $acl["Name"] . "@" . $domain . "\n" : "")); } diff --git a/www/web-proxy-useracl/src/opnsense/service/templates/OPNsense/ProxyUserACL/ProxyUserACL.conf b/www/web-proxy-useracl/src/opnsense/service/templates/OPNsense/ProxyUserACL/ProxyUserACL.conf index a2d1d67d6..fc2def83a 100644 --- a/www/web-proxy-useracl/src/opnsense/service/templates/OPNsense/ProxyUserACL/ProxyUserACL.conf +++ b/www/web-proxy-useracl/src/opnsense/service/templates/OPNsense/ProxyUserACL/ProxyUserACL.conf @@ -30,16 +30,16 @@ external_acl_type ext_ldap_{{ ACL.Priority }}_{{ loop.index }} ttl=300 negative_ {% else %} external_acl_type ext_ldap_{{ ACL.Priority }}_{{ loop.index }} ttl=300 negative_ttl=60 %LOGIN /usr/local/libexec/squid/ext_ldap_group_acl -R -b "{{ldap[0].ldap_basedn}}" -f "(&({{ldap[0].ldap_attr_user}}=%u)(memberOf=cn=%a,{{authcn}}))" -D "{{ldap[0].ldap_binddn}}" -w "{{ldap[0].ldap_bindpw}}" -p "{{ldap[0].ldap_port}}" "{{ldap[0].host}}" {% endif %} -acl group_ldap_{{ACL.Priority}}_{{ loop.index }} external ext_ldap_{{ ACL.Priority }}_{{ loop.index }} "/usr/local/etc/squid/ACL_{{ ACL.Priority }}.txt" +acl group_ldap_{{ACL.Priority}}_{{ loop.index }} external ext_ldap_{{ ACL.Priority }}_{{ loop.index }} "/usr/local/etc/squid/ACL_useracl_{{ ACL.Priority }}.txt" {% endfor %} {% endif %} {% endif %} {% if local|length == 1 %} external_acl_type ext_group_local_{{ ACL.Priority }} ttl=300 negative_ttl=60 %LOGIN /usr/local/libexec/squid/ext_unix_group_acl -p -acl group_local_{{ACL.Priority}} external ext_group_local_{{ ACL.Priority }} "/usr/local/etc/squid/ACL_{{ ACL.Priority }}.txt" +acl group_local_{{ACL.Priority}} external ext_group_local_{{ ACL.Priority }} "/usr/local/etc/squid/ACL_useracl_{{ ACL.Priority }}.txt" {% endif %} {% else %} -acl user_{{ACL.Priority}} proxy_auth "/usr/local/etc/squid/ACL_{{ ACL.Priority }}.txt" +acl user_{{ACL.Priority}} proxy_auth "/usr/local/etc/squid/ACL_useracl_{{ ACL.Priority }}.txt" {% endif %} {% if ldap|length == 1 or local|length == 1 %} {% for element in ACL.Domains.split(",") %}