diff --git a/www/proxy-sso/+POST_DEINSTALL.post b/www/proxy-sso/+POST_DEINSTALL.post index b6e09cf6c..efd38ab66 100644 --- a/www/proxy-sso/+POST_DEINSTALL.post +++ b/www/proxy-sso/+POST_DEINSTALL.post @@ -2,4 +2,3 @@ rm -f /usr/local/etc/squid/pre-auth/20-negotiate.auth.conf if [ -f /var/run/squid/squid.pid ]; then configctl proxy reconfigure fi - diff --git a/www/proxy-sso/Makefile b/www/proxy-sso/Makefile index 1ef7524e8..299ab7361 100644 --- a/www/proxy-sso/Makefile +++ b/www/proxy-sso/Makefile @@ -1,8 +1,9 @@ -PLUGIN_NAME= proxy-sso +PLUGIN_NAME= web-proxy-sso PLUGIN_VERSION= 1.3 PLUGIN_COMMENT= Kerberos authentication module PLUGIN_DEPENDS= msktutil cyrus-sasl-gssapi PLUGIN_MAINTAINER= evbevz@gmail.com -PLUGIN_WWW= http://smart-soft.ru +PLUGIN_WWW= https://smart-soft.ru +PLUGIN_DEVEL= yes .include "../../Mk/plugins.mk" diff --git a/www/proxy-sso/pkg-descr b/www/proxy-sso/pkg-descr new file mode 100644 index 000000000..e6ca76c34 --- /dev/null +++ b/www/proxy-sso/pkg-descr @@ -0,0 +1,2 @@ +Allow to use the web proxy with Single Sign-On against an +Active Directory instead of using a bundled authentication. diff --git a/www/proxy-sso/src/opnsense/mvc/app/controllers/OPNsense/ProxySSO/Api/ServiceController.php b/www/proxy-sso/src/opnsense/mvc/app/controllers/OPNsense/ProxySSO/Api/ServiceController.php index 8120fc343..0815a2d69 100644 --- a/www/proxy-sso/src/opnsense/mvc/app/controllers/OPNsense/ProxySSO/Api/ServiceController.php +++ b/www/proxy-sso/src/opnsense/mvc/app/controllers/OPNsense/ProxySSO/Api/ServiceController.php @@ -138,7 +138,7 @@ class ServiceController extends \OPNsense\Proxy\Api\ServiceController $output = array("# drill {$hostname}"); exec("drill {$hostname}", $output); $dns_hostname_resolution["dump"] = implode("\n", $output); - + $resolv_reverse = null; $dns_hostname_reverse_resolution = array(); $output = array(); diff --git a/www/proxy-sso/src/opnsense/mvc/app/controllers/OPNsense/ProxySSO/IndexController.php b/www/proxy-sso/src/opnsense/mvc/app/controllers/OPNsense/ProxySSO/IndexController.php index 3f5df3681..49548860c 100644 --- a/www/proxy-sso/src/opnsense/mvc/app/controllers/OPNsense/ProxySSO/IndexController.php +++ b/www/proxy-sso/src/opnsense/mvc/app/controllers/OPNsense/ProxySSO/IndexController.php @@ -14,4 +14,3 @@ class IndexController extends \OPNsense\Base\IndexController $this->view->checkListForm = $this->getForm("checklist"); } } - diff --git a/www/proxy-sso/src/opnsense/mvc/app/controllers/OPNsense/ProxySSO/forms/checklist.xml b/www/proxy-sso/src/opnsense/mvc/app/controllers/OPNsense/ProxySSO/forms/checklist.xml index 9467a1bd0..44b3cb251 100644 --- a/www/proxy-sso/src/opnsense/mvc/app/controllers/OPNsense/ProxySSO/forms/checklist.xml +++ b/www/proxy-sso/src/opnsense/mvc/app/controllers/OPNsense/ProxySSO/forms/checklist.xml @@ -67,4 +67,3 @@ Keytab file must exist and be valid. - diff --git a/www/proxy-sso/src/opnsense/mvc/app/controllers/OPNsense/ProxySSO/forms/general.xml b/www/proxy-sso/src/opnsense/mvc/app/controllers/OPNsense/ProxySSO/forms/general.xml index f3e3e478f..9eeb7c6dd 100644 --- a/www/proxy-sso/src/opnsense/mvc/app/controllers/OPNsense/ProxySSO/forms/general.xml +++ b/www/proxy-sso/src/opnsense/mvc/app/controllers/OPNsense/ProxySSO/forms/general.xml @@ -12,4 +12,3 @@ Select Windows Server version for AD controller - diff --git a/www/proxy-sso/src/opnsense/mvc/app/controllers/OPNsense/ProxySSO/forms/testing_create.xml b/www/proxy-sso/src/opnsense/mvc/app/controllers/OPNsense/ProxySSO/forms/testing_create.xml index 9899ab0da..71d4f12e7 100644 --- a/www/proxy-sso/src/opnsense/mvc/app/controllers/OPNsense/ProxySSO/forms/testing_create.xml +++ b/www/proxy-sso/src/opnsense/mvc/app/controllers/OPNsense/ProxySSO/forms/testing_create.xml @@ -16,4 +16,3 @@ Active Directory user password (this value is not stored in configuration). - diff --git a/www/proxy-sso/src/opnsense/mvc/app/controllers/OPNsense/ProxySSO/forms/testing_test.xml b/www/proxy-sso/src/opnsense/mvc/app/controllers/OPNsense/ProxySSO/forms/testing_test.xml index f74d92115..243baef5b 100644 --- a/www/proxy-sso/src/opnsense/mvc/app/controllers/OPNsense/ProxySSO/forms/testing_test.xml +++ b/www/proxy-sso/src/opnsense/mvc/app/controllers/OPNsense/ProxySSO/forms/testing_test.xml @@ -10,4 +10,3 @@ password - diff --git a/www/proxy-sso/src/opnsense/mvc/app/models/OPNsense/ProxySSO/Menu/Menu.xml b/www/proxy-sso/src/opnsense/mvc/app/models/OPNsense/ProxySSO/Menu/Menu.xml index a01f33557..f2294e670 100644 --- a/www/proxy-sso/src/opnsense/mvc/app/models/OPNsense/ProxySSO/Menu/Menu.xml +++ b/www/proxy-sso/src/opnsense/mvc/app/models/OPNsense/ProxySSO/Menu/Menu.xml @@ -5,4 +5,3 @@ - diff --git a/www/proxy-sso/src/opnsense/mvc/app/models/OPNsense/ProxySSO/ProxySSO.php b/www/proxy-sso/src/opnsense/mvc/app/models/OPNsense/ProxySSO/ProxySSO.php index d0608ea04..76d8d1586 100644 --- a/www/proxy-sso/src/opnsense/mvc/app/models/OPNsense/ProxySSO/ProxySSO.php +++ b/www/proxy-sso/src/opnsense/mvc/app/models/OPNsense/ProxySSO/ProxySSO.php @@ -7,4 +7,3 @@ use OPNsense\Base\BaseModel; class ProxySSO extends BaseModel { } - diff --git a/www/proxy-sso/src/opnsense/mvc/app/models/OPNsense/ProxySSO/ProxySSO.xml b/www/proxy-sso/src/opnsense/mvc/app/models/OPNsense/ProxySSO/ProxySSO.xml index e1acbf100..08f5e9abc 100644 --- a/www/proxy-sso/src/opnsense/mvc/app/models/OPNsense/ProxySSO/ProxySSO.xml +++ b/www/proxy-sso/src/opnsense/mvc/app/models/OPNsense/ProxySSO/ProxySSO.xml @@ -18,4 +18,3 @@ - diff --git a/www/proxy-sso/src/opnsense/mvc/app/views/OPNsense/ProxySSO/index.volt b/www/proxy-sso/src/opnsense/mvc/app/views/OPNsense/ProxySSO/index.volt index 737547c44..62f3951d9 100644 --- a/www/proxy-sso/src/opnsense/mvc/app/views/OPNsense/ProxySSO/index.volt +++ b/www/proxy-sso/src/opnsense/mvc/app/views/OPNsense/ProxySSO/index.volt @@ -85,7 +85,7 @@ $("#RefreshCheckList").removeClass("disabled"); $.each(data.frm_CheckList, function(index, value){ - + // clear data $("#" + index).html(""); $(".help-block[for='" + index + "']").html(""); diff --git a/www/proxy-sso/src/opnsense/service/conf/actions.d/actions_proxysso.conf b/www/proxy-sso/src/opnsense/service/conf/actions.d/actions_proxysso.conf index 03dfb00d6..457b860c5 100644 --- a/www/proxy-sso/src/opnsense/service/conf/actions.d/actions_proxysso.conf +++ b/www/proxy-sso/src/opnsense/service/conf/actions.d/actions_proxysso.conf @@ -5,7 +5,7 @@ type:script_output message:show kerberos keytab [createkeytab] -command:/usr/local/opnsense/scripts/OPNsense/ProxySSO/squid-gen-keytab.sh +command:/usr/local/opnsense/scripts/OPNsense/ProxySSO/squid-gen-keytab.sh parameters:-n %s -d %s -k %s -e %s -u %s -p %s type:script_output message:create keytab