Squid updates from Michael Capp

1 files changed, 353 insertions, 0 deletions

diff --git a/packages/squid_auth.inc b/packages/squid_auth.inc
new file mode 100644
index 00000000..7b29ce00
--- /dev/null
+++ b/packages/squid_auth.inc
@@ -0,0 +1,353 @@
+<?php 
+/* $Id$ */
+
+/*
+        squid_auth.inc
+        part of pfSense (www.pfSense.com)
+
+        Copyright (C) 2005 Michael Capp <michael.capp@gmail.com>
+        All rights reserved.
+
+        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.
+
+        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.
+
+*/
+
+function global_eval_auth_options(){
+	conf_mount_rw();
+	config_lock();
+	
+	global $config;
+	
+	$auth_method = $config['installedpackages']['squidauth']['config'][0]['auth_method'];
+	
+	switch ($auth_method) {
+		case "none":
+			$filecontents = file('/usr/local/pkg/squid_auth.xml');
+			
+			$fout = fopen("/usr/local/pkg/squid_auth.xml","w");
+			foreach($filecontents as $line) {
+				if (stristr($line, "<url>/pkg.php?xml=squid_extauth.xml&amp;id=0</url>")) {
+					fwrite($fout, "			<url>/pkg_edit.php?xml=squid_extauth.xml&amp;id=0</url>\n");
+				} else {
+					fwrite($fout, $line);
+				}
+			}
+			
+			dynamic_no_auth();
+			break;
+		case "local_auth":
+			dynamic_auth_content();
+			dynamic_local_auth();
+			break;
+		case "ldap_bind":
+			$filecontents = file('/usr/local/pkg/squid_auth.xml');
+			
+			$fout = fopen("/usr/local/pkg/squid_auth.xml","w");
+			foreach($filecontents as $line) {
+				if (stristr($line, "<url>/pkg.php?xml=squid_extauth.xml&amp;id=0</url>")) {
+					fwrite($fout, "			<url>/pkg_edit.php?xml=squid_extauth.xml&amp;id=0</url>\n");
+				} else {
+					fwrite($fout, $line);
+				}
+			}
+					
+			dynamic_ldap_auth();
+			break;
+		case "domain_auth":
+			$filecontents = file('/usr/local/pkg/squid_auth.xml');
+			
+			$fout = fopen("/usr/local/pkg/squid_auth.xml","w");
+			foreach($filecontents as $line) {
+				if (stristr($line, "<url>/pkg.php?xml=squid_extauth.xml&amp;id=0</url>")) {
+					fwrite($fout, "			<url>/pkg_edit.php?xml=squid_extauth.xml&amp;id=0</url>\n");
+				} else {
+					fwrite($fout, $line);
+				}
+			}
+					
+			dynamic_domain_auth();
+			break;
+		case "radius_auth":
+			$filecontents = file('/usr/local/pkg/squid_auth.xml');
+			
+			$fout = fopen("/usr/local/pkg/squid_auth.xml","w");
+			foreach($filecontents as $line) {
+				if (stristr($line, "<url>/pkg.php?xml=squid_extauth.xml&amp;id=0</url>")) {
+					fwrite($fout, "			<url>/pkg_edit.php?xml=squid_extauth.xml&amp;id=0</url>\n");
+				} else {
+					fwrite($fout, $line);
+				}
+			}
+					
+			dynamic_radius_auth();
+			break;
+		default:
+			$filecontents = file('/usr/local/pkg/squid_auth.xml');
+			
+			$fout = fopen("/usr/local/pkg/squid_auth.xml","w");
+			foreach($filecontents as $line) {
+				if (stristr($line, "<url>/pkg.php?xml=squid_extauth.xml&amp;id=0</url>")) {
+					fwrite($fout, "			<url>/pkg_edit.php?xml=squid_extauth.xml&amp;id=0</url>\n");
+				} else {
+					fwrite($fout, $line);
+				}
+			}
+					
+			dynamic_no_auth();
+			break;
+	}
+	
+	conf_mount_ro();
+	config_unlock();
+	
+} /* end function global_eval_auth_options */
+	
+function dynamic_no_auth() {
+	conf_mount_rw();
+	config_lock();
+	
+	global $config;
+	
+	$pkgfile = "/usr/local/pkg/squid_extauth.xml";
+	
+	$fout = fopen($pkgfile, "w");
+	
+	fwrite($fout, '<?xml version="1.0" encoding="utf-8" ?>' . "\n");
+	fwrite($fout, "<packagegui>\n");
+	fwrite($fout, "	<name>squidextnoauth</name>\n");
+	fwrite($fout, "	<title>Services: Squid Advanced Proxy -> Extended Authentication Settings</title>\n");
+	fwrite($fout, "	<configpath>installedpackages->package->squidextnoauth->configuration->settings</configpath>\n");
+	fwrite($fout, "\n");
+	fwrite($fout, "	<aftersaveredirect>/pkg_edit.php?xml=squid_extauth.xml&amp;id=0</aftersaveredirect>\n");
+	fwrite($fout, "\n");
+	fwrite($fout, "	<tabs>\n");
+	fwrite($fout, "		<tab>\n");
+	fwrite($fout, "			<text>General Settings</text>\n");
+	fwrite($fout, "			<url>/pkg_edit.php?xml=squid_ng.xml&amp;id=0</url>\n");
+	fwrite($fout, "		</tab>\n");
+	fwrite($fout, "\n");		
+	fwrite($fout, "		<tab>\n");
+	fwrite($fout, "			<text>Upstream Proxy</text>\n");
+	fwrite($fout, "			<url>/pkg_edit.php?xml=squid_upstream.xml&amp;id=0</url>\n");
+	fwrite($fout, "		</tab>\n");
+	fwrite($fout, "\n");
+	fwrite($fout, "		<tab>\n");
+	fwrite($fout, "			<text>Cache Mgmt</text>\n");
+	fwrite($fout, "			<url>/pkg_edit.php?xml=squid_cache.xml&amp;id=0</url>\n");
+	fwrite($fout, "		</tab>\n");
+	fwrite($fout, "\n");			
+	fwrite($fout, "		<tab>\n");
+	fwrite($fout, "			<text>Network Access Control</text>\n");
+	fwrite($fout, "			<url>/pkg_edit.php?xml=squid_nac.xml&amp;id=0</url>\n");
+	fwrite($fout, "		</tab>\n");
+	fwrite($fout, "\n");
+	fwrite($fout, "		<tab>\n");
+	fwrite($fout, "			<text>Traffic Mgmt</text>\n");
+	fwrite($fout, "			<url>/pkg_edit.php?xml=squid_traffic.xml&amp;id=0</url>\n");
+	fwrite($fout, "		</tab>\n");
+	fwrite($fout, "\n");
+	fwrite($fout, "		<tab>\n");
+	fwrite($fout, "			<text>Auth Settings</text>\n");
+	fwrite($fout, "			<url>/pkg_edit.php?xml=squid_auth.xml&amp;id=0</url>\n");
+	fwrite($fout, "		</tab>\n");
+	fwrite($fout, "\n");
+	fwrite($fout, "		<tab>\n");
+	fwrite($fout, "			<text>Extended Auth Settings</text>\n");
+	fwrite($fout, "			<url>/pkg_edit.php?xml=squid_extauth.xml&amp;id=0</url>\n");
+	fwrite($fout, "			<active/>\n");
+	fwrite($fout, "		</tab>\n");
+	fwrite($fout, "\n");
+	fwrite($fout, "	</tabs>\n");
+	fwrite($fout, "\n");
+	fwrite($fout, "	<fields>\n");
+	fwrite($fout, "		<field>\n");
+	fwrite($fout, "			<fielddescr>No Authentication Defined</fielddescr>\n");
+	fwrite($fout, "			<fieldname>no_auth</fieldname>\n");
+	fwrite($fout, "		</field>\n");
+	fwrite($fout, "	</fields>\n");
+	fwrite($fout, "\n");
+	fwrite($fout, "	<custom_add_php_command_late>\n");
+	fwrite($fout, '		require_once("/usr/local/pkg/squid_ng.inc");' . "\n");
+	fwrite($fout, "\n");
+	fwrite($fout, "		global_write_squid_config();\n");
+	fwrite($fout, '		mwexec("/usr/local/sbin/squid -k reconfigure");' . "\n");
+	fwrite($fout, "	</custom_add_php_command_late>\n");
+	fwrite($fout, "\n");
+	fwrite($fout, "</packagegui>\n");
+
+	fclose($fout);
+}		
+
+function dynamic_local_auth() {
+	conf_mount_rw();
+	config_lock();
+	
+	global $config;
+
+	$pkgfile = "/usr/local/pkg/squid_extauth.xml";
+	
+	$fout = fopen($pkgfile, "w");
+	
+	fwrite($fout, '<?xml version="1.0" encoding="utf-8" ?>' . "\n");
+	fwrite($fout, "\n");
+	fwrite($fout, "<packagegui>\n");
+	fwrite($fout, "	<name>squidextlocalauth</name>\n");
+	fwrite($fout, "	<title>Services: Squid Advanced Proxy -> Extended Authentication Settings</title>\n");
+	fwrite($fout, "	<version>2.5.10_4</version>\n");
+	fwrite($fout, "	<configpath>installedpackages->package->squidextlocalauth->configuration->settings</configpath>\n");
+	fwrite($fout, "\n");
+	fwrite($fout, "	<files></files>\n");
+	fwrite($fout, "	<menu></menu>\n");
+	fwrite($fout, "\n");
+	fwrite($fout, "	<aftersaveredirect>/pkg.php?xml=squid_extauth.xml&amp;id=0</aftersaveredirect>\n");
+	fwrite($fout, "\n");
+	fwrite($fout, "	<tabs>\n");
+	fwrite($fout, "		<tab>\n");
+	fwrite($fout, "			<text>General Settings</text>\n");
+	fwrite($fout, "			<url>/pkg_edit.php?xml=squid_ng.xml&amp;id=0</url>\n");
+	fwrite($fout, "		</tab>\n");
+	fwrite($fout, "\n");
+	fwrite($fout, "		<tab>\n");
+	fwrite($fout, "			<text>Upstream Proxy</text>\n");
+	fwrite($fout, "			<url>/pkg_edit.php?xml=squid_upstream.xml&amp;id=0</url>\n");
+	fwrite($fout, "		</tab>\n");
+	fwrite($fout, "\n");
+	fwrite($fout, "		<tab>\n");
+	fwrite($fout, "			<text>Cache Mgmt</text>\n");
+	fwrite($fout, "			<url>/pkg_edit.php?xml=squid_cache.xml&amp;id=0</url>\n");
+	fwrite($fout, "		</tab>\n");
+	fwrite($fout, "\n");
+	fwrite($fout, "		<tab>\n");
+	fwrite($fout, "			<text>Network Access Control</text>\n");
+	fwrite($fout, "			<url>/pkg_edit.php?xml=squid_nac.xml&amp;id=0</url>\n");
+	fwrite($fout, "		</tab>\n");
+	fwrite($fout, "\n");
+	fwrite($fout, "		<tab>\n");
+	fwrite($fout, "			<text>Traffic Mgmt</text>\n");
+	fwrite($fout, "			<url>/pkg_edit.php?xml=squid_traffic.xml&amp;id=0</url>\n");
+	fwrite($fout, "		</tab>\n");
+	fwrite($fout, "\n");
+	fwrite($fout, "		<tab>\n");
+	fwrite($fout, "			<text>Auth Settings</text>\n");
+	fwrite($fout, "			<url>/pkg_edit.php?xml=squid_auth.xml&amp;id=0</url>\n");
+	fwrite($fout, "		</tab>\n");
+	fwrite($fout, "\n");
+	fwrite($fout, "		<tab>\n");
+	fwrite($fout, "			<text>Extended Auth Settings</text>\n");
+	fwrite($fout, "			<url>/pkg.php?xml=squid_extauth.xml&amp;id=0</url>\n");
+	fwrite($fout, "			<active/>\n");
+	fwrite($fout, "		</tab>\n");
+	fwrite($fout, "\n");
+	fwrite($fout, "	</tabs>\n");
+	fwrite($fout, "\n");
+	fwrite($fout, "	<adddeleteeditpagefields>\n");
+	fwrite($fout, "			<columnitem>\n");
+	fwrite($fout, "			<fielddescr>Username</fielddescr>\n");
+	fwrite($fout, "			<fieldname>username</fieldname>\n");
+	fwrite($fout, "		</columnitem>\n");
+	fwrite($fout, "\n");
+	fwrite($fout, "		<columnitem>\n");
+	fwrite($fout, "			<fielddescr>Description</fielddescr>\n");
+	fwrite($fout, "			<fieldname>description</fieldname>\n");
+	fwrite($fout, "		</columnitem>\n");
+	fwrite($fout, "\n");
+	fwrite($fout, "		<columnitem>\n");
+	fwrite($fout, "			<fielddescr>Restriction Group</fielddescr>\n");
+	fwrite($fout, "			<fieldname>group</fieldname>\n");
+	fwrite($fout, "		</columnitem>\n");
+	fwrite($fout, "	</adddeleteeditpagefields>\n");
+	fwrite($fout, "\n");
+	fwrite($fout, "	<fields>\n");
+	fwrite($fout, "		<field>\n");
+	fwrite($fout, "			<fielddescr>Username</fielddescr>\n");
+	fwrite($fout, "			<fieldname>username</fieldname>\n");
+	fwrite($fout, "			<type>input</type>\n");
+	fwrite($fout, "			<size>15</size>\n");
+	fwrite($fout, "		</field>\n");
+	fwrite($fout, "\n");
+	fwrite($fout, "		<field>\n");
+	fwrite($fout, "			<fielddescr>Password</fielddescr>\n");
+	fwrite($fout, "			<fieldname>password</fieldname>\n");
+	fwrite($fout, "			<type>password</type>\n");
+	fwrite($fout, "			<size>8</size>\n");
+	fwrite($fout, "		</field>\n");
+	fwrite($fout, "\n");
+	fwrite($fout, "		<field>\n");
+	fwrite($fout, "			<fielddescr>Description (Optional)</fielddescr>\n");
+	fwrite($fout, "			<fieldname>description</fieldname>\n");
+	fwrite($fout, "			<type>input</type>\n");
+	fwrite($fout, "			<size>30</size>\n");
+	fwrite($fout, "		</field>\n");
+	fwrite($fout, "\n");
+	fwrite($fout, "		<field>\n");
+	fwrite($fout, "			<fielddescr>Restriction Group</fielddescr>\n");
+	fwrite($fout, "			<fieldname>group</fieldname>\n");
+	fwrite($fout, "			<type>select</type>\n");
+	fwrite($fout, "			<options>\n");
+	fwrite($fout, "				<option><name>Standard</name><value>Standard</value></option>\n");
+	fwrite($fout, "				<option><name>Extended</name><value>Extended</value></option>\n");
+	fwrite($fout, "			</options>\n");
+	fwrite($fout, "		</field>\n");
+	fwrite($fout, "\n");
+	fwrite($fout, "	</fields>\n");
+	fwrite($fout, "\n");
+	fwrite($fout, "	<custom_add_php_command_late>\n");
+	fwrite($fout, '		require_once("/usr/local/pkg/squid_ng.inc");' . "\n");
+	fwrite($fout, "\n");
+	fwrite($fout, '		if ($password == $confirm_password) { ' . "\n");
+	fwrite($fout, "			mod_htpasswd();\n");
+	fwrite($fout, "		}\n");
+	fwrite($fout, "		global_write_squid_config();\n");
+	fwrite($fout, '		mwexec("/usr/local/sbin/squid -k reconfigure");' . "\n");
+	fwrite($fout, "	</custom_add_php_command_late>\n");
+	fwrite($fout, "\n");
+	fwrite($fout, "</packagegui>\n");
+		
+	fclose($fout);
+	
+	conf_mount_ro();
+	config_unlock();
+} /* end function dynamic_local_auth */
+
+/* dynamically re-writes all squid xml files to handle adddeletecolumnitems properly */
+function dynamic_auth_content() {
+
+	if ($handle = opendir('/usr/local/pkg')) {
+		while (($file = readdir($handle)) != false) {
+			if (stristr($file, "squid_") && stristr($file, ".xml")) {
+				
+				$filecontents = file("/usr/local/pkg/" . $file);
+			
+				$fout = fopen("/usr/local/pkg/" . $file,"w");
+				foreach($filecontents as $line) {
+					if (stristr($line, "<url>/pkg_edit.php?xml=squid_extauth.xml&amp;id=0</url>")) {
+						fwrite($fout, "			<url>/pkg.php?xml=squid_extauth.xml&amp;id=0</url>\n");
+					} else {
+						fwrite($fout, $line);
+					}
+				}
+			}
+		}
+	}
+} /* end function dynamic_auth_content */
+
+?>
\ No newline at end of file