proxy: Add option to require a certain group for Internet access.

diff --git a/doc/language_issues.es b/doc/language_issues.es
index b61cd97d9a76fe0445e4ab006368ad5cfccfed6d..d4e23f8f0a93d3c7ba2aac53920fa669957bb5e0 100644 (file)
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -593,6 +593,8 @@ WARNING: untranslated string: advproxy cache-digest
 WARNING: untranslated string: advproxy errmsg cache
 WARNING: untranslated string: advproxy errmsg invalid upstream proxy
 WARNING: untranslated string: advproxy errmsg proxy ports equal
+WARNING: untranslated string: advproxy group access control
+WARNING: untranslated string: advproxy group required
 WARNING: untranslated string: advproxy proxy port transparent
 WARNING: untranslated string: atm device
 WARNING: untranslated string: attention

diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index 8eb091598f8f6158110faf6c301660e010e1e34c..26c8646938f9a2b0a040335584775ed01dca43e6 100644 (file)
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -603,6 +603,8 @@ WARNING: untranslated string: advproxy cache-digest
 WARNING: untranslated string: advproxy errmsg cache
 WARNING: untranslated string: advproxy errmsg invalid upstream proxy
 WARNING: untranslated string: advproxy errmsg proxy ports equal
+WARNING: untranslated string: advproxy group access control
+WARNING: untranslated string: advproxy group required
 WARNING: untranslated string: advproxy proxy port transparent
 WARNING: untranslated string: atm device
 WARNING: untranslated string: attention

diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index ab81aed86e792b43583ab75e15ed0357de172740..7f4091872d26951078dfd19f0adac72032c2f37a 100644 (file)
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -656,6 +656,8 @@ WARNING: untranslated string: administrator password
 WARNING: untranslated string: administrator username
 WARNING: untranslated string: advproxy AUTH method ntlm
 WARNING: untranslated string: advproxy AUTH method ntlm auth
+WARNING: untranslated string: advproxy group access control
+WARNING: untranslated string: advproxy group required
 WARNING: untranslated string: atm device
 WARNING: untranslated string: bytes
 WARNING: untranslated string: capabilities

diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index b61cd97d9a76fe0445e4ab006368ad5cfccfed6d..d4e23f8f0a93d3c7ba2aac53920fa669957bb5e0 100644 (file)
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -593,6 +593,8 @@ WARNING: untranslated string: advproxy cache-digest
 WARNING: untranslated string: advproxy errmsg cache
 WARNING: untranslated string: advproxy errmsg invalid upstream proxy
 WARNING: untranslated string: advproxy errmsg proxy ports equal
+WARNING: untranslated string: advproxy group access control
+WARNING: untranslated string: advproxy group required
 WARNING: untranslated string: advproxy proxy port transparent
 WARNING: untranslated string: atm device
 WARNING: untranslated string: attention

diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index 1d0c0906853802b6db7e503239fbb0740cd58b88..dd3af2de7ad364eb21cc1eb7294913c50831a182 100644 (file)
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -596,6 +596,8 @@ WARNING: untranslated string: advproxy cache-digest
 WARNING: untranslated string: advproxy errmsg cache
 WARNING: untranslated string: advproxy errmsg invalid upstream proxy
 WARNING: untranslated string: advproxy errmsg proxy ports equal
+WARNING: untranslated string: advproxy group access control
+WARNING: untranslated string: advproxy group required
 WARNING: untranslated string: advproxy proxy port transparent
 WARNING: untranslated string: atm device
 WARNING: untranslated string: attention

diff --git a/doc/language_issues.tr b/doc/language_issues.tr
index 6b0336b002d99947db7a49c0b433ae53f05a4842..c8dbfc156f41b27d80eb7e17063965f3c86c14d1 100644 (file)
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -655,6 +655,8 @@ WARNING: untranslated string: administrator password
 WARNING: untranslated string: administrator username
 WARNING: untranslated string: advproxy AUTH method ntlm
 WARNING: untranslated string: advproxy AUTH method ntlm auth
+WARNING: untranslated string: advproxy group access control
+WARNING: untranslated string: advproxy group required
 WARNING: untranslated string: bytes
 WARNING: untranslated string: capabilities
 WARNING: untranslated string: default

diff --git a/doc/language_missings b/doc/language_missings
index d4bb2e4cc92f7aa5874b18dbb375868a5a283e22..79e26bd0d5bf9712c8c42b74fe64d3c7ec5b5a19 100644 (file)
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -23,6 +23,8 @@
 < advproxy errmsg cache
 < advproxy errmsg invalid upstream proxy
 < advproxy errmsg proxy ports equal
+< advproxy group access control
+< advproxy group required
 < advproxy proxy port transparent
 < age second
 < age seconds
@@ -551,6 +553,8 @@
 < advproxy errmsg cache
 < advproxy errmsg invalid upstream proxy
 < advproxy errmsg proxy ports equal
+< advproxy group access control
+< advproxy group required
 < advproxy proxy port transparent
 < age second
 < age seconds
@@ -1072,6 +1076,8 @@
 < advproxy errmsg cache
 < advproxy errmsg invalid upstream proxy
 < advproxy errmsg proxy ports equal
+< advproxy group access control
+< advproxy group required
 < advproxy proxy port transparent
 < age second
 < age seconds
@@ -1569,6 +1575,8 @@
 < advproxy errmsg cache
 < advproxy errmsg invalid upstream proxy
 < advproxy errmsg proxy ports equal
+< advproxy group access control
+< advproxy group required
 < advproxy proxy port transparent
 < age second
 < age seconds

diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi
index 9476b743243dc1a2ec0c6b87ee622191bf23f4df..45105feca64e7b68232ad7819d017a991f6859f3 100644 (file)
--- a/html/cgi-bin/proxy.cgi
+++ b/html/cgi-bin/proxy.cgi
@@ -266,6 +266,7 @@ $proxysettings{'LDAP_PORT'} = '389';
 $proxysettings{'LDAP_BINDDN_USER'} = '';
 $proxysettings{'LDAP_BINDDN_PASS'} = '';
 $proxysettings{'LDAP_GROUP'} = '';
+$proxysettings{'NTLM_AUTH_GROUP'} = '';
 $proxysettings{'NTLM_DOMAIN'} = '';
 $proxysettings{'NTLM_PDC'} = '';
 $proxysettings{'NTLM_BDC'} = '';
@@ -1994,6 +1995,27 @@ if ($proxysettings{'AUTH_METHOD'} eq 'ntlm') { print <<END
 END
 ; }
 
+# ===================================================================
+#  NTLM-AUTH settings
+# ===================================================================
+
+if ($proxysettings{'AUTH_METHOD'} eq 'ntlm-auth') {
+       print <<END;
+               <hr size ='1'>
+               <table width='100%'>
+                       <tr>
+                               <td colspan='4'><b>$Lang::tr{'advproxy group access control'}</b></td>
+                       </tr>
+                       <tr>
+                               <td width='20%' class='base'>$Lang::tr{'advproxy group required'}:&nbsp;<img src='/blob.gif' alt='*' /></td>
+                               <td width='40%'><input type='text' name='NTLM_AUTH_GROUP' value='$proxysettings{'NTLM_AUTH_GROUP'}' size='37' /></td>
+                               <td>&nbsp;</td>
+                               <td>&nbsp;</td>
+                       </tr>
+       </table>
+END
+}
+
 # ===================================================================
 #  LDAP auth settings
 # ===================================================================
@@ -3319,7 +3341,15 @@ END
 
                if ($proxysettings{'AUTH_METHOD'} eq 'ntlm-auth')
                {
-                       print FILE "auth_param ntlm program /usr/bin/ntlm_auth --helper-protocol=squid-2.5-ntlmssp\n";
+                       print FILE "auth_param ntlm program /usr/bin/ntlm_auth --helper-protocol=squid-2.5-ntlmssp";
+                       if ($proxysettings{'NTLM_AUTH_GROUP'}) {
+                               my $ntlm_auth_group = $proxysettings{'NTLM_AUTH_GROUP'};
+                               $ntlm_auth_group =~ s/\\/\+/;
+
+                               print FILE " --require-membership-of=\"$ntlm_auth_group\"";
+                       }
+                       print FILE "\n";
+
                        print FILE "auth_param ntlm children $proxysettings{'AUTH_CHILDREN'}\n";
                }
 

diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 20446b1358611677ee3b92ad42907813b0186d8c..6d880d47cd42b53806be04b4a82a68fa50bb810a 100644 (file)
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -266,6 +266,8 @@
 'advproxy fake useragent' => 'Gefälschter Useragent für externe Web-Sites',
 'advproxy friday' => 'Fre',
 'advproxy from' => 'Von',
+'advproxy group access control' => 'Gruppenbasierte Zugriffskontrolle',
+'advproxy group required' => 'Erforderliche Gruppe',
 'advproxy hdd cache size' => 'Cachegröße auf der Festplatte (MB)',
 'advproxy invalid num of children' => 'Ungültige Anzahl der Filter-Prozesse',
 'advproxy log enabled' => 'Protokoll aktiviert',

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 7acd15b36f53cd7e33294c3759b6c96310c1ba5e..d23dd60cc7324ff33210930f399b69077adba858 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -266,6 +266,8 @@
 'advproxy fake useragent' => 'Fake useragent submitted to external sites',
 'advproxy friday' => 'Fri',
 'advproxy from' => 'From',
+'advproxy group access control' => 'Group based access control',
+'advproxy group required' => 'Required group',
 'advproxy hdd cache size' => 'Harddisk cache size (MB)',
 'advproxy invalid num of children' => 'Invalid number of filter processes',
 'advproxy log enabled' => 'Log enabled',