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