arrfab / rpms / httpd

Forked from rpms/httpd 5 years ago
Clone

Blame SOURCES/httpd-2.4.6-r1664565.patch

07ea28
--- httpd/modules/mappers/mod_rewrite.c  2015/03/06 08:55:34 1664564
07ea28
+++ httpd/modules/mappers/mod_rewrite.c 2015/03/06 09:14:07 1664565
07ea28
@@ -267,6 +267,8 @@
07ea28
     const char *dbdq;              /* SQL SELECT statement for rewritemap */
07ea28
     const char *checkfile2;        /* filename to check for map existence
07ea28
                                       NULL if only one file               */
07ea28
+    const char *user;              /* run RewriteMap program as this user */
07ea28
+    const char *group;             /* run RewriteMap program as this group */
07ea28
 } rewritemap_entry;
07ea28
 
07ea28
 /* special pattern types for RewriteCond */
07ea28
@@ -1171,6 +1173,7 @@
07ea28
 
07ea28
 static apr_status_t rewritemap_program_child(apr_pool_t *p,
07ea28
                                              const char *progname, char **argv,
07ea28
+                                             const char *user, const char *group,
07ea28
                                              apr_file_t **fpout,
07ea28
                                              apr_file_t **fpin)
07ea28
 {
07ea28
@@ -1183,6 +1186,8 @@
07ea28
                                                   APR_FULL_BLOCK, APR_NO_PIPE))
07ea28
         && APR_SUCCESS == (rc=apr_procattr_dir_set(procattr,
07ea28
                                              ap_make_dirstr_parent(p, argv[0])))
07ea28
+        && (!user || APR_SUCCESS == (rc=apr_procattr_user_set(procattr, user, "")))
07ea28
+        && (!group || APR_SUCCESS == (rc=apr_procattr_group_set(procattr, group)))
07ea28
         && APR_SUCCESS == (rc=apr_procattr_cmdtype_set(procattr, APR_PROGRAM))
07ea28
         && APR_SUCCESS == (rc=apr_procattr_child_errfn_set(procattr,
07ea28
                                                            rewrite_child_errfn))
07ea28
@@ -1240,6 +1245,7 @@
07ea28
         }
07ea28
 
07ea28
         rc = rewritemap_program_child(p, map->argv[0], map->argv,
07ea28
+                                      map->user, map->group,
07ea28
                                       &fpout, &fpin);
07ea28
         if (rc != APR_SUCCESS || fpin == NULL || fpout == NULL) {
07ea28
             ap_log_error(APLOG_MARK, APLOG_ERR, rc, s, APLOGNO(00654)
07ea28
@@ -3018,7 +3024,7 @@
07ea28
 }
07ea28
 
07ea28
 static const char *cmd_rewritemap(cmd_parms *cmd, void *dconf, const char *a1,
07ea28
-                                  const char *a2)
07ea28
+                                  const char *a2, const char *a3)
07ea28
 {
07ea28
     rewrite_server_conf *sconf;
07ea28
     rewritemap_entry *newmap;
07ea28
@@ -3124,6 +3130,11 @@
07ea28
 
07ea28
         newmap->type      = MAPTYPE_PRG;
07ea28
         newmap->checkfile = newmap->argv[0];
07ea28
+        if (a3) {
07ea28
+            char *tok_cntx;
07ea28
+            newmap->user = apr_strtok(apr_pstrdup(cmd->pool, a3), ":", &tok_cntx);
07ea28
+            newmap->group = apr_strtok(NULL, ":", &tok_cntx);
07ea28
+        }
07ea28
     }
07ea28
     else if (strncasecmp(a2, "int:", 4) == 0) {
07ea28
         newmap->type      = MAPTYPE_INT;
07ea28
@@ -5205,8 +5216,8 @@
07ea28
                      "an input string and a to be applied regexp-pattern"),
07ea28
     AP_INIT_RAW_ARGS("RewriteRule",     cmd_rewriterule,     NULL, OR_FILEINFO,
07ea28
                      "an URL-applied regexp-pattern and a substitution URL"),
07ea28
-    AP_INIT_TAKE2(   "RewriteMap",      cmd_rewritemap,      NULL, RSRC_CONF,
07ea28
-                     "a mapname and a filename"),
07ea28
+    AP_INIT_TAKE23(   "RewriteMap",      cmd_rewritemap,      NULL, RSRC_CONF,
07ea28
+                     "a mapname and a filename and options"),
07ea28
     { NULL }
07ea28
 };
07ea28