From f529640e6a56ca27966058f309b023860abbb4de Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Fri, 27 Oct 2017 15:44:24 +0200 Subject: [PATCH] www/web-proxy-useracl: lint, style, whitespaces and menu --- www/web-proxy-useracl/+POST_INSTALL.post | 1 - www/web-proxy-useracl/Makefile | 5 ++-- www/web-proxy-useracl/pkg-descr | 1 + .../ProxyUserACL/Api/SettingsController.php | 22 ++++++++++-------- .../OPNsense/ProxyUserACL/Menu/Menu.xml | 3 +-- .../OPNsense/ProxyUserACL/reconfigure.php | 4 +++- .../templates/OPNsense/ProxyUserACL/+TARGETS | 2 +- .../OPNsense/ProxyUserACL/ProxyUserACL.conf | 23 +++++++++---------- 8 files changed, 31 insertions(+), 30 deletions(-) create mode 100644 www/web-proxy-useracl/pkg-descr diff --git a/www/web-proxy-useracl/+POST_INSTALL.post b/www/web-proxy-useracl/+POST_INSTALL.post index e64442019..f8c690fdd 100644 --- a/www/web-proxy-useracl/+POST_INSTALL.post +++ b/www/web-proxy-useracl/+POST_INSTALL.post @@ -2,4 +2,3 @@ if [ -f /var/run/squid/squid.pid ]; then service squid reload fi - diff --git a/www/web-proxy-useracl/Makefile b/www/web-proxy-useracl/Makefile index 78270dd46..aa41f51f0 100644 --- a/www/web-proxy-useracl/Makefile +++ b/www/web-proxy-useracl/Makefile @@ -1,9 +1,8 @@ PLUGIN_NAME= web-proxy-useracl PLUGIN_VERSION= 0.0.1 -PLUGIN_COMMENT= Group & User Squid ACL -PLUGIN_DEPENDS= +PLUGIN_COMMENT= Group and user ACL for the web proxy PLUGIN_MAINTAINER= kekek2@ya.ru -PLUGIN_WWW= http://smart-soft.ru +PLUGIN_WWW= http://smart-soft.ru PLUGIN_DEVEL= yes .include "../../Mk/plugins.mk" diff --git a/www/web-proxy-useracl/pkg-descr b/www/web-proxy-useracl/pkg-descr new file mode 100644 index 000000000..11c11d793 --- /dev/null +++ b/www/web-proxy-useracl/pkg-descr @@ -0,0 +1 @@ +Allow users and group-based policies in the web proxy. diff --git a/www/web-proxy-useracl/src/opnsense/mvc/app/controllers/OPNsense/ProxyUserACL/Api/SettingsController.php b/www/web-proxy-useracl/src/opnsense/mvc/app/controllers/OPNsense/ProxyUserACL/Api/SettingsController.php index 04bc8b8ca..298866378 100644 --- a/www/web-proxy-useracl/src/opnsense/mvc/app/controllers/OPNsense/ProxyUserACL/Api/SettingsController.php +++ b/www/web-proxy-useracl/src/opnsense/mvc/app/controllers/OPNsense/ProxyUserACL/Api/SettingsController.php @@ -55,11 +55,15 @@ class SettingsController extends ApiMutableModelControllerBase $this->sessionClose(); $mdlProxyUserACL = $this->getModel(); foreach ($mdlProxyUserACL->general->ACLs->ACL->getNodes() as $uuid => $acl) { - $mdlProxyUserACL->general->ACLs->ACL->{$uuid}->Domains = $this->decode($mdlProxyUserACL->general->ACLs->ACL->{$uuid}->Domains); + $mdlProxyUserACL->general->ACLs->ACL->{$uuid}->Domains = + $this->decode($mdlProxyUserACL->general->ACLs->ACL->{$uuid}->Domains); } $grid = new UIModelGrid($mdlProxyUserACL->general->ACLs->ACL); - return $grid->fetchBindRequest($this->request, array("Group", "Name", "Domains", "Black", "Priority", "uuid"), - "Priority"); + return $grid->fetchBindRequest( + $this->request, + array("Group", "Name", "Domains", "Black", "Priority", "uuid"), + "Priority" + ); } /** @@ -71,7 +75,6 @@ class SettingsController extends ApiMutableModelControllerBase { $result = array("result" => "failed"); if ($this->request->isPost() && $this->request->hasPost("ACL")) { - $result = array("result" => "failed", "validations" => array()); $mdlProxyUserACL = $this->getModel(); $post = $this->request->getPost("ACL"); @@ -104,7 +107,6 @@ class SettingsController extends ApiMutableModelControllerBase } if (count($result['validations']) <= 0) { - // save config if validated correctly $mdlProxyUserACL->serializeToConfig(); Config::getInstance()->save(); @@ -148,10 +150,8 @@ class SettingsController extends ApiMutableModelControllerBase { $result = array("result" => "failed"); if ($this->request->isPost() && $this->request->hasPost("ACL")) { - $mdlProxyUserACL = $this->getModel(); if ($uuid != null) { - $node = $mdlProxyUserACL->getNodeByReference('general.ACLs.ACL.' . $uuid); if ($node != null) { $result = array("result" => "failed", "validations" => array()); @@ -254,7 +254,6 @@ class SettingsController extends ApiMutableModelControllerBase { $result = array("result" => "failed"); if ($this->request->isPost() && $uuid != null && $this->request->hasPost("command")) { - $mdlProxyUserACL = $this->getModel(); $count = $this->repackPriority(); $nodes = $mdlProxyUserACL->general->ACLs->ACL->getNodes(); @@ -315,8 +314,11 @@ class SettingsController extends ApiMutableModelControllerBase $ldapBindURL .= strpos($server['host'], "::") !== false ? "[{$server['host']}]" : $server['host']; $ldapBindURL .= !empty($server['ldap_port']) ? ":{$server['ldap_port']}" : ""; $ldap_auth_server = $authFactory->get($server["name"]); - if ($ldap_auth_server->connect($ldapBindURL, $server["ldap_binddn"], - $server["ldap_bindpw"]) == false) { + if ($ldap_auth_server->connect( + $ldapBindURL, + $server["ldap_binddn"], + $server["ldap_bindpw"] + ) == false) { return gettext("Error connecting to LDAP server"); } diff --git a/www/web-proxy-useracl/src/opnsense/mvc/app/models/OPNsense/ProxyUserACL/Menu/Menu.xml b/www/web-proxy-useracl/src/opnsense/mvc/app/models/OPNsense/ProxyUserACL/Menu/Menu.xml index 143224b91..2ece1d18d 100644 --- a/www/web-proxy-useracl/src/opnsense/mvc/app/models/OPNsense/ProxyUserACL/Menu/Menu.xml +++ b/www/web-proxy-useracl/src/opnsense/mvc/app/models/OPNsense/ProxyUserACL/Menu/Menu.xml @@ -1,8 +1,7 @@ - + - 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 f52c40fec..4cdf96245 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 @@ -39,5 +39,7 @@ $domain = strtoupper((string) Config::getInstance()->object()->system->domain); array_map('unlink', glob("/usr/local/etc/squid/ACL_*.txt")); foreach ($mdlProxyUserACL->getNodeByReference('general.ACLs.ACL')->getNodes() as $acl) { - file_put_contents("/usr/local/etc/squid/ACL_" . $acl["Priority"] . ".txt", $acl["Name"] . "\n" . ($acl["Group"]["user"]["selected"] == "1" ? $acl["Name"] . "@" . $domain . "\n" : "")); + file_put_contents("/usr/local/etc/squid/ACL_" . + $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/+TARGETS b/www/web-proxy-useracl/src/opnsense/service/templates/OPNsense/ProxyUserACL/+TARGETS index 20b764aa7..65d5f705d 100644 --- a/www/web-proxy-useracl/src/opnsense/service/templates/OPNsense/ProxyUserACL/+TARGETS +++ b/www/web-proxy-useracl/src/opnsense/service/templates/OPNsense/ProxyUserACL/+TARGETS @@ -1 +1 @@ -ProxyUserACL.conf:/usr/local/etc/squid/auth/ProxyUserACL.conf \ No newline at end of file +ProxyUserACL.conf:/usr/local/etc/squid/auth/ProxyUserACL.conf 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 c8811c5d3..a2d1d67d6 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 @@ -59,30 +59,30 @@ acl domains_{{ACL.Priority}} url_regex {{element|replace(".","\.")}} {% if ACL.Priority == priority|string %} {% if ACL.Group == "group" %} {% if ldap|length == 1 %} -{% if helpers.exists('OPNsense.proxy.forward.icap.enable') and OPNsense.proxy.forward.icap.enable == '1' %} +{% if helpers.exists('OPNsense.proxy.forward.icap.enable') and OPNsense.proxy.forward.icap.enable == '1' %} adaptation_access response_mod {{ACL.Black}} group_ldap_{{ACL.Priority}} domains_{{ACL.Priority}} adaptation_access request_mod {{ACL.Black}} group_ldap_{{ACL.Priority}} domains_{{ACL.Priority}} -{% endif %} +{% endif %} {% if helpers.exists('OPNsense.ProxySSO.EnableSSO') and OPNsense.ProxySSO.EnableSSO == '1' %} http_access {{ACL.Black}} group_ldap_{{ACL.Priority}} domains_{{ACL.Priority}} -{% else %} +{% else %} {% for authcn in ldap[0].ldap_authcn.split(";") %} http_access {{ACL.Black}} group_ldap_{{ACL.Priority}}_{{ loop.index }} domains_{{ACL.Priority}} -{% endfor %} -{% endif %} -{% endif %} +{% endfor %} +{% endif %} +{% endif %} {% if local|length == 1 %} -{% if helpers.exists('OPNsense.proxy.forward.icap.enable') and OPNsense.proxy.forward.icap.enable == '1' %} +{% if helpers.exists('OPNsense.proxy.forward.icap.enable') and OPNsense.proxy.forward.icap.enable == '1' %} adaptation_access response_mod {{ACL.Black}} group_local_{{ACL.Priority}} domains_{{ACL.Priority}} adaptation_access request_mod {{ACL.Black}} group_local_{{ACL.Priority}} domains_{{ACL.Priority}} -{% endif %} +{% endif %} http_access {{ACL.Black}} group_local_{{ACL.Priority}} domains_{{ACL.Priority}} -{% endif %} +{% endif %} {% else %} -{% if helpers.exists('OPNsense.proxy.forward.icap.enable') and OPNsense.proxy.forward.icap.enable == '1' %} +{% if helpers.exists('OPNsense.proxy.forward.icap.enable') and OPNsense.proxy.forward.icap.enable == '1' %} adaptation_access response_mod {{ACL.Black}} user_{{ACL.Priority}} domains_{{ACL.Priority}} adaptation_access request_mod {{ACL.Black}} user_{{ACL.Priority}} domains_{{ACL.Priority}} -{% endif %} +{% endif %} http_access {{ACL.Black}} user_{{ACL.Priority}} domains_{{ACL.Priority}} {% endif %} {% break %} @@ -90,4 +90,3 @@ http_access {{ACL.Black}} user_{{ACL.Priority}} domains_{{ACL.Priority}} {% endfor %} {% endfor %} {% endif %} -