httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Yann Ylavic <ylavic....@gmail.com>
Subject Re: svn commit: r1585609 - /httpd/httpd/trunk/modules/aaa/mod_authz_core.c
Date Sat, 25 Apr 2015 23:22:14 GMT
Should I go with this ?

On Fri, Apr 17, 2015 at 11:54 AM, Yann Ylavic <ylavic.dev@gmail.com> wrote:
>
> How about handling the case in the Require directive parser itself
> (add_authz_provider)?
>
> Something like:
>
> Index: modules/aaa/mod_authz_core.c
> ===================================================================
> --- modules/aaa/mod_authz_core.c    (revision 1674046)
> +++ modules/aaa/mod_authz_core.c    (working copy)
> @@ -393,7 +393,13 @@ static const char *add_authz_provider(cmd_parms *c
>          section->negate = 1;
>      }
>
> -    section->provider_args = args;
> +    if (args && (args[0] == '"' || args[0] == '\'')
> +             && (args[strlen(args) - 1] == args[0])) {
> +        section->provider_args = ap_getword_conf(cmd->pool, &args);
> +    }
> +    else {
> +        section->provider_args = args;
> +    }
>
>      /* lookup and cache the actual provider now */
>      section->provider = ap_lookup_provider(AUTHZ_PROVIDER_GROUP,
> @@ -425,7 +431,7 @@ static const char *add_authz_provider(cmd_parms *c
>                                 AUTHZ_PROVIDER_NAME_NOTE,
>                                 apr_pool_cleanup_null,
>                                 cmd->temp_pool);
> -        err = section->provider->parse_require_line(cmd, args,
> +        err = section->provider->parse_require_line(cmd,
> section->provider_args,
>                                                &section->provider_parsed_args);
>
>          if (err)
> @@ -1069,16 +1075,6 @@ static const char *expr_parse_config(cmd_parms *cm
>      const char *expr_err = NULL;
>      struct require_expr_info *info = apr_pcalloc(cmd->pool, sizeof(*info));
>
> -    /* if the expression happens to be surrounded by quotes, skip them */
> -    if (require_line[0] == '"') {
> -        apr_size_t len = strlen(require_line);
> -
> -        if (require_line[len-1] == '"')
> -            require_line = apr_pstrndup(cmd->temp_pool,
> -                                        require_line + 1,
> -                                        len - 2);
> -    }
> -
>      apr_pool_userdata_setn(info, REQUIRE_EXPR_NOTE, apr_pool_cleanup_null,
>                            cmd->temp_pool);
>      info->expr = ap_expr_parse_cmd(cmd, require_line, 0, &expr_err,
> --
>
> (the second hunk is a revert of this commit).

Mime
View raw message