From 6a35f018f7db8e915d1e108a47080119e68be1e4 Mon Sep 17 00:00:00 2001 From: doktornotor Date: Fri, 25 Sep 2015 10:21:23 +0200 Subject: squid3 - code style fixes --- config/squid3/34/squid_auth.xml | 166 ++++++++++++++++++++++------------------ 1 file changed, 91 insertions(+), 75 deletions(-) diff --git a/config/squid3/34/squid_auth.xml b/config/squid3/34/squid_auth.xml index 7f54b156..e2bae945 100755 --- a/config/squid3/34/squid_auth.xml +++ b/config/squid3/34/squid_auth.xml @@ -2,53 +2,48 @@ - - +. - All rights reserved. - */ -/* ========================================================================== */ + squid_auth.xml + part of pfSense (https://www.pfSense.org/) + Copyright (C) 2012-2014 Marcello Coutinho + Copyright (C) 2015 ESF, LLC + All rights reserved. +*/ +/* ====================================================================================== */ /* - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are met: + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + + + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. - 1. Redistributions of source code MUST retain the above copyright notice, - this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, - INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY - AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, - OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - */ -/* ========================================================================== */ - ]]> - - Describe your package here - Describe your package requirements here - Currently there are no FAQ items provided. + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, + INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY + AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, + OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. +*/ +/* ====================================================================================== */ + ]]> + squidauth - none - Proxy server: Authentication + 0.3.5 + Proxy Server: Authentication /usr/local/pkg/squid.inc @@ -85,7 +80,7 @@ /pkg.php?xml=squid_users.xml - Real time + Real Time /squid_monitor.php @@ -99,7 +94,7 @@ listtopic - Authentication method + Authentication Method auth_method Select an authentication method. This will allow users to be authenticated by local or external services. select @@ -111,33 +106,38 @@ - + on_auth_method_changed() - Authentication server + Authentication Server auth_server - Enter here the IP or hostname of the server that will perform the authentication. + Enter the IP or hostname of the server that will perform the authentication here. input 60 Authentication server port auth_server_port - Enter here the port to use to connect to the authentication server. Leave this field blank to use the authentication method's default port. + + + Leave this field blank to use the authentication method's default port. + ]]> + input 60 - Authentication prompt + Authentication Prompt auth_prompt This string will be displayed at the top of the authentication request window. input Please enter your credentials to access the proxy - Authentication processes + Authentication Processes auth_processes The number of authenticator processes to spawn. If many authentications are expected within a short timeframe, increase this number accordingly. input @@ -147,74 +147,87 @@ Authentication TTL auth_ttl - This specifies for how long (in seconds) the proxy server assumes an externally validated username and password combination is valid (Time To Live). When the TTL expires, the user will be prompted for credentials again.Default value is 5. + + + When the TTL expires, the user will be prompted for credentials again.
+ Default value: 5. + ]]> + input 5 5 - Requiere authentication for unrestricted hosts + Require Authentication for Unrestricted Hosts unrestricted_auth - If this option is enabled, even users tagged as unrestricted through access control are required to authenticate to use the proxy. + If enabled, even users tagged as unrestricted through access control are required to authenticate to use the proxy. checkbox - Subnets that don't need authentication + Subnets That Don't Need Authentication no_auth_hosts - Enter each subnet or IP address on a new line (in CIDR format, e.g.: 10.5.0.0/16, 192.168.1.50/32) that should not be asked for authentication to access the proxy. + + + Example (subnet): 10.5.0.0/16
+ Example (single host): 192.168.1.50/32

+ Note: Put each entry on a separate line. + ]]> + textarea 50 5 base64 - Squid Authentication Ldap Settings + Squid Authentication LDAP Settings listtopic LDAP version ldap_version - Enter LDAP protocol version (2 or 3). + Select LDAP protocol version. select 2 - - + + - LDAP server user DN + LDAP Server User DN ldap_user - Enter here the user DN to use to connect to the LDAP server. + Enter the user DN to use to connect to the LDAP server here. input 60 - LDAP password + LDAP Password ldap_pass - Enter here the password to use to connect to the LDAP server. + Enter the password to use to connect to the LDAP server here. password 20 - LDAP base domain + LDAP Base Domain ldap_basedomain - For LDAP authentication, enter here the base domain in the LDAP server. + Enter the base domain of the LDAP server here. input 60 - LDAP username DN attribute + LDAP Username DN Attribute ldap_userattribute - Enter LDAP username DN attibute. + Enter LDAP username DN attibute here. input 20 uid - LDAP search filter + LDAP Search Filter ldap_filter - Enter LDAP search filter. + Enter LDAP search filter here. input 40 (&(objectClass=person)(uid=%s)) @@ -224,27 +237,27 @@ listtopic - NT domain + NT Domain auth_ntdomain - Enter here the NT domain. + Enter the NT domain here. input 60 - Secondary NT servers + Secondary NT Servers msnt_secondary - Comma-separated list of secondary servers to be used for NT domain authentication. + Enter comma-separated list of secondary servers to be used for NT domain authentication here. input 60 - Squid Authentication Radius Settings + Squid Authentication RADIUS Settings listtopic - RADIUS secret + RADIUS Secret radius_secret - The RADIUS secret for RADIUS authentication. + Enter the RADIUS secret for RADIUS authentication here. password 20 @@ -262,9 +275,12 @@ squid_print_javascript_auth2(); + -- cgit v1.2.3