1
0
mirror of https://github.com/apache/httpd.git synced 2026-01-13 21:42:17 +03:00
Commit Graph

685 Commits

Author SHA1 Message Date
Christophe Jaillet
2d01df12ea Fix duplicate APLOGNO
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1596108 13f79535-47bb-0310-9956-ffa450edef68
2014-05-20 04:02:49 +00:00
Graham Leggett
9376a82bb2 mod_authnz_ldap: Fail explicitly when the filter is too long. Remove
unnecessary apr_pstrdup() and strlen().


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1591012 13f79535-47bb-0310-9956-ffa450edef68
2014-04-29 16:05:56 +00:00
Graham Leggett
84358db95c Add the ldap-search option to mod_authnz_ldap, allowing authorization
to be based on arbitrary expressions that do not include the username.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1589993 13f79535-47bb-0310-9956-ffa450edef68
2014-04-25 11:14:36 +00:00
Gregg Lewis Smith
8b5e1ad57d Add mod_authnz_fcgi to traditional Win build
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1588054 13f79535-47bb-0310-9956-ffa450edef68
2014-04-16 20:11:40 +00:00
Ben Reser
cb78bad8d4 Allow Require expr to work when the expression is quoted.
For example as appears in our documentation:
Require expr "%{TIME_HOUR} -ge 9 && %{TIME_HOUR} -le 17"

PR: 56235


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1585609 13f79535-47bb-0310-9956-ffa450edef68
2014-04-07 22:38:53 +00:00
Yann Ylavic
08346fc972 mod_auth_form: update empty log tags.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1585435 13f79535-47bb-0310-9956-ffa450edef68
2014-04-07 09:12:09 +00:00
Yann Ylavic
42e7a43e3c mod_auth_form: revert r1585431 (don't crash when no AuthFormProvider is configured).
This cannot happen in trunk, 2.4.x needs authenticate_form_post_config() to be
merged (r1531672).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1585434 13f79535-47bb-0310-9956-ffa450edef68
2014-04-07 09:10:51 +00:00
Yann Ylavic
c36332bfcb mod_auth_form: don't crash when no AuthFormProvider is configured. PR 56351
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1585431 13f79535-47bb-0310-9956-ffa450edef68
2014-04-07 08:59:07 +00:00
Jeff Trawick
edbbc1acda move a temporary table from r->pool to a temporary
pool we've already allocated in order to avoid a 
longer lifetime than necessary for the table memory

Suggested by: jailletc36


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1585072 13f79535-47bb-0310-9956-ffa450edef68
2014-04-05 11:57:46 +00:00
Jeff Trawick
fa91c90ef4 axe unnecessary preparation for some other module using
[ap_]connect_to_peer() and passing in its own module
identifier

Pointed out by: jailletc36


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1585054 13f79535-47bb-0310-9956-ffa450edef68
2014-04-05 11:45:47 +00:00
Jeff Trawick
e19c8aabd4 don't log bogus rv
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1583007 13f79535-47bb-0310-9956-ffa450edef68
2014-03-29 14:57:37 +00:00
Christophe Jaillet
6e69b3ceb0 Use 'apr_table_setn' instead of 'apr_table_set' when possible in order to save memory.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1578762 13f79535-47bb-0310-9956-ffa450edef68
2014-03-18 06:54:03 +00:00
Jan Kaluža
7c077f5aff mod_authn_socache.c: fix creation of default socache_instance.
In pre_config, default socache_provider is created, but socache_instance
initialization is missing. This leads to crash on startup if default
socache_provider is used (AuthnCacheSOCache is not called) and
AuthnCacheEnable or AuthnCacheProvideFor is used.

This problem has been introduced in r1531961.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1576233 13f79535-47bb-0310-9956-ffa450edef68
2014-03-11 08:52:54 +00:00
Jeff Trawick
379c6db4f3 follow-up to r1554161, r1554168, r1554170, r1554175, r1554188, and r1554195:
axe unnecessary initialization/pool allocation


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1558483 13f79535-47bb-0310-9956-ffa450edef68
2014-01-15 17:42:39 +00:00
Eric Covener
eb7516d35a Providers defined in <AuthnProviderAlias have not been usable under
in virtual hosts since migrating from mod_authn_alias to mod_authn_core.
PR 55622.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1554995 13f79535-47bb-0310-9956-ffa450edef68
2014-01-03 01:59:12 +00:00
Graham Leggett
d377e1d3ac mod_authz_user: Support the expression parser within the require directives.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1554195 13f79535-47bb-0310-9956-ffa450edef68
2013-12-30 11:57:15 +00:00
Graham Leggett
be8ea07e55 mod_authnz_host: Support the expression parser within the require directives.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1554188 13f79535-47bb-0310-9956-ffa450edef68
2013-12-30 11:14:19 +00:00
Graham Leggett
a73870441f Pass the correct pointer that made it past the test suite.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1554184 13f79535-47bb-0310-9956-ffa450edef68
2013-12-30 10:56:05 +00:00
Graham Leggett
defc95ad91 Pass the correct pointer that made it past the test suite.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1554181 13f79535-47bb-0310-9956-ffa450edef68
2013-12-30 10:52:58 +00:00
Graham Leggett
d3a32a3a00 Pass the correct pointer that made it past the test suite.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1554176 13f79535-47bb-0310-9956-ffa450edef68
2013-12-30 10:21:07 +00:00
Graham Leggett
5e6723cbc9 mod_authnz_groupfile: Support the expression parser within the require directives.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1554175 13f79535-47bb-0310-9956-ffa450edef68
2013-12-30 09:59:58 +00:00
Graham Leggett
c8258c2ade mod_authnz_dbm: Support the expression parser within the require directives.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1554170 13f79535-47bb-0310-9956-ffa450edef68
2013-12-30 09:37:17 +00:00
Graham Leggett
133bf49fdf mod_authnz_dbd: Support the expression parser within the require directives.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1554168 13f79535-47bb-0310-9956-ffa450edef68
2013-12-30 08:54:09 +00:00
Graham Leggett
cd7dfa6c1c 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
2013-12-30 07:48:18 +00:00
Eric Covener
66c5435a4d update comments for two r->user related directives.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1553485 13f79535-47bb-0310-9956-ffa450edef68
2013-12-26 13:57:49 +00:00
Eric Covener
9247116c87 Log a warning when the LDAP authn provider is configured but an AuthLDAPURL
isn't -- IOW, avoid silently skipping a misconfigured [or buggy?] LDAP provider.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1551611 13f79535-47bb-0310-9956-ffa450edef68
2013-12-17 16:38:36 +00:00
Graham Leggett
dfd46c234e mod_auth_form: Make the trace logging consistent through the notes, session
and form authentication steps.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1550307 13f79535-47bb-0310-9956-ffa450edef68
2013-12-11 23:08:42 +00:00
Graham Leggett
e8907b1678 mod_auth_form: Add a debug message when the fields on a form are not
recognised.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1550302 13f79535-47bb-0310-9956-ffa450edef68
2013-12-11 22:59:53 +00:00
Christophe Jaillet
553054d0ba Fix missing spaces in messages
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1546860 13f79535-47bb-0310-9956-ffa450edef68
2013-12-01 21:13:56 +00:00
Jeff Trawick
59d2f013e2 At least one authorizer that doesn't use libfcgi directly
or indirectly does not like getting an empty FCGI_STDIN
block.  Don't send it.  (Other mods for httpd didn't send
it to authorizers either.)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1541181 13f79535-47bb-0310-9956-ffa450edef68
2013-11-12 18:11:31 +00:00
Christophe Jaillet
534f207ddd Remove useless apr_pstrdup as done for other mod_auth modules in r1026660
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1538149 13f79535-47bb-0310-9956-ffa450edef68
2013-11-02 08:22:25 +00:00
Jeff Trawick
d0848999d5 axe some useless assignments (clang scan-build)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1534997 13f79535-47bb-0310-9956-ffa450edef68
2013-10-23 12:03:04 +00:00
Chris Darroch
cc4c936c2e Support optional initialization arguments for socache providers in
mod_authn_socache.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1531961 13f79535-47bb-0310-9956-ffa450edef68
2013-10-14 16:08:41 +00:00
Graham Leggett
6330b052dd mod_auth_form: Make sure the optional functions are loaded even when
the AuthFormProvider isn't specified.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1531672 13f79535-47bb-0310-9956-ffa450edef68
2013-10-13 12:14:39 +00:00
Jeff Trawick
c4b92f3f89 allow building mod_authnz_fcgi with 2.4.x branch
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1526647 13f79535-47bb-0310-9956-ffa450edef68
2013-09-26 19:14:39 +00:00
Eric Covener
b15541f8e0 Change the default value of AuthLDAPMaxSubGroupDepth, so sub-group searching
is opt-in.  Not intended for 2.4 backport.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1525866 13f79535-47bb-0310-9956-ffa450edef68
2013-09-24 12:14:57 +00:00
Graham Leggett
4b7e438b31 mod_auth_digest: Be more specific when the realm mismatches because the
realm has not been specified.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1523239 13f79535-47bb-0310-9956-ffa450edef68
2013-09-14 13:48:46 +00:00
Jeff Trawick
2fae813197 Add "default user id" capability for authorizers that handle
check_authn and return success but don't have a specific user
id to assign (e.g., guest users).



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1521909 13f79535-47bb-0310-9956-ffa450edef68
2013-09-11 15:37:34 +00:00
Eric Covener
9f4b3a837a Don't log AUTHZ_DENIED failures at ERROR level in authz providers
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1517366 13f79535-47bb-0310-9956-ffa450edef68
2013-08-25 19:07:11 +00:00
Jeff Trawick
c52d7573f1 mod_authnz_fcgi: New module to enable FastCGI authorizer
applications to authenticate and/or authorize clients.

A fair amount of code was taken from or at least based on
mod_proxy_fcgi, with a smaller amount taken from mod_fcgid.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1515403 13f79535-47bb-0310-9956-ffa450edef68
2013-08-19 13:25:55 +00:00
Chris Darroch
785201bff8 Add AuthBasicUseDigestAlgorithm directive to allow migration of
passwords from digest to basic authentication.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1514064 13f79535-47bb-0310-9956-ffa450edef68
2013-08-14 21:57:21 +00:00
Eric Covener
7fbc93eac7 Restore support for the AUTH_HANDLED return code in AUTHN providers,
like in 2.2, which allows authn provider to return their own status
in r->status (custom error code, or return a redirect)



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1499351 13f79535-47bb-0310-9956-ffa450edef68
2013-07-03 12:13:50 +00:00
Eric Covener
23af045396 authnzldap: support "none" as a filter to suppress using a search filter,
which is required by some mainframe security products serving native
registry over LDAP.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1497371 13f79535-47bb-0310-9956-ffa450edef68
2013-06-27 14:25:50 +00:00
Eric Covener
d2b57d3440 revert r1496183, leave at DEBUG. This not a subgroup message.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1496202 13f79535-47bb-0310-9956-ffa450edef68
2013-06-24 20:32:31 +00:00
Eric Covener
7439853cc5 attribute and error reason reversed
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1496194 13f79535-47bb-0310-9956-ffa450edef68
2013-06-24 20:16:57 +00:00
Eric Covener
482a66207f Drop severity from DEBUG to trace4: "... didn't match with attr DN failed group verification."
(This is just mod_authnz_ldap trying multiple atribbutes to discover LDAP subgroups)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1496183 13f79535-47bb-0310-9956-ffa450edef68
2013-06-24 19:48:34 +00:00
Rainer Jung
aa4befc8b9 Fix "unused variable" warning.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1494532 13f79535-47bb-0310-9956-ffa450edef68
2013-06-19 10:16:35 +00:00
Christophe Jaillet
2e581fd49e Correct typo in error message
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1493330 13f79535-47bb-0310-9956-ffa450edef68
2013-06-15 08:59:00 +00:00
Stefan Fritsch
4b8ed77a46 Move initialization of the secret to the pre_config hook. Use
ap_retained_data_*() because we don't have access to process->pool there.

This makes the code shorter and a lot more clear, but cannot directly be
backported to 2.2 which doesn't have ap_retained_data_*().


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1493257 13f79535-47bb-0310-9956-ffa450edef68
2013-06-14 21:43:30 +00:00
Stefan Fritsch
1351960ca1 Actually use the secret when generating nonces.
This change may cause problems if used with round robin load balancers.
Before it is backported, we should add a directive to use a user specified
secret.

PR: 54637


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1492395 13f79535-47bb-0310-9956-ffa450edef68
2013-06-12 19:34:19 +00:00