Mirror fix from trunk.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/branches/branch-1.7@11995 a1ca3aef-8c08-0410-bb20-df032aa958be

diff --git a/CHANGES.txt b/CHANGES.txt
index faac2ac9b681b289e816d2d6c84f2884e034fc29..d96107622dcf688c49bfebc9c1a19863891dbe63 100644 (file)
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,8 +1,11 @@
-CHANGES.txt - 1.7.4 - 2014-07-02
+CHANGES.txt - 1.7.4 - 2014-07-03
 --------------------------------
 
 CHANGES IN CUPS V1.7.4
 
+       - Security: The web interface incorrectly served symlinked files and
+         files that were not world-readable, potentially leading to a
+         disclosure of information (STR #4450)
        - The CUPS headers incorrectly needed libdispatch for blocks support
          (STR #4397)
        - CUPS did not compile when Avahi or mDNSResponder was not present

diff --git a/scheduler/client.c b/scheduler/client.c
index 6f40585bc592a8a31c3dc3723aa51a2d9abf2bde..8037b49dd943f323f3e75d030121c8687d22314c 100644 (file)
--- a/scheduler/client.c
+++ b/scheduler/client.c
@@ -3327,7 +3327,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...
@@ -3339,12 +3339,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))