[patch] Support Squid 3.4 reply format for 1.5_beta

squidguard-1.5_beta-squid34.patch (text/plain), 5.08 KB, created by drserge on 2015-03-09 19:20:26 UTC

diff -r -U 3 squidGuard-1.5-beta.orig/src/main.c squidGuard-1.5-beta/src/main.c
--- squidGuard-1.5-beta.orig/src/main.c	2009-09-27 23:41:50.000000000 +0400
+++ squidGuard-1.5-beta/src/main.c	2015-03-09 22:02:57.678609447 +0300
@@ -64,6 +64,7 @@
 int passthrough = 0;
 int showBar = 0;   /* Do not display the progress bar. */
 char *globalCreateDb = NULL;
+int globalSquid34 = 0;
 int failsafe_mode = 0;
 int sig_hup = 0;
 int sig_alrm = 0;
@@ -91,6 +92,8 @@
   char buf[MAX_BUF];
   char *redirect,tmp[MAX_BUF];
   char *configFile = NULL;
+  char *status = NULL, *endptr;
+  long statusl = 0;
   time_t t;
 #if HAVE_SIGACTION
   struct sigaction act;
@@ -101,7 +104,7 @@
 #ifdef USE_SYSLOG
 openlog("squidGuard", LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL2);
 #endif
-  while ((ch = getopt(argc, argv, "hbduPC:t:c:v")) != EOF)
+  while ((ch = getopt(argc, argv, "hbdunPC:t:c:v")) != EOF)
     switch (ch) {
     case 'd':
        globalDebug = 1;
@@ -124,6 +127,9 @@
       fprintf(stderr, "SquidGuard: %s %s\n", VERSION,db_version(NULL,NULL,NULL));
       exit(0);
       break;
+    case 'n':
+      globalSquid34 = 1;
+      break;
     case 't':
       if((t = iso2sec(optarg)) == -1){
 	fprintf(stderr,"-t dateformat error, should be yyyy-mm-ddTHH:MM:SS\n");
@@ -185,7 +191,8 @@
 	sgReloadConfig();
       }
       if(failsafe_mode) {
-	puts("");
+	if (globalSquid34) puts("ERR message=\"squidGuard failsafe mode\"");
+	else puts("");
 	fflush(stdout);
 	if(sig_hup){
           sgReloadConfig();
@@ -194,7 +201,8 @@
       }
       if(parseLine(buf,&squidInfo) != 1){
 	sgLogError("ERROR: Error parsing squid line: %s",buf);
-	puts("");
+	if (globalSquid34) puts("BH message=\"squidGuard error parsing squid line\"");
+	else puts("");
       }
         else {
 	src = Source;
@@ -206,29 +214,54 @@
 	  acl = sgAclCheckSource(src);
 	  if((redirect = sgAclAccess(src,acl,&squidInfo)) == NULL){
 	    if(src == NULL || src->cont_search == 0){
-	      puts(""); 
+	      if (globalSquid34) puts("ERR");
+	      else puts("");
 	      break;
 	    } else
 	      if(src->next != NULL){
 		src = src->next;
 		continue;
 	      } else {
-		puts("");
+		if (globalSquid34) puts("ERR");
+		else puts("");
 		break;
 	      }
 	  } else {
-	    if(squidInfo.srcDomain[0] == '\0'){
-	      squidInfo.srcDomain[0] = '-';
-	      squidInfo.srcDomain[1] = '\0';
-	    }
-	    if(squidInfo.ident[0] == '\0'){
-	      squidInfo.ident[0] = '-';
-	      squidInfo.ident[1] = '\0';
+	    if (globalSquid34) {
+	      status = strsep(&redirect, ":");
+	      if (status != NULL) {
+	        // trying to check the 1st colon-separeted field to be a HTTP status
+	        statusl = strtol(status, &endptr, 10);
+	        // if the 1st field is not an acceptable HTTP status then restore the string
+	        switch (statusl) {
+	        case 301:
+	        case 302:
+	        case 303:
+	        case 307:
+	        case 308:
+	          break;
+	        default:
+	          statusl = 0;
+	          redirect = status;
+	          redirect[strlen(redirect)] = ':';
+	        }
+	      }
+	      if (statusl) fprintf(stdout, "OK status=%s url=\"%s\"\n", status, redirect);
+	      else fprintf(stdout, "OK rewrite-url=\"%s\"\n", redirect);
+	    } else {
+	      if(squidInfo.srcDomain[0] == '\0'){
+	        squidInfo.srcDomain[0] = '-';
+	        squidInfo.srcDomain[1] = '\0';
+	      }
+	      if(squidInfo.ident[0] == '\0'){
+	        squidInfo.ident[0] = '-';
+	        squidInfo.ident[1] = '\0';
+	      }
+	      fprintf(stdout,"%s %s/%s %s %s\n",redirect,squidInfo.src,
+		      squidInfo.srcDomain,squidInfo.ident,
+		      squidInfo.method);
+	      /* sgLogDebug("DEBUG: %s %s/%s %s %s\n",redirect,squidInfo.src,squidInfo.srcDomain,squidInfo.ident,squidInfo.method);  */
 	    }
-	    fprintf(stdout,"%s %s/%s %s %s\n",redirect,squidInfo.src,
-		    squidInfo.srcDomain,squidInfo.ident,
-		    squidInfo.method);
-            /* sgLogDebug("DEBUG: %s %s/%s %s %s\n",redirect,squidInfo.src,squidInfo.srcDomain,squidInfo.ident,squidInfo.method);  */
 	    break;
 	  }
 	} /*for(;;)*/
@@ -271,6 +304,7 @@
   fprintf(stderr, 
 	  "Usage: squidGuard [-u] [-C block] [-t time] [-c file] [-v] [-d] [-P]\n");
   fprintf(stderr, "Options:\n");
+  fprintf(stderr, "  -n          : Use Squid 3.4+ reply format");
   fprintf(stderr, "  -v          : show version number\n");
   fprintf(stderr, "  -d          : all errors to stderr\n");
   fprintf(stderr, "  -b          : switch on the progress bar when updating the blacklists\n");
diff -r -U 3 squidGuard-1.5-beta.orig/src/sgDiv.c squidGuard-1.5-beta/src/sgDiv.c
--- squidGuard-1.5-beta.orig/src/sgDiv.c	2009-09-27 23:41:50.000000000 +0400
+++ squidGuard-1.5-beta/src/sgDiv.c	2015-03-09 22:04:42.161093315 +0300
@@ -21,6 +21,8 @@
 
 /* #define METEST 8; */
 
+extern int globalSquid34;
+
 #if __STDC__
 void sgHandlerSigHUP(int signal)
 #else
@@ -782,7 +784,8 @@
   }
   sgLogError("ERROR: Going into emergency mode");
   while(fgets(buf, MAX_BUF, stdin) != NULL){
-    puts("");
+    if (globalSquid34) puts("ERR message=\"squidGuard emergency mode\"");
+    else puts("");
     fflush(stdout);
   }
   sgLogError("ERROR: Ending emergency mode, stdin empty");