Commit 7fe649be authored by Jim Jagielski's avatar Jim Jagielski
Browse files

Merge r1653941, r1653978, r1656225, r1686853, r1686856 from trunk: 

mod_alias: Introduce expression parser support for Alias, ScriptAlias
and Redirect.


Use unsigned bit fields.


mod_alias: follow up to r1653941.
Fill empty APLOGNO().


mod_alias: follow up to r1653941.
Limit Redirect expressions to directory (Location) context
and redirect statuses (implicit or explicit).


mod_alias: follow up to r1686853.
Factorize code (no functional change).
Submitted by: minfrin, ylavic, ylavic, ylavic
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1731081 13f79535-47bb-0310-9956-ffa450edef68
parent 39914983

CHANGES

+5 −0
Original line number Diff line number Diff line
@@ -230,6 +230,11 @@ Changes with Apache 2.4.17 
     records for scalability. [Yingqi Lu <yingqi.lu@intel.com>,

     Jeff Trawick, Jim Jagielski, Yann Ylavic]



  *) mod_alias: Introduce expression parser support for Alias, ScriptAlias

     and Redirect. Limit Redirect expressions to directory (Location) context

     and redirect statuses (implicit or explicit).

     [Graham Leggett, Yann Ylavic, Ruediger Pluem]



  *) mod_proxy: Fix a race condition that caused a failed worker to be retried

     before the retry period is over. [Ruediger Pluem]

STATUS

+0 −11
Original line number Diff line number Diff line
@@ -112,17 +112,6 @@ RELEASE SHOWSTOPPERS: 
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:

  [ start all new proposals below, under PATCHES PROPOSED. ]



  *) mod_alias: Introduce expression parser support for Alias, ScriptAlias

     and Redirect. Limit Redirect expressions to directory (Location) context

     and redirect statuses (implicit or explicit).

     trunk patch: http://svn.apache.org/r1653941

                  http://svn.apache.org/r1653978

                  http://svn.apache.org/r1656225

                  http://svn.apache.org/r1686853

                  http://svn.apache.org/r1686856

     2.4.x patch: https://people.apache.org/~minfrin/httpd-mod_alias-expr2.patch

     +1: minfrin, jim, rpluem



  *) mod_cache_socache: Fix a possible cached entity body corruption when it

     is received from an origin server in multiple batches and forwarded by

     mod_proxy.

docs/manual/expr.xml

+3 −0
Original line number Diff line number Diff line
@@ -41,6 +41,9 @@ 
<seealso><directive module="core" type="section">ElseIf</directive></seealso>

<seealso><directive module="core" type="section">Else</directive></seealso>

<seealso><directive module="core" type="section">ErrorDocument</directive></seealso>

<seealso><directive module="mod_alias">Alias</directive></seealso>

<seealso><directive module="mod_alias">ScriptAlias</directive></seealso>

<seealso><directive module="mod_alias">Redirect</directive></seealso>

<seealso><directive module="mod_auth_basic">AuthBasicFake</directive></seealso>

<seealso><directive module="mod_auth_form">AuthFormLoginRequiredLocation</directive></seealso>

<seealso><directive module="mod_auth_form">AuthFormLoginSuccessLocation</directive></seealso>

docs/manual/mod/mod_alias.xml

+78 −6
Original line number Diff line number Diff line
@@ -47,6 +47,15 @@ 
    a different URL. They are often used when a resource has moved to

    a new location.</p>



    <p>When the <directive module="mod_alias">Alias</directive>,

    <directive module="mod_alias">ScriptAlias</directive> and 

    <directive module="mod_alias">Redirect</directive> directives are used

    within a <directive type="section" module="core">Location</directive>

    or <directive type="section" module="core">LocationMatch</directive>

    section, <a href="../expr.html">expression syntax</a> can be used

    to manipulate the destination path or URL.

	</p>



    <p><module>mod_alias</module> is designed to handle simple URL

    manipulation tasks.  For more complicated tasks such as

    manipulating the query string, use the tools provided by
@@ -89,14 +98,25 @@ Alias "/foo" "/gaq" 
    would always match before the <code>/foo/bar</code> <directive

    module="mod_alias">Alias</directive>, so the latter directive would be

    ignored.</p>

    <p>When the <directive module="mod_alias">Alias</directive>,

    <directive module="mod_alias">ScriptAlias</directive> and 

    <directive module="mod_alias">Redirect</directive> directives are used

    within a <directive type="section" module="core">Location</directive>

    or <directive type="section" module="core">LocationMatch</directive>

    section, these directives will take precedence over any globally

    defined <directive module="mod_alias">Alias</directive>,

    <directive module="mod_alias">ScriptAlias</directive> and 

    <directive module="mod_alias">Redirect</directive> directives.</p>



</section>



<directivesynopsis>

<name>Alias</name>

<description>Maps URLs to filesystem locations</description>

<syntax>Alias <var>URL-path</var>

<syntax>Alias [<var>URL-path</var>]

<var>file-path</var>|<var>directory-path</var></syntax>

<contextlist><context>server config</context><context>virtual host</context>

<context>directory</context>

</contextlist>



<usage>
@@ -156,6 +176,21 @@ Alias "/image" "/ftp/pub/image" 


    <p>Any number slashes in the <var>URL-path</var> parameter

    matches any number of slashes in the requested URL-path.</p>

    <p>If the <directive>Alias</directive> directive is used within a

    <directive type="section" module="core">Location</directive>

    or <directive type="section" module="core">LocationMatch</directive>

    section the URL-path is omitted, and the file-path is interpreted

    using <a href="../expr.html">expression syntax</a>.</p>



    <highlight language="config">

&lt;Location /image&gt;

    Alias /ftp/pub/image

&lt;/Location&gt;

&lt;LocationMatch /error/(?&lt;NUMBER&gt;[0-9]+)&gt;

    Alias /usr/local/apache/errors/%{env:MATCH_NUMBER}.html

&lt;/LocationMatch&gt;

    </highlight>



</usage>

</directivesynopsis>
@@ -254,7 +289,7 @@ AliasMatch "^/image/(.*)\.gif$" "/files/gif.images/$1.gif" 
<name>Redirect</name>

<description>Sends an external redirect asking the client to fetch

a different URL</description>

<syntax>Redirect [<var>status</var>] <var>URL-path</var>

<syntax>Redirect [<var>status</var>] [<var>URL-path</var>]

<var>URL</var></syntax>

<contextlist><context>server config</context><context>virtual host</context>

<context>directory</context><context>.htaccess</context></contextlist>
@@ -296,14 +331,17 @@ Redirect "/one" "/two" 
    Only complete path segments are matched, so the above

    example would not match a request for

    <code>http://example.com/servicefoo.txt</code>. For more complex matching

    using regular expressions, see the <directive

    using the <a href="../expr.html">expression syntax</a>, omit the URL-path

    argument as described below. Alternatively, for matching using regular

    expressions, see the <directive

    module="mod_alias">RedirectMatch</directive> directive.</p>





    <note><title>Note</title>

    <p>Redirect directives take precedence over Alias and ScriptAlias

    directives, irrespective of their ordering in the configuration

    file.</p></note>

    file. Redirect directives inside a Location take precedence over

    Redirect and Alias directives with an URL-path.</p></note>



    <p>If no <var>status</var> argument is given, the redirect will

    be "temporary" (HTTP status 302). This indicates to the client
@@ -345,6 +383,24 @@ Redirect "/one" "/two" 
Redirect permanent "/one" "http://example.com/two"

Redirect 303 "/three" "http://example.com/other"

    </highlight>

    <p>If the <directive>Redirect</directive> directive is used within a

    <directive type="section" module="core">Location</directive>

    or <directive type="section" module="core">LocationMatch</directive>

    section with the URL-path omitted, then the URL parameter will be

    interpreted using <a href="../expr.html">expression syntax</a>.</p>



    <highlight language="config">

&lt;Location /one&gt;

    Redirect permanent http://example.com/two

&lt;/Location&gt;<br />

&lt;Location /three&gt;

    Redirect 303 http://example.com/other

&lt;/Location&gt;<br />

&lt;LocationMatch /error/(?&lt;NUMBER&gt;[0-9]+)&gt;

    Redirect permanent http://example.com/errors/%{env:MATCH_NUMBER}.html

&lt;/LocationMatch&gt;<br />

    </highlight>



</usage>

</directivesynopsis>
@@ -422,9 +478,10 @@ a different URL</description> 
<name>ScriptAlias</name>

<description>Maps a URL to a filesystem location and designates the

target as a CGI script</description>

<syntax>ScriptAlias <var>URL-path</var>

<syntax>ScriptAlias [<var>URL-path</var>]

<var>file-path</var>|<var>directory-path</var></syntax>

<contextlist><context>server config</context><context>virtual host</context>

<context>directory</context>

</contextlist>



<usage>
@@ -487,6 +544,21 @@ ScriptAlias "/cgi-bin/" "/web/cgi-handler.pl" 
    <directive>ScriptAlias</directive> and revealing the source code

    of the CGI scripts if they are not restricted by a

    <directive module="core">Directory</directive> section.</note>

    <p>If the <directive>ScriptAlias</directive> directive is used within

    a <directive type="section" module="core">Location</directive>

    or <directive type="section" module="core">LocationMatch</directive>

    section with the URL-path omitted, then the URL parameter will be

    interpreted using <a href="../expr.html">expression syntax</a>.</p>



    <highlight language="config">

&lt;Location /cgi-bin &gt;

    ScriptAlias /web/cgi-bin/

&lt;/Location&gt;

&lt;LocationMatch /cgi-bin/errors/(?&lt;NUMBER&gt;[0-9]+)&gt;

    ScriptAlias /web/cgi-bin/errors/%{env:MATCH_NUMBER}.cgi

&lt;/LocationMatch&gt;<br />

    </highlight>



</usage>

<seealso><a href="../howto/cgi.html">CGI Tutorial</a></seealso>

</directivesynopsis>

modules/mappers/mod_alias.c

+198 −15
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
#include "http_config.h"

#include "http_request.h"

#include "http_log.h"

#include "ap_expr.h"





typedef struct {
@@ -50,11 +51,20 @@ typedef struct { 
} alias_server_conf;



typedef struct {

    unsigned int alias_set:1;

    unsigned int redirect_set:1;

    apr_array_header_t *redirects;

    const ap_expr_info_t *alias;

    char *handler;

    const ap_expr_info_t *redirect;

    int redirect_status;                /* 301, 302, 303, 410, etc */

} alias_dir_conf;



module AP_MODULE_DECLARE_DATA alias_module;



static char magic_error_value;

#define PREGSUB_ERROR      (&magic_error_value)



static void *create_alias_config(apr_pool_t *p, server_rec *s)

{

    alias_server_conf *a =
@@ -91,7 +101,17 @@ static void *merge_alias_dir_config(apr_pool_t *p, void *basev, void *overridesv 
    (alias_dir_conf *) apr_pcalloc(p, sizeof(alias_dir_conf));

    alias_dir_conf *base = (alias_dir_conf *) basev;

    alias_dir_conf *overrides = (alias_dir_conf *) overridesv;



    a->redirects = apr_array_append(p, overrides->redirects, base->redirects);



    a->alias = (overrides->alias_set == 0) ? base->alias : overrides->alias;

    a->handler = (overrides->alias_set == 0) ? base->handler : overrides->handler;

    a->alias_set = overrides->alias_set || base->alias_set;



    a->redirect = (overrides->redirect_set == 0) ? base->redirect : overrides->redirect;

    a->redirect_status = (overrides->redirect_set == 0) ? base->redirect_status : overrides->redirect_status;

    a->redirect_set = overrides->redirect_set || base->redirect_set;



    return a;

}
@@ -111,6 +131,12 @@ static const char *add_alias_internal(cmd_parms *cmd, void *dummy, 


    /* XXX: real can NOT be relative to DocumentRoot here... compat bug. */



    const char *err = ap_check_cmd_context(cmd, NOT_IN_DIR_LOC_FILE);



    if (err != NULL) {

        return err;

    }



    if (use_regex) {

        new->regexp = ap_pregcomp(cmd->pool, fake, AP_REG_EXTENDED);

        if (new->regexp == NULL)
@@ -157,7 +183,39 @@ static const char *add_alias_internal(cmd_parms *cmd, void *dummy, 
static const char *add_alias(cmd_parms *cmd, void *dummy, const char *fake,

        const char *real)

{

    if (real) {



        return add_alias_internal(cmd, dummy, fake, real, 0);



    }

    else {

        alias_dir_conf *dirconf = (alias_dir_conf *) dummy;



        const char *err = ap_check_cmd_context(cmd, NOT_IN_DIRECTORY|NOT_IN_FILES);



        if (err != NULL) {

            return err;

        }



        if (!cmd->path) {

            return "Alias must have two arguments when used globally";

        }



        dirconf->alias =

                ap_expr_parse_cmd(cmd, fake, AP_EXPR_FLAG_STRING_RESULT,

                        &err, NULL);

        if (err) {

            return apr_pstrcat(cmd->temp_pool,

                    "Cannot parse alias expression '", fake, "': ", err,

                    NULL);

        }



        dirconf->handler = cmd->info;

        dirconf->alias_set = 1;



        return NULL;



    }

}



static const char *add_alias_regex(cmd_parms *cmd, void *dummy,
@@ -194,16 +252,64 @@ static const char *add_redirect_internal(cmd_parms *cmd, 
        status = HTTP_MOVED_TEMPORARILY;

    else if (!strcasecmp(arg1, "seeother"))

        status = HTTP_SEE_OTHER;

    else if (!strcasecmp(arg1, "gone"))

    else if (!strcasecmp(arg1, "gone")) {

        status = HTTP_GONE;

    else if (apr_isdigit(*arg1))

        grokarg1 = -1;

    }

    else if (apr_isdigit(*arg1)) {

        status = atoi(arg1);

    else

        if (!ap_is_HTTP_REDIRECT(status)) {

            grokarg1 = -1;

        }

    }

    else {

        grokarg1 = 0;

    }



    if (arg3 && !grokarg1)

        return "Redirect: invalid first argument (of three)";



    /*

     * if we have the 2nd arg and we understand the 1st one as a redirect

     * status (3xx, but not things like 404 /robots.txt), or if we have the

     * 1st arg but don't understand it, we use the expression syntax assuming

     * a path from the location.

     *

     * if we understand the first arg but have no second arg, we are dealing

     * with a status like "GONE" or a non-redirect status (e.g. 404, 503).

     */

    if (!cmd->path) {

        /* <Location> context only for now */

        ;

    }

    else if ((grokarg1 > 0 && arg2 && !arg3) || (!grokarg1 && !arg2)) {

        const char *expr_err = NULL;



        url = grokarg1 ? arg2 : arg1;

        dirconf->redirect =

                ap_expr_parse_cmd(cmd, url, AP_EXPR_FLAG_STRING_RESULT,

                        &expr_err, NULL);

        if (expr_err) {

            return apr_pstrcat(cmd->temp_pool,

                    "Cannot parse redirect expression '", url, "': ", expr_err,

                    NULL);

        }



        dirconf->redirect_status = status;

        dirconf->redirect_set = 1;



        return NULL;



    }

    else if (grokarg1 < 0 && !arg2) {



        dirconf->redirect_status = status;

        dirconf->redirect_set = 1;



        return NULL;



    }



    /*

     * if we don't have the 3rd arg and we didn't understand the 1st

     * one, then assume URL-path URL. This also handles case, eg, GONE
@@ -269,11 +375,11 @@ static const char *add_redirect_regex(cmd_parms *cmd, void *dirconf, 


static const command_rec alias_cmds[] =

{

    AP_INIT_TAKE2("Alias", add_alias, NULL, RSRC_CONF,

                  "a fakename and a realname"),

    AP_INIT_TAKE2("ScriptAlias", add_alias, "cgi-script", RSRC_CONF,

                  "a fakename and a realname"),

    AP_INIT_TAKE23("Redirect", add_redirect, (void *) HTTP_MOVED_TEMPORARILY,

    AP_INIT_TAKE12("Alias", add_alias, NULL, RSRC_CONF | ACCESS_CONF,

                  "a fakename and a realname, or a realname in a Location"),

    AP_INIT_TAKE12("ScriptAlias", add_alias, "cgi-script", RSRC_CONF | ACCESS_CONF,

                  "a fakename and a realname, or a realname in a Location"),

    AP_INIT_TAKE123("Redirect", add_redirect, (void *) HTTP_MOVED_TEMPORARILY,

                   OR_FILEINFO,

                   "an optional status, then document to be redirected and "

                   "destination URL"),
@@ -333,8 +439,79 @@ static int alias_matches(const char *uri, const char *alias_fakename) 
    return urip - uri;

}



static char magic_error_value;

#define PREGSUB_ERROR      (&magic_error_value)

static char *try_alias(request_rec *r)

{

    alias_dir_conf *dirconf =

            (alias_dir_conf *) ap_get_module_config(r->per_dir_config, &alias_module);



    if (dirconf->alias) {

        const char *err = NULL;



        char *found = apr_pstrdup(r->pool,

                ap_expr_str_exec(r, dirconf->alias, &err));

        if (err) {

            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(02825)

                          "Can't evaluate alias expression: %s", err);

            return PREGSUB_ERROR;

        }



        if (dirconf->handler) { /* Set handler, and leave a note for mod_cgi */

            r->handler = dirconf->handler;

            apr_table_setn(r->notes, "alias-forced-type", r->handler);

        }

        /* XXX This is as SLOW as can be, next step, we optimize

         * and merge to whatever part of the found path was already

         * canonicalized.  After I finish eliminating os canonical.

         * Better fail test for ap_server_root_relative needed here.

         */

        found = ap_server_root_relative(r->pool, found);

        return found;



    }



    return NULL;

}



static char *try_redirect(request_rec *r, int *status)

{

    alias_dir_conf *dirconf =

            (alias_dir_conf *) ap_get_module_config(r->per_dir_config, &alias_module);



    if (dirconf->redirect_set) {

        apr_uri_t uri;

        const char *err = NULL;

        char *found = "";



        if (dirconf->redirect) {



            found = apr_pstrdup(r->pool,

                    ap_expr_str_exec(r, dirconf->redirect, &err));

            if (err) {

                ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(02826)

                              "Can't evaluate redirect expression: %s", err);

                return PREGSUB_ERROR;

            }



            apr_uri_parse(r->pool, found, &uri);

            /* Do not escape the query string or fragment. */

            found = apr_uri_unparse(r->pool, &uri, APR_URI_UNP_OMITQUERY);

            found = ap_escape_uri(r->pool, found);

            if (uri.query) {

                found = apr_pstrcat(r->pool, found, "?", uri.query, NULL);

            }

            if (uri.fragment) {

                found = apr_pstrcat(r->pool, found, "#", uri.fragment, NULL);

            }



        }



        *status = dirconf->redirect_status;

        return found;



    }



    return NULL;

}



static char *try_alias_list(request_rec *r, apr_array_header_t *aliases,

                            int is_redir, int *status)
@@ -435,7 +612,9 @@ static int translate_alias_redir(request_rec *r) 
        return DECLINED;

    }



    if ((ret = try_alias_list(r, serverconf->redirects, 1, &status)) != NULL) {

    if ((ret = try_redirect(r, &status)) != NULL

            || (ret = try_alias_list(r, serverconf->redirects, 1, &status))

                    != NULL) {

        if (ret == PREGSUB_ERROR)

            return HTTP_INTERNAL_SERVER_ERROR;

        if (ap_is_HTTP_REDIRECT(status)) {
@@ -468,7 +647,9 @@ static int translate_alias_redir(request_rec *r) 
        return status;

    }



    if ((ret = try_alias_list(r, serverconf->aliases, 0, &status)) != NULL) {

    if ((ret = try_alias(r)) != NULL

            || (ret = try_alias_list(r, serverconf->aliases, 0, &status))

                    != NULL) {

        r->filename = ret;

        return OK;

    }
@@ -486,7 +667,9 @@ static int fixup_redir(request_rec *r) 


    /* It may have changed since last time, so try again */



    if ((ret = try_alias_list(r, dirconf->redirects, 1, &status)) != NULL) {

    if ((ret = try_redirect(r, &status)) != NULL

            || (ret = try_alias_list(r, dirconf->redirects, 1, &status))

                    != NULL) {

        if (ret == PREGSUB_ERROR)

            return HTTP_INTERNAL_SERVER_ERROR;

        if (ap_is_HTTP_REDIRECT(status)) {