Parse individual paths listed in the UserDir directive for correctness.

  This also addresses the 'quote' problem, where quoted paths would fail
  the is absolute redirect or absolute path test on Netware/Win32, given
  a "/somepath" designation.

PR: 8238
Submitted by:	Dustin Mitchell <dustin@cs.uchicago.edu>

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@91388 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/modules/standard/mod_userdir.c b/src/modules/standard/mod_userdir.c
index 22a3ba17740a87e0aea5885408079fe4c1d3b602..29b3df945ce428b1cad12cdf9f00403738bc4cfc 100644 (file)
--- a/src/modules/standard/mod_userdir.c
+++ b/src/modules/standard/mod_userdir.c
@@ -166,21 +166,26 @@ static const char *set_user_dir(cmd_parms *cmd, void *dummy, char *arg)
     }
     else {
         /*
-         * If the first (only?) value isn't one of our keywords, just copy
-         * the string to the userdir string.
+         * If the first (only?) value isn't one of our keywords, look at each
+         * config 'word' for validity and copy the entire arg to the userdir 
+         * if all paths are valid.
          */
-        if (!ap_os_is_path_absolute(arg) && !strchr(arg, ':'))
+        char *userdirs = arg;
+        while (*userdirs) {
+            char *thisdir = ap_getword_conf(cmd->pool, &userdirs);
+            if (!ap_os_is_path_absolute(thisdir) && !strchr(thisdir, ':'))
 #if defined(WIN32) || defined(NETWARE)
-            return "UserDir must specify an absolute redirect or absolute "
-                   "file path";
+                return "UserDir must specify an absolute redirect "
+                       "or absolute file path";
 #else
-            if (strchr(arg, '*'))
-                 return "UserDir cannot specify '*' substitution within a "
-                        "relative path";
+                if (strchr(thisdir, '*'))
+                     return "UserDir cannot specify '*' substitution within "
+                            "a relative path";
 #endif
+        }
         s_cfg->userdir = ap_pstrdup(cmd->pool, arg);
 #if defined(WIN32) || defined(OS2) || defined(NETWARE)
-        /* This is an incomplete path, so we cannot canonicalize it yet.
+        /* These are incomplete paths, so we cannot canonicalize them yet.
          * but any backslashes will confuse the parser, later, so simply
          * change them to slash form.
          */