Attachment 24259 Details for Bug 61517

[patch] sanitize.patch

sanitize.patch (text/plain), 6.45 KB, created by Klaus Singvogel on 2004-09-30 16:55:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Klaus Singvogel

Created: 2004-09-30 16:55:19 UTC

Size: 6.45 KB

patch

obsolete

>Index: client.c
>===================================================================
>RCS file: /home/anoncvs/cups/scheduler/client.c,v
>retrieving revision 1.194
>diff -u -d -b -w -r1.194 client.c
>--- client.c	12 Sep 2004 18:49:26 -0000	1.194
>+++ client.c	29 Sep 2004 20:36:51 -0000
>@@ -35,6 +35,7 @@
>  *   SendHeader()          - Send an HTTP request.
>  *   UpdateCGI()           - Read status messages from CGI scripts and programs.
>  *   WriteClient()         - Write data to a client as needed.
>+ *   SanitizeURI()         - Remove any username and password from a uri.
>  *   check_if_modified()   - Decode an "If-Modified-Since" line.
>  *   decode_auth()         - Decode an authorization string.
>  *   get_file()            - Get a filename and state info.
>@@ -2486,6 +2487,34 @@
> 
> 
> /*
>+ * 'SanitizeURI()' - Remove any username and password from a uri.
>+ */
>+
>+char *					/* O - sanitized uri */
>+SanitizeURI(char *buf,			/* O - buffer for sanitized uri */
>+	    int bufsize,		/* I - buffer size */
>+	    const char *uri)		/* I - uri to sanitize */
>+{
>+  char	method[HTTP_MAX_URI],		/* Method portion of URI */
>+	username[HTTP_MAX_URI],		/* Username portion of URI */
>+	host[HTTP_MAX_URI],		/* Host portion of URI */
>+	resource[HTTP_MAX_URI];		/* Resource portion of URI */
>+  int	port;				/* Port portion of URI */
>+
>+
>+  httpSeparate3(uri, method, sizeof(method), username, sizeof(username), 
>+		host, sizeof(host), &port, resource, sizeof(resource), 0);
>+
>+  if (port)
>+    snprintf(buf, bufsize, "%s://%s:%d%s", method, host, port, resource);
>+  else
>+    snprintf(buf, bufsize, "%s://%s%s", method, host, resource);
>+
>+  return buf;
>+}
>+
>+
>+/*
>  * 'check_if_modified()' - Decode an "If-Modified-Since" line.
>  */
> 
>Index: client.h
>===================================================================
>RCS file: /home/anoncvs/cups/scheduler/client.h,v
>retrieving revision 1.33
>diff -u -d -b -w -r1.33 client.h
>--- client.h	23 Aug 2004 18:00:59 -0000	1.33
>+++ client.h	29 Sep 2004 20:36:51 -0000
>@@ -112,6 +112,7 @@
> extern void	StopListening(void);
> extern void	UpdateCGI(void);
> extern int	WriteClient(client_t *con);
>+extern char	*SanitizeURI(char *buf, int bufsize, const char *uri);
> 
> /*
>  * End of "$Id$".
>Index: ipp.c
>===================================================================
>RCS file: /home/anoncvs/cups/scheduler/ipp.c,v
>retrieving revision 1.233
>diff -u -d -b -w -r1.233 ipp.c
>--- ipp.c	23 Aug 2004 18:36:50 -0000	1.233
>+++ ipp.c	29 Sep 2004 20:36:51 -0000
>@@ -1035,8 +1035,12 @@
> 					/* Username portion of URI */
> 			host[HTTP_MAX_URI],
> 					/* Host portion of URI */
>-			resource[HTTP_MAX_URI];
>+			resource[HTTP_MAX_URI],
> 					/* Resource portion of URI */
>+			old_device_uri[HTTP_MAX_URI],
>+					/* Sanitized old URI */
>+			new_device_uri[HTTP_MAX_URI];
>+					/* Sanitized new URI */
>   int			port;		/* Port portion of URI */
>   printer_t		*printer;	/* Printer/class */
>   ipp_attribute_t	*attr;		/* Printer attribute */
>@@ -1222,7 +1226,9 @@
>     }
> 
>     LogMessage(L_INFO, "Setting %s device-uri to \"%s\" (was \"%s\".)",
>-               printer->name, attr->values[0].string.text, printer->device_uri);
>+		printer->name, 
>+		SanitizeURI(new_device_uri, sizeof(new_device_uri), attr->values[0].string.text),
>+		SanitizeURI(old_device_uri, sizeof(old_device_uri), printer->device_uri));
> 
>     SetString(&printer->device_uri, attr->values[0].string.text);
>   }
>Index: job.c
>===================================================================
>RCS file: /home/anoncvs/cups/scheduler/job.c,v
>retrieving revision 1.230
>diff -u -d -b -w -r1.230 job.c
>--- job.c	9 Sep 2004 15:10:18 -0000	1.230
>+++ job.c	29 Sep 2004 20:36:51 -0000
>@@ -1202,6 +1202,7 @@
> 		classification[1024],	/* CLASSIFICATION environment variable */
> 		content_type[1024],	/* CONTENT_TYPE environment variable */
> 		device_uri[1024],	/* DEVICE_URI environment variable */
>+		device_uri2[1024],	/* Sanitized device uri */
> 		ppd[1024],		/* PPD environment variable */
> 		class_name[255],	/* CLASS environment variable */
> 		printer_name[255],	/* PRINTER environment variable */
>@@ -1689,6 +1690,12 @@
>              attr->values[0].string.text);
>   }
> 
>+ /*
>+  * Create a sanitized version of the device uri for logging purposes
>+  */
>+
>+  SanitizeURI(device_uri2, sizeof(device_uri2), printer->device_uri);
>+
>   snprintf(path, sizeof(path), "PATH=%s/filter:/bin:/usr/bin", ServerBin);
>   snprintf(content_type, sizeof(content_type), "CONTENT_TYPE=%s/%s",
>            current->filetypes[current->current_file]->super,
>@@ -1802,6 +1809,9 @@
>   envp[envc] = NULL;
> 
>   for (i = 0; i < envc; i ++)
>+    if (!strncmp(envp[i], "DEVICE_URI=", 11))
>+      LogMessage(L_DEBUG, "StartJob: envp[%d]=\"DEVICE_URI=%s\"", i, device_uri2);
>+    else
>     LogMessage(L_DEBUG, "StartJob: envp[%d]=\"%s\"", i, envp[i]);
> 
>   current->current_file ++;
>@@ -1908,10 +1918,10 @@
>       if (filterfds[slot][1] < 0)
>       {
>         LogMessage(L_ERROR, "Unable to open output file \"%s\" - %s.",
>-	           printer->device_uri, strerror(errno));
>+	           device_uri2, strerror(errno));
>         snprintf(printer->state_message, sizeof(printer->state_message),
> 		 "Unable to open output file \"%s\" - %s.",
>-	         printer->device_uri, strerror(errno));
>+	         device_uri2, strerror(errno));
> 
> 	AddPrinterHistory(printer);
> 
>Index: printers.c
>===================================================================
>RCS file: /home/anoncvs/cups/scheduler/printers.c,v
>retrieving revision 1.162
>diff -u -d -b -w -r1.162 printers.c
>--- printers.c	29 Jun 2004 03:27:35 -0000	1.162
>+++ printers.c	29 Sep 2004 20:36:52 -0000
>@@ -1150,11 +1150,7 @@
> SetPrinterAttrs(printer_t *p)		/* I - Printer to setup */
> {
>   char		uri[HTTP_MAX_URI];	/* URI for printer */
>-  char		method[HTTP_MAX_URI],	/* Method portion of URI */
>-		username[HTTP_MAX_URI],	/* Username portion of URI */
>-		host[HTTP_MAX_URI],	/* Host portion of URI */
>-		resource[HTTP_MAX_URI];	/* Resource portion of URI */
>-  int		port;			/* Port portion of URI */
>+  char		resource[HTTP_MAX_URI];	/* Resource portion of URI */
>   int		i;			/* Looping var */
>   char		filename[1024];		/* Name of PPD file */
>   int		num_media;		/* Number of media options */
>@@ -1360,12 +1356,7 @@
>         * http://..., ipp://..., etc.
> 	*/
> 
>-        httpSeparate(p->device_uri, method, username, host, &port, resource);
>-	if (port)
>-	  snprintf(uri, sizeof(uri), "%s://%s:%d%s", method, host, port,
>-	           resource);
>-	else
>-	  snprintf(uri, sizeof(uri), "%s://%s%s", method, host, resource);
>+	SanitizeURI(uri, sizeof(uri), p->device_uri);
>       }
>       else
>       {

Actions: View | Diff

Attachments on bug 61517: 24259