From: msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Date: Thu, 3 Jul 2014 14:37:16 +0000 (+0000)
Subject: Don't serve symlinked or non-world-readable files (STR #4450)
X-Git-Tag: v2.2b1~580
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=36618f454d709c7f43bd4148fc2e46b088726e20;p=thirdparty%2Fcups.git

Don't serve symlinked or non-world-readable files (STR #4450)


git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@11993 a1ca3aef-8c08-0410-bb20-df032aa958be
---

diff --git a/scheduler/client.c b/scheduler/client.c
index edb3e9deb4..73617eb709 100644
--- a/scheduler/client.c
+++ b/scheduler/client.c
@@ -2961,7 +2961,7 @@ get_file(cupsd_client_t *con,		/* I  - Client connection */
     if ((ptr = strchr(filename, '?')) != NULL)
       *ptr = '\0';
 
-    if ((status = stat(filename, filestats)) != 0)
+    if ((status = lstat(filename, filestats)) != 0)
     {
      /*
       * Drop the language prefix and try the root directory...
@@ -2973,12 +2973,33 @@ get_file(cupsd_client_t *con,		/* I  - Client connection */
       if ((ptr = strchr(filename, '?')) != NULL)
 	*ptr = '\0';
 
-      status = stat(filename, filestats);
+      status = lstat(filename, filestats);
     }
   }
 
  /*
-  * If we're found a directory, get the index.html file instead...
+  * If we've found a symlink, 404 the sucker to avoid disclosing information.
+  */
+
+  if (!status && S_ISLNK(filestats->st_mode))
+  {
+    cupsdLogClient(con, CUPSD_LOG_INFO, "Symlinks such as \"%s\" are not allowed.", filename);
+    return (NULL);
+  }
+
+ /*
+  * Similarly, if the file/directory does not have world read permissions, do
+  * not allow access...
+  */
+
+  if (!status && !(filestats->st_mode & S_IROTH))
+  {
+    cupsdLogClient(con, CUPSD_LOG_INFO, "Files/directories such as \"%s\" must be world-readable.", filename);
+    return (NULL);
+  }
+
+ /*
+  * If we've found a directory, get the index.html file instead...
   */
 
   if (!status && S_ISDIR(filestats->st_mode))