From cd7dfa6c1cde22a769c57e358c8f2b85177ff11a Mon Sep 17 00:00:00 2001 From: Graham Leggett Date: Mon, 30 Dec 2013 07:48:18 +0000 Subject: [PATCH] mod_authnz_ldap: Support the expression parser within the require directives. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1554161 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES | 3 + docs/log-message-tags/next-number | 2 +- docs/manual/expr.xml | 5 ++ docs/manual/mod/mod_authnz_ldap.xml | 13 ++++ modules/aaa/mod_authnz_ldap.c | 103 +++++++++++++++++++++++++--- 5 files changed, 114 insertions(+), 12 deletions(-) diff --git a/CHANGES b/CHANGES index d4c50f918c..133fe72039 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,9 @@ -*- coding: utf-8 -*- Changes with Apache 2.5.0 + *) mod_authnz_ldap: Support the expression parser within the require + directives. [Graham Leggett] + *) mod_ssl: Remove the hardcoded algorithm-type dependency for the SSLCertificateFile and SSLCertificateKeyFile directives, to enable future algorithm agility, and deprecate the SSLCertificateChainFile diff --git a/docs/log-message-tags/next-number b/docs/log-message-tags/next-number index d0f1b35877..06e45f3b09 100644 --- a/docs/log-message-tags/next-number +++ b/docs/log-message-tags/next-number @@ -1 +1 @@ -2585 +2590 diff --git a/docs/manual/expr.xml b/docs/manual/expr.xml index db339d40ad..dc9e8fbe47 100644 --- a/docs/manual/expr.xml +++ b/docs/manual/expr.xml @@ -51,6 +51,11 @@ RequestHeader FilterProvider Require expr +Require ldap-user +Require ldap-group +Require ldap-dn +Require ldap-attribute +Require ldap-filter SSLRequire LogMessage mod_include diff --git a/docs/manual/mod/mod_authnz_ldap.xml b/docs/manual/mod/mod_authnz_ldap.xml index a6dfdf6aec..de59a0b529 100644 --- a/docs/manual/mod/mod_authnz_ldap.xml +++ b/docs/manual/mod/mod_authnz_ldap.xml @@ -322,6 +322,9 @@ for HTTP Basic authentication. ldap-filter. Other authorization types may also be used but may require that additional authorization modules be loaded.

+

Since v2.5.0, expressions are supported + within the LDAP require directives.

+
Require ldap-user

The Require ldap-user directive specifies what @@ -542,6 +545,16 @@ Require ldap-group cn=Administrators, o=Example +

  • + Grant access to anybody in the group whose name matches the + hostname of the virtual host. In this example an + expression is used to build the filter. + +AuthLDAPURL ldap://ldap.example.com/o=Example?uid +Require ldap-group cn=%{SERVER_NAME}, o=Example + +
    • +
  • The next example assumes that everyone at Example who carries an alphanumeric pager will have an LDAP attribute diff --git a/modules/aaa/mod_authnz_ldap.c b/modules/aaa/mod_authnz_ldap.c index 71ef10e77d..86eb958052 100644 --- a/modules/aaa/mod_authnz_ldap.c +++ b/modules/aaa/mod_authnz_ldap.c @@ -630,6 +630,10 @@ static authz_status ldapuser_check_authorization(request_rec *r, util_ldap_connection_t *ldc = NULL; + const char *err = NULL; + const ap_expr_info_t *expr = parsed_require_args; + const char *require; + const char *t; char *w; @@ -703,11 +707,19 @@ static authz_status ldapuser_check_authorization(request_rec *r, return AUTHZ_DENIED; } + require = ap_expr_str_exec(r, expr, &err); + if (err) { + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(02585) + "auth_ldap authorize: require user: Can't evaluate expression: %s", + err); + return AUTHZ_DENIED; + } + /* * First do a whole-line compare, in case it's something like * require user Babs Jensen */ - result = util_ldap_cache_compare(r, ldc, sec->url, req->dn, sec->attribute, require_args); + result = util_ldap_cache_compare(r, ldc, sec->url, req->dn, sec->attribute, require); switch(result) { case LDAP_COMPARE_TRUE: { ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01703) @@ -727,7 +739,7 @@ static authz_status ldapuser_check_authorization(request_rec *r, /* * Now break apart the line and compare each word on it */ - t = require_args; + t = require; while ((w = ap_getword_conf(r->pool, &t)) && w[0]) { result = util_ldap_cache_compare(r, ldc, sec->url, req->dn, sec->attribute, w); switch(result) { @@ -767,6 +779,10 @@ static authz_status ldapgroup_check_authorization(request_rec *r, util_ldap_connection_t *ldc = NULL; + const char *err = NULL; + const ap_expr_info_t *expr = parsed_require_args; + const char *require; + const char *t; char filtbuf[FILTER_LENGTH]; @@ -886,7 +902,15 @@ static authz_status ldapgroup_check_authorization(request_rec *r, } } - t = require_args; + require = ap_expr_str_exec(r, expr, &err); + if (err) { + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(02586) + "auth_ldap authorize: require group: Can't evaluate expression: %s", + err); + return AUTHZ_DENIED; + } + + t = require; ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01713) "auth_ldap authorize: require group: testing for group " @@ -982,6 +1006,10 @@ static authz_status ldapdn_check_authorization(request_rec *r, util_ldap_connection_t *ldc = NULL; + const char *err = NULL; + const ap_expr_info_t *expr = parsed_require_args; + const char *require; + const char *t; char filtbuf[FILTER_LENGTH]; @@ -1044,7 +1072,15 @@ static authz_status ldapdn_check_authorization(request_rec *r, req->user = r->user; } - t = require_args; + require = ap_expr_str_exec(r, expr, &err); + if (err) { + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(02587) + "auth_ldap authorize: require dn: Can't evaluate expression: %s", + err); + return AUTHZ_DENIED; + } + + t = require; if (req->dn == NULL || strlen(req->dn) == 0) { ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01725) @@ -1091,6 +1127,10 @@ static authz_status ldapattribute_check_authorization(request_rec *r, util_ldap_connection_t *ldc = NULL; + const char *err = NULL; + const ap_expr_info_t *expr = parsed_require_args; + const char *require; + const char *t; char *w, *value; @@ -1161,7 +1201,16 @@ static authz_status ldapattribute_check_authorization(request_rec *r, return AUTHZ_DENIED; } - t = require_args; + require = ap_expr_str_exec(r, expr, &err); + if (err) { + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(02588) + "auth_ldap authorize: require ldap-attribute: Can't " + "evaluate expression: %s", err); + return AUTHZ_DENIED; + } + + t = require; + while (t[0]) { w = ap_getword(r->pool, &t, '='); value = ap_getword_conf(r->pool, &t); @@ -1206,6 +1255,11 @@ static authz_status ldapfilter_check_authorization(request_rec *r, (authn_ldap_config_t *)ap_get_module_config(r->per_dir_config, &authnz_ldap_module); util_ldap_connection_t *ldc = NULL; + + const char *err = NULL; + const ap_expr_info_t *expr = parsed_require_args; + const char *require; + const char *t; char filtbuf[FILTER_LENGTH]; @@ -1275,7 +1329,15 @@ static authz_status ldapfilter_check_authorization(request_rec *r, return AUTHZ_DENIED; } - t = require_args; + require = ap_expr_str_exec(r, expr, &err); + if (err) { + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(02589) + "auth_ldap authorize: require ldap-filter: Can't " + "evaluate require expression: %s", err); + return AUTHZ_DENIED; + } + + t = require; if (t[0]) { ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01743) @@ -1334,6 +1396,25 @@ static authz_status ldapfilter_check_authorization(request_rec *r, return AUTHZ_DENIED; } +static const char *ldap_parse_config(cmd_parms *cmd, const char *require_line, + const void **parsed_require_line) +{ + const char *expr_err = NULL; + ap_expr_info_t *expr = apr_pcalloc(cmd->pool, sizeof(*expr)); + + expr = ap_expr_parse_cmd(cmd, require_line, AP_EXPR_FLAG_STRING_RESULT, + &expr_err, NULL); + + if (expr_err) + return apr_pstrcat(cmd->temp_pool, + "Cannot parse expression in require line: ", + expr_err, NULL); + + *parsed_require_line = expr; + + return NULL; +} + /* * Use the ldap url parsing routines to break up the ldap url into @@ -1792,30 +1873,30 @@ static const authn_provider authn_ldap_provider = static const authz_provider authz_ldapuser_provider = { &ldapuser_check_authorization, - NULL, + &ldap_parse_config, }; static const authz_provider authz_ldapgroup_provider = { &ldapgroup_check_authorization, - NULL, + &ldap_parse_config, }; static const authz_provider authz_ldapdn_provider = { &ldapdn_check_authorization, - NULL, + &ldap_parse_config, }; static const authz_provider authz_ldapattribute_provider = { &ldapattribute_check_authorization, - NULL, + &ldap_parse_config, }; static const authz_provider authz_ldapfilter_provider = { &ldapfilter_check_authorization, - NULL, + &ldap_parse_config, }; static void ImportULDAPOptFn(void) -- 2.40.0