/[Apache-SVN]/httpd/httpd/trunk/modules/mappers/mod_alias.c
ViewVC logotype

Contents of /httpd/httpd/trunk/modules/mappers/mod_alias.c

Parent Directory Parent Directory | Revision Log Revision Log


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

Properties

Name Value
svn:eol-style native

apache@apache.org
ViewVC Help
Powered by ViewVC 1.1.2