| 1 |
fielding |
420983 |
/* Licensed to the Apache Software Foundation (ASF) under one or more |
| 2 |
|
|
* contributor license agreements. See the NOTICE file distributed with |
| 3 |
|
|
* this work for additional information regarding copyright ownership. |
| 4 |
|
|
* The ASF licenses this file to You under the Apache License, Version 2.0 |
| 5 |
|
|
* (the "License"); you may not use this file except in compliance with |
| 6 |
|
|
* the License. You may obtain a copy of the License at |
| 7 |
fielding |
83751 |
* |
| 8 |
nd |
102525 |
* http://www.apache.org/licenses/LICENSE-2.0 |
| 9 |
fielding |
83751 |
* |
| 10 |
nd |
102525 |
* Unless required by applicable law or agreed to in writing, software |
| 11 |
|
|
* distributed under the License is distributed on an "AS IS" BASIS, |
| 12 |
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
| 13 |
|
|
* See the License for the specific language governing permissions and |
| 14 |
|
|
* limitations under the License. |
| 15 |
fielding |
83751 |
*/ |
| 16 |
|
|
|
| 17 |
|
|
/* |
| 18 |
|
|
* http_alias.c: Stuff for dealing with directory aliases |
| 19 |
jim |
332306 |
* |
| 20 |
fielding |
83751 |
* Original by Rob McCool, rewritten in succession by David Robinson |
| 21 |
|
|
* and rst. |
| 22 |
jim |
332306 |
* |
| 23 |
fielding |
83751 |
*/ |
| 24 |
|
|
|
| 25 |
rbb |
85867 |
#include "apr_strings.h" |
| 26 |
gstein |
88060 |
#include "apr_lib.h" |
| 27 |
|
|
|
| 28 |
|
|
#define APR_WANT_STRFUNC |
| 29 |
|
|
#include "apr_want.h" |
| 30 |
|
|
|
| 31 |
rbb |
84531 |
#include "ap_config.h" |
| 32 |
fielding |
83751 |
#include "httpd.h" |
| 33 |
coar |
93143 |
#include "http_core.h" |
| 34 |
fielding |
83751 |
#include "http_config.h" |
| 35 |
fielding |
83770 |
#include "http_request.h" |
| 36 |
coar |
93137 |
#include "http_log.h" |
| 37 |
fielding |
83751 |
|
| 38 |
gstein |
88060 |
|
| 39 |
fielding |
83751 |
typedef struct { |
| 40 |
ben |
85644 |
const char *real; |
| 41 |
|
|
const char *fake; |
| 42 |
fielding |
83751 |
char *handler; |
| 43 |
jorton |
153384 |
ap_regex_t *regexp; |
| 44 |
jerenkrantz |
95503 |
int redir_status; /* 301, 302, 303, 410, etc */ |
| 45 |
fielding |
83751 |
} alias_entry; |
| 46 |
|
|
|
| 47 |
|
|
typedef struct { |
| 48 |
dougm |
85976 |
apr_array_header_t *aliases; |
| 49 |
|
|
apr_array_header_t *redirects; |
| 50 |
fielding |
83751 |
} alias_server_conf; |
| 51 |
|
|
|
| 52 |
|
|
typedef struct { |
| 53 |
dougm |
85976 |
apr_array_header_t *redirects; |
| 54 |
fielding |
83751 |
} alias_dir_conf; |
| 55 |
|
|
|
| 56 |
wrowe |
86609 |
module AP_MODULE_DECLARE_DATA alias_module; |
| 57 |
fielding |
83751 |
|
| 58 |
dougm |
85976 |
static void *create_alias_config(apr_pool_t *p, server_rec *s) |
| 59 |
fielding |
83751 |
{ |
| 60 |
|
|
alias_server_conf *a = |
| 61 |
dougm |
85976 |
(alias_server_conf *) apr_pcalloc(p, sizeof(alias_server_conf)); |
| 62 |
fielding |
83751 |
|
| 63 |
dougm |
88019 |
a->aliases = apr_array_make(p, 20, sizeof(alias_entry)); |
| 64 |
|
|
a->redirects = apr_array_make(p, 20, sizeof(alias_entry)); |
| 65 |
fielding |
83751 |
return a; |
| 66 |
|
|
} |
| 67 |
|
|
|
| 68 |
dougm |
85976 |
static void *create_alias_dir_config(apr_pool_t *p, char *d) |
| 69 |
fielding |
83751 |
{ |
| 70 |
|
|
alias_dir_conf *a = |
| 71 |
dougm |
85976 |
(alias_dir_conf *) apr_pcalloc(p, sizeof(alias_dir_conf)); |
| 72 |
dougm |
88019 |
a->redirects = apr_array_make(p, 2, sizeof(alias_entry)); |
| 73 |
fielding |
83751 |
return a; |
| 74 |
|
|
} |
| 75 |
|
|
|
| 76 |
dougm |
85976 |
static void *merge_alias_config(apr_pool_t *p, void *basev, void *overridesv) |
| 77 |
fielding |
83751 |
{ |
| 78 |
|
|
alias_server_conf *a = |
| 79 |
dougm |
85976 |
(alias_server_conf *) apr_pcalloc(p, sizeof(alias_server_conf)); |
| 80 |
jerenkrantz |
95503 |
alias_server_conf *base = (alias_server_conf *) basev; |
| 81 |
|
|
alias_server_conf *overrides = (alias_server_conf *) overridesv; |
| 82 |
fielding |
83751 |
|
| 83 |
dougm |
88019 |
a->aliases = apr_array_append(p, overrides->aliases, base->aliases); |
| 84 |
|
|
a->redirects = apr_array_append(p, overrides->redirects, base->redirects); |
| 85 |
fielding |
83751 |
return a; |
| 86 |
|
|
} |
| 87 |
|
|
|
| 88 |
dougm |
85976 |
static void *merge_alias_dir_config(apr_pool_t *p, void *basev, void *overridesv) |
| 89 |
fielding |
83751 |
{ |
| 90 |
|
|
alias_dir_conf *a = |
| 91 |
dougm |
85976 |
(alias_dir_conf *) apr_pcalloc(p, sizeof(alias_dir_conf)); |
| 92 |
jerenkrantz |
95503 |
alias_dir_conf *base = (alias_dir_conf *) basev; |
| 93 |
|
|
alias_dir_conf *overrides = (alias_dir_conf *) overridesv; |
| 94 |
dougm |
88019 |
a->redirects = apr_array_append(p, overrides->redirects, base->redirects); |
| 95 |
fielding |
83751 |
return a; |
| 96 |
|
|
} |
| 97 |
|
|
|
| 98 |
nd |
98647 |
/* need prototype for overlap check */ |
| 99 |
|
|
static int alias_matches(const char *uri, const char *alias_fakename); |
| 100 |
|
|
|
| 101 |
ben |
85644 |
static const char *add_alias_internal(cmd_parms *cmd, void *dummy, |
| 102 |
jerenkrantz |
95503 |
const char *f, const char *r, |
| 103 |
|
|
int use_regex) |
| 104 |
fielding |
83751 |
{ |
| 105 |
|
|
server_rec *s = cmd->server; |
| 106 |
gstein |
88225 |
alias_server_conf *conf = ap_get_module_config(s->module_config, |
| 107 |
|
|
&alias_module); |
| 108 |
dougm |
88019 |
alias_entry *new = apr_array_push(conf->aliases); |
| 109 |
nd |
98647 |
alias_entry *entries = (alias_entry *)conf->aliases->elts; |
| 110 |
|
|
int i; |
| 111 |
fielding |
83751 |
|
| 112 |
|
|
/* XX r can NOT be relative to DocumentRoot here... compat bug. */ |
| 113 |
|
|
|
| 114 |
|
|
if (use_regex) { |
| 115 |
jorton |
153384 |
new->regexp = ap_pregcomp(cmd->pool, f, AP_REG_EXTENDED); |
| 116 |
jerenkrantz |
95503 |
if (new->regexp == NULL) |
| 117 |
|
|
return "Regular expression could not be compiled."; |
| 118 |
rbb |
88010 |
new->real = r; |
| 119 |
fielding |
83751 |
} |
| 120 |
wrowe |
90562 |
else { |
| 121 |
|
|
/* XXX This may be optimized, but we must know that new->real |
| 122 |
|
|
* exists. If so, we can dir merge later, trusing new->real |
| 123 |
|
|
* and just canonicalizing the remainder. Not till I finish |
| 124 |
|
|
* cleaning out the old ap_canonical stuff first. |
| 125 |
|
|
*/ |
| 126 |
|
|
new->real = r; |
| 127 |
|
|
} |
| 128 |
fielding |
83751 |
new->fake = f; |
| 129 |
|
|
new->handler = cmd->info; |
| 130 |
|
|
|
| 131 |
nd |
98647 |
/* check for overlapping (Script)Alias directives |
| 132 |
|
|
* and throw a warning if found one |
| 133 |
|
|
*/ |
| 134 |
|
|
if (!use_regex) { |
| 135 |
|
|
for (i = 0; i < conf->aliases->nelts - 1; ++i) { |
| 136 |
|
|
alias_entry *p = &entries[i]; |
| 137 |
|
|
|
| 138 |
trawick |
98741 |
if ( (!p->regexp && alias_matches(f, p->fake) > 0) |
| 139 |
|
|
|| (p->regexp && !ap_regexec(p->regexp, f, 0, NULL, 0))) { |
| 140 |
nd |
98647 |
ap_log_error(APLOG_MARK, APLOG_WARNING, 0, cmd->server, |
| 141 |
nd |
102949 |
"The %s directive in %s at line %d will probably " |
| 142 |
|
|
"never match because it overlaps an earlier " |
| 143 |
|
|
"%sAlias%s.", |
| 144 |
|
|
cmd->cmd->name, cmd->directive->filename, |
| 145 |
|
|
cmd->directive->line_num, |
| 146 |
nd |
98657 |
p->handler ? "Script" : "", |
| 147 |
|
|
p->regexp ? "Match" : ""); |
| 148 |
nd |
98647 |
|
| 149 |
|
|
break; /* one warning per alias should be sufficient */ |
| 150 |
|
|
} |
| 151 |
|
|
} |
| 152 |
|
|
} |
| 153 |
|
|
|
| 154 |
fielding |
83751 |
return NULL; |
| 155 |
|
|
} |
| 156 |
|
|
|
| 157 |
ben |
85644 |
static const char *add_alias(cmd_parms *cmd, void *dummy, const char *f, |
| 158 |
jerenkrantz |
95503 |
const char *r) |
| 159 |
fielding |
83751 |
{ |
| 160 |
|
|
return add_alias_internal(cmd, dummy, f, r, 0); |
| 161 |
|
|
} |
| 162 |
|
|
|
| 163 |
ben |
85644 |
static const char *add_alias_regex(cmd_parms *cmd, void *dummy, const char *f, |
| 164 |
jerenkrantz |
95503 |
const char *r) |
| 165 |
fielding |
83751 |
{ |
| 166 |
|
|
return add_alias_internal(cmd, dummy, f, r, 1); |
| 167 |
|
|
} |
| 168 |
|
|
|
| 169 |
ben |
85644 |
static const char *add_redirect_internal(cmd_parms *cmd, |
| 170 |
jerenkrantz |
95503 |
alias_dir_conf *dirconf, |
| 171 |
jim |
332306 |
const char *arg1, const char *arg2, |
| 172 |
trawick |
85627 |
const char *arg3, int use_regex) |
| 173 |
fielding |
83751 |
{ |
| 174 |
|
|
alias_entry *new; |
| 175 |
|
|
server_rec *s = cmd->server; |
| 176 |
gstein |
88225 |
alias_server_conf *serverconf = ap_get_module_config(s->module_config, |
| 177 |
|
|
&alias_module); |
| 178 |
fielding |
83751 |
int status = (int) (long) cmd->info; |
| 179 |
jorton |
153384 |
ap_regex_t *r = NULL; |
| 180 |
ben |
85644 |
const char *f = arg2; |
| 181 |
|
|
const char *url = arg3; |
| 182 |
fielding |
83751 |
|
| 183 |
|
|
if (!strcasecmp(arg1, "gone")) |
| 184 |
jerenkrantz |
95503 |
status = HTTP_GONE; |
| 185 |
fielding |
83751 |
else if (!strcasecmp(arg1, "permanent")) |
| 186 |
jerenkrantz |
95503 |
status = HTTP_MOVED_PERMANENTLY; |
| 187 |
fielding |
83751 |
else if (!strcasecmp(arg1, "temp")) |
| 188 |
jerenkrantz |
95503 |
status = HTTP_MOVED_TEMPORARILY; |
| 189 |
fielding |
83751 |
else if (!strcasecmp(arg1, "seeother")) |
| 190 |
jerenkrantz |
95503 |
status = HTTP_SEE_OTHER; |
| 191 |
wrowe |
86008 |
else if (apr_isdigit(*arg1)) |
| 192 |
jerenkrantz |
95503 |
status = atoi(arg1); |
| 193 |
fielding |
83751 |
else { |
| 194 |
jerenkrantz |
95503 |
f = arg1; |
| 195 |
|
|
url = arg2; |
| 196 |
fielding |
83751 |
} |
| 197 |
|
|
|
| 198 |
|
|
if (use_regex) { |
| 199 |
jorton |
153384 |
r = ap_pregcomp(cmd->pool, f, AP_REG_EXTENDED); |
| 200 |
jerenkrantz |
95503 |
if (r == NULL) |
| 201 |
|
|
return "Regular expression could not be compiled."; |
| 202 |
fielding |
83751 |
} |
| 203 |
|
|
|
| 204 |
|
|
if (ap_is_HTTP_REDIRECT(status)) { |
| 205 |
jerenkrantz |
95503 |
if (!url) |
| 206 |
|
|
return "URL to redirect to is missing"; |
| 207 |
niq |
490142 |
/* PR#35314: we can allow path components here; |
| 208 |
|
|
* they get correctly resolved to full URLs. |
| 209 |
|
|
*/ |
| 210 |
|
|
if (!use_regex && !ap_is_url(url) && (url[0] != '/')) |
| 211 |
jerenkrantz |
95503 |
return "Redirect to non-URL"; |
| 212 |
fielding |
83751 |
} |
| 213 |
|
|
else { |
| 214 |
jerenkrantz |
95503 |
if (url) |
| 215 |
|
|
return "Redirect URL not valid for this status"; |
| 216 |
fielding |
83751 |
} |
| 217 |
|
|
|
| 218 |
|
|
if (cmd->path) |
| 219 |
jerenkrantz |
95503 |
new = apr_array_push(dirconf->redirects); |
| 220 |
fielding |
83751 |
else |
| 221 |
jerenkrantz |
95503 |
new = apr_array_push(serverconf->redirects); |
| 222 |
fielding |
83751 |
|
| 223 |
|
|
new->fake = f; |
| 224 |
|
|
new->real = url; |
| 225 |
|
|
new->regexp = r; |
| 226 |
|
|
new->redir_status = status; |
| 227 |
|
|
return NULL; |
| 228 |
|
|
} |
| 229 |
|
|
|
| 230 |
ben |
85644 |
static const char *add_redirect(cmd_parms *cmd, void *dirconf, |
| 231 |
|
|
const char *arg1, const char *arg2, |
| 232 |
jerenkrantz |
95503 |
const char *arg3) |
| 233 |
fielding |
83751 |
{ |
| 234 |
|
|
return add_redirect_internal(cmd, dirconf, arg1, arg2, arg3, 0); |
| 235 |
|
|
} |
| 236 |
|
|
|
| 237 |
ben |
85644 |
static const char *add_redirect2(cmd_parms *cmd, void *dirconf, |
| 238 |
jerenkrantz |
95503 |
const char *arg1, const char *arg2) |
| 239 |
fielding |
83751 |
{ |
| 240 |
ben |
85644 |
return add_redirect_internal(cmd, dirconf, arg1, arg2, NULL, 0); |
| 241 |
|
|
} |
| 242 |
|
|
|
| 243 |
|
|
static const char *add_redirect_regex(cmd_parms *cmd, void *dirconf, |
| 244 |
jerenkrantz |
95503 |
const char *arg1, const char *arg2, |
| 245 |
|
|
const char *arg3) |
| 246 |
ben |
85644 |
{ |
| 247 |
fielding |
83751 |
return add_redirect_internal(cmd, dirconf, arg1, arg2, arg3, 1); |
| 248 |
|
|
} |
| 249 |
|
|
|
| 250 |
|
|
static const command_rec alias_cmds[] = |
| 251 |
|
|
{ |
| 252 |
trawick |
85627 |
AP_INIT_TAKE2("Alias", add_alias, NULL, RSRC_CONF, |
| 253 |
|
|
"a fakename and a realname"), |
| 254 |
|
|
AP_INIT_TAKE2("ScriptAlias", add_alias, "cgi-script", RSRC_CONF, |
| 255 |
|
|
"a fakename and a realname"), |
| 256 |
|
|
AP_INIT_TAKE23("Redirect", add_redirect, (void *) HTTP_MOVED_TEMPORARILY, |
| 257 |
|
|
OR_FILEINFO, |
| 258 |
|
|
"an optional status, then document to be redirected and " |
| 259 |
|
|
"destination URL"), |
| 260 |
|
|
AP_INIT_TAKE2("AliasMatch", add_alias_regex, NULL, RSRC_CONF, |
| 261 |
|
|
"a regular expression and a filename"), |
| 262 |
|
|
AP_INIT_TAKE2("ScriptAliasMatch", add_alias_regex, "cgi-script", RSRC_CONF, |
| 263 |
|
|
"a regular expression and a filename"), |
| 264 |
jim |
332306 |
AP_INIT_TAKE23("RedirectMatch", add_redirect_regex, |
| 265 |
trawick |
85627 |
(void *) HTTP_MOVED_TEMPORARILY, OR_FILEINFO, |
| 266 |
|
|
"an optional status, then a regular expression and " |
| 267 |
|
|
"destination URL"), |
| 268 |
ben |
85644 |
AP_INIT_TAKE2("RedirectTemp", add_redirect2, |
| 269 |
jerenkrantz |
95503 |
(void *) HTTP_MOVED_TEMPORARILY, OR_FILEINFO, |
| 270 |
trawick |
85627 |
"a document to be redirected, then the destination URL"), |
| 271 |
jim |
332306 |
AP_INIT_TAKE2("RedirectPermanent", add_redirect2, |
| 272 |
trawick |
85627 |
(void *) HTTP_MOVED_PERMANENTLY, OR_FILEINFO, |
| 273 |
|
|
"a document to be redirected, then the destination URL"), |
| 274 |
fielding |
83751 |
{NULL} |
| 275 |
|
|
}; |
| 276 |
|
|
|
| 277 |
|
|
static int alias_matches(const char *uri, const char *alias_fakename) |
| 278 |
|
|
{ |
| 279 |
|
|
const char *aliasp = alias_fakename, *urip = uri; |
| 280 |
|
|
|
| 281 |
brianp |
92138 |
while (*aliasp) { |
| 282 |
jerenkrantz |
95503 |
if (*aliasp == '/') { |
| 283 |
|
|
/* any number of '/' in the alias matches any number in |
| 284 |
|
|
* the supplied URI, but there must be at least one... |
| 285 |
|
|
*/ |
| 286 |
|
|
if (*urip != '/') |
| 287 |
|
|
return 0; |
| 288 |
fielding |
83751 |
|
| 289 |
brianp |
95584 |
do { |
| 290 |
jerenkrantz |
95503 |
++aliasp; |
| 291 |
brianp |
95584 |
} while (*aliasp == '/'); |
| 292 |
|
|
do { |
| 293 |
jerenkrantz |
95503 |
++urip; |
| 294 |
brianp |
95584 |
} while (*urip == '/'); |
| 295 |
jerenkrantz |
95503 |
} |
| 296 |
|
|
else { |
| 297 |
|
|
/* Other characters are compared literally */ |
| 298 |
|
|
if (*urip++ != *aliasp++) |
| 299 |
|
|
return 0; |
| 300 |
|
|
} |
| 301 |
fielding |
83751 |
} |
| 302 |
|
|
|
| 303 |
|
|
/* Check last alias path component matched all the way */ |
| 304 |
|
|
|
| 305 |
|
|
if (aliasp[-1] != '/' && *urip != '\0' && *urip != '/') |
| 306 |
jerenkrantz |
95503 |
return 0; |
| 307 |
fielding |
83751 |
|
| 308 |
|
|
/* Return number of characters from URI which matched (may be |
| 309 |
|
|
* greater than length of alias, since we may have matched |
| 310 |
|
|
* doubled slashes) |
| 311 |
|
|
*/ |
| 312 |
|
|
|
| 313 |
|
|
return urip - uri; |
| 314 |
|
|
} |
| 315 |
|
|
|
| 316 |
jerenkrantz |
95503 |
static char *try_alias_list(request_rec *r, apr_array_header_t *aliases, |
| 317 |
|
|
int doesc, int *status) |
| 318 |
fielding |
83751 |
{ |
| 319 |
|
|
alias_entry *entries = (alias_entry *) aliases->elts; |
| 320 |
jorton |
153384 |
ap_regmatch_t regm[AP_MAX_REG_MATCH]; |
| 321 |
fielding |
83751 |
char *found = NULL; |
| 322 |
|
|
int i; |
| 323 |
|
|
|
| 324 |
|
|
for (i = 0; i < aliases->nelts; ++i) { |
| 325 |
jerenkrantz |
95503 |
alias_entry *p = &entries[i]; |
| 326 |
|
|
int l; |
| 327 |
fielding |
83751 |
|
| 328 |
jerenkrantz |
95503 |
if (p->regexp) { |
| 329 |
striker |
101556 |
if (!ap_regexec(p->regexp, r->uri, AP_MAX_REG_MATCH, regm, 0)) { |
| 330 |
jerenkrantz |
95503 |
if (p->real) { |
| 331 |
|
|
found = ap_pregsub(r->pool, p->real, r->uri, |
| 332 |
striker |
101556 |
AP_MAX_REG_MATCH, regm); |
| 333 |
jerenkrantz |
95503 |
if (found && doesc) { |
| 334 |
dougm |
90361 |
apr_uri_t uri; |
| 335 |
|
|
apr_uri_parse(r->pool, found, &uri); |
| 336 |
jerenkrantz |
91672 |
/* Do not escape the query string or fragment. */ |
| 337 |
jim |
332306 |
found = apr_uri_unparse(r->pool, &uri, |
| 338 |
jerenkrantz |
91672 |
APR_URI_UNP_OMITQUERY); |
| 339 |
|
|
found = ap_escape_uri(r->pool, found); |
| 340 |
rbb |
89041 |
if (uri.query) { |
| 341 |
jim |
332306 |
found = apr_pstrcat(r->pool, found, "?", |
| 342 |
jerenkrantz |
91672 |
uri.query, NULL); |
| 343 |
rbb |
89041 |
} |
| 344 |
jerenkrantz |
91672 |
if (uri.fragment) { |
| 345 |
jim |
332306 |
found = apr_pstrcat(r->pool, found, "#", |
| 346 |
jerenkrantz |
91672 |
uri.fragment, NULL); |
| 347 |
rbb |
89041 |
} |
| 348 |
jerenkrantz |
95503 |
} |
| 349 |
|
|
} |
| 350 |
|
|
else { |
| 351 |
|
|
/* need something non-null */ |
| 352 |
|
|
found = apr_pstrdup(r->pool, ""); |
| 353 |
|
|
} |
| 354 |
|
|
} |
| 355 |
|
|
} |
| 356 |
|
|
else { |
| 357 |
|
|
l = alias_matches(r->uri, p->fake); |
| 358 |
fielding |
83751 |
|
| 359 |
jerenkrantz |
95503 |
if (l > 0) { |
| 360 |
|
|
if (doesc) { |
| 361 |
|
|
char *escurl; |
| 362 |
|
|
escurl = ap_os_escape_path(r->pool, r->uri + l, 1); |
| 363 |
fielding |
83751 |
|
| 364 |
jerenkrantz |
95503 |
found = apr_pstrcat(r->pool, p->real, escurl, NULL); |
| 365 |
|
|
} |
| 366 |
|
|
else |
| 367 |
|
|
found = apr_pstrcat(r->pool, p->real, r->uri + l, NULL); |
| 368 |
|
|
} |
| 369 |
|
|
} |
| 370 |
fielding |
83751 |
|
| 371 |
jerenkrantz |
95503 |
if (found) { |
| 372 |
|
|
if (p->handler) { /* Set handler, and leave a note for mod_cgi */ |
| 373 |
|
|
r->handler = p->handler; |
| 374 |
|
|
apr_table_setn(r->notes, "alias-forced-type", r->handler); |
| 375 |
|
|
} |
| 376 |
wrowe |
90562 |
/* XXX This is as SLOW as can be, next step, we optimize |
| 377 |
|
|
* and merge to whatever part of the found path was already |
| 378 |
|
|
* canonicalized. After I finish eliminating os canonical. |
| 379 |
wrowe |
93965 |
* Better fail test for ap_server_root_relative needed here. |
| 380 |
wrowe |
90562 |
*/ |
| 381 |
wrowe |
93965 |
if (!doesc) { |
| 382 |
wrowe |
90562 |
found = ap_server_root_relative(r->pool, found); |
| 383 |
wrowe |
93965 |
} |
| 384 |
|
|
if (found) { |
| 385 |
jerenkrantz |
95503 |
*status = p->redir_status; |
| 386 |
wrowe |
93965 |
} |
| 387 |
jerenkrantz |
95503 |
return found; |
| 388 |
|
|
} |
| 389 |
fielding |
83751 |
|
| 390 |
|
|
} |
| 391 |
|
|
|
| 392 |
|
|
return NULL; |
| 393 |
|
|
} |
| 394 |
|
|
|
| 395 |
|
|
static int translate_alias_redir(request_rec *r) |
| 396 |
|
|
{ |
| 397 |
gstein |
88225 |
ap_conf_vector_t *sconf = r->server->module_config; |
| 398 |
|
|
alias_server_conf *serverconf = ap_get_module_config(sconf, &alias_module); |
| 399 |
fielding |
83751 |
char *ret; |
| 400 |
|
|
int status; |
| 401 |
|
|
|
| 402 |
jerenkrantz |
95503 |
if (r->uri[0] != '/' && r->uri[0] != '\0') { |
| 403 |
|
|
return DECLINED; |
| 404 |
|
|
} |
| 405 |
fielding |
83751 |
|
| 406 |
|
|
if ((ret = try_alias_list(r, serverconf->redirects, 1, &status)) != NULL) { |
| 407 |
jerenkrantz |
95503 |
if (ap_is_HTTP_REDIRECT(status)) { |
| 408 |
|
|
/* include QUERY_STRING if any */ |
| 409 |
|
|
if (r->args) { |
| 410 |
|
|
ret = apr_pstrcat(r->pool, ret, "?", r->args, NULL); |
| 411 |
|
|
} |
| 412 |
|
|
apr_table_setn(r->headers_out, "Location", ret); |
| 413 |
|
|
} |
| 414 |
|
|
return status; |
| 415 |
fielding |
83751 |
} |
| 416 |
|
|
|
| 417 |
|
|
if ((ret = try_alias_list(r, serverconf->aliases, 0, &status)) != NULL) { |
| 418 |
jerenkrantz |
95503 |
r->filename = ret; |
| 419 |
|
|
return OK; |
| 420 |
fielding |
83751 |
} |
| 421 |
|
|
|
| 422 |
|
|
return DECLINED; |
| 423 |
|
|
} |
| 424 |
|
|
|
| 425 |
|
|
static int fixup_redir(request_rec *r) |
| 426 |
|
|
{ |
| 427 |
|
|
void *dconf = r->per_dir_config; |
| 428 |
|
|
alias_dir_conf *dirconf = |
| 429 |
|
|
(alias_dir_conf *) ap_get_module_config(dconf, &alias_module); |
| 430 |
|
|
char *ret; |
| 431 |
|
|
int status; |
| 432 |
|
|
|
| 433 |
|
|
/* It may have changed since last time, so try again */ |
| 434 |
|
|
|
| 435 |
|
|
if ((ret = try_alias_list(r, dirconf->redirects, 1, &status)) != NULL) { |
| 436 |
coar |
93137 |
if (ap_is_HTTP_REDIRECT(status)) { |
| 437 |
coar |
93143 |
if (ret[0] == '/') { |
| 438 |
|
|
char *orig_target = ret; |
| 439 |
|
|
|
| 440 |
|
|
ret = ap_construct_url(r->pool, ret, r); |
| 441 |
trawick |
95150 |
ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, |
| 442 |
coar |
93143 |
"incomplete redirection target of '%s' for " |
| 443 |
|
|
"URI '%s' modified to '%s'", |
| 444 |
|
|
orig_target, r->uri, ret); |
| 445 |
|
|
} |
| 446 |
coar |
93137 |
if (!ap_is_url(ret)) { |
| 447 |
|
|
status = HTTP_INTERNAL_SERVER_ERROR; |
| 448 |
trawick |
95150 |
ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, |
| 449 |
coar |
93137 |
"cannot redirect '%s' to '%s'; " |
| 450 |
coar |
93143 |
"target is not a valid absoluteURI or abs_path", |
| 451 |
coar |
93137 |
r->uri, ret); |
| 452 |
|
|
} |
| 453 |
|
|
else { |
| 454 |
nd |
98796 |
/* append requested query only, if the config didn't |
| 455 |
|
|
* supply its own. |
| 456 |
|
|
*/ |
| 457 |
|
|
if (r->args && !ap_strchr(ret, '?')) { |
| 458 |
|
|
ret = apr_pstrcat(r->pool, ret, "?", r->args, NULL); |
| 459 |
|
|
} |
| 460 |
coar |
93137 |
apr_table_setn(r->headers_out, "Location", ret); |
| 461 |
|
|
} |
| 462 |
|
|
} |
| 463 |
jerenkrantz |
95503 |
return status; |
| 464 |
fielding |
83751 |
} |
| 465 |
|
|
|
| 466 |
|
|
return DECLINED; |
| 467 |
|
|
} |
| 468 |
|
|
|
| 469 |
wrowe |
87697 |
static void register_hooks(apr_pool_t *p) |
| 470 |
fielding |
83770 |
{ |
| 471 |
slive |
96137 |
static const char * const aszSucc[]={ "mod_userdir.c", |
| 472 |
|
|
"mod_vhost_alias.c",NULL }; |
| 473 |
fielding |
83770 |
|
| 474 |
slive |
94985 |
ap_hook_translate_name(translate_alias_redir,NULL,aszSucc,APR_HOOK_MIDDLE); |
| 475 |
wrowe |
87731 |
ap_hook_fixups(fixup_redir,NULL,NULL,APR_HOOK_MIDDLE); |
| 476 |
fielding |
83770 |
} |
| 477 |
|
|
|
| 478 |
wrowe |
86609 |
module AP_MODULE_DECLARE_DATA alias_module = |
| 479 |
fielding |
83751 |
{ |
| 480 |
fielding |
83770 |
STANDARD20_MODULE_STUFF, |
| 481 |
jerenkrantz |
95503 |
create_alias_dir_config, /* dir config creater */ |
| 482 |
|
|
merge_alias_dir_config, /* dir merger --- default is to override */ |
| 483 |
|
|
create_alias_config, /* server config */ |
| 484 |
|
|
merge_alias_config, /* merge server configs */ |
| 485 |
|
|
alias_cmds, /* command apr_table_t */ |
| 486 |
|
|
register_hooks /* register hooks */ |
| 487 |
fielding |
83751 |
}; |