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

141 Commits

Author SHA1 Message Date
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
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
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
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
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
Stefan Fritsch
0c973e51b3 Remove partial non-working implementation of MD5-sess and qop=auth-int.
If anyone wants to finish the code, it can be retrieved from svn history.
Remove some obsolete references to the truerand library.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1463049 13f79535-47bb-0310-9956-ffa450edef68
2013-03-31 20:38:17 +00:00
Stefan Fritsch
770dc35c17 if shm initialization fails, reset client_list to avoid crashes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1463047 13f79535-47bb-0310-9956-ffa450edef68
2013-03-31 20:17:44 +00:00
Stefan Fritsch
979cd47257 ap_log_error already logs the error string, no need to log it twice
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1463045 13f79535-47bb-0310-9956-ffa450edef68
2013-03-31 20:13:48 +00:00
Stefan Fritsch
16ae8a17c5 use apr_array for an array
Submitted by: Christophe JAILLET (with small tweaks by myself)
PR: 52881


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1463044 13f79535-47bb-0310-9956-ffa450edef68
2013-03-31 20:10:43 +00:00
Stefan Fritsch
ea79dca257 more simplification with ap_bin2hex()
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1458020 13f79535-47bb-0310-9956-ffa450edef68
2013-03-18 21:34:37 +00:00
Jeff Trawick
7a90418657 mod_auth_digest now respects DefaultRuntimeDir
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1371387 13f79535-47bb-0310-9956-ffa450edef68
2012-08-09 19:08:23 +00:00
Stefan Fritsch
92e366007c Add lots of unique tags to error log messages
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1209766 13f79535-47bb-0310-9956-ffa450edef68
2011-12-02 23:02:04 +00:00
Stefan Fritsch
b4ec041ba7 Remove more log message prefixes that are now redundant as the
the error log format includes the module name.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1208110 13f79535-47bb-0310-9956-ffa450edef68
2011-11-29 22:28:21 +00:00
Jim Jagielski
427c85bd23 Cleanup effort in prep for GA push:
Trim trailing whitespace... no func change



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1174751 13f79535-47bb-0310-9956-ffa450edef68
2011-09-23 13:39:32 +00:00
Jeff Trawick
aca61ab7a5 s/seperate/separate/
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1137024 13f79535-47bb-0310-9956-ffa450edef68
2011-06-17 21:12:14 +00:00
Stefan Fritsch
51226bdcca Fix various "variable 'x' set but not used" warnings.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1125877 13f79535-47bb-0310-9956-ffa450edef68
2011-05-22 07:42:18 +00:00
Stefan Fritsch
2014acf62f Improvements found by cppcheck:
remove some unused variables and dead assignments, reduce the scope of some
variables, add some parens to improve readability


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1103459 13f79535-47bb-0310-9956-ffa450edef68
2011-05-15 16:58:45 +00:00
Jeff Trawick
4598f1a7d4 fix some grammar mistakes, mostly in comments
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1080821 13f79535-47bb-0310-9956-ffa450edef68
2011-03-12 00:35:39 +00:00
Stefan Fritsch
385da96d50 Use ap_state_query() to fix many modules that were not correctly initializing
if they were not active during server startup but got enabled later during a
graceful restart (in which case they need to do all work during a single
config run).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1070153 13f79535-47bb-0310-9956-ffa450edef68
2011-02-12 21:23:56 +00:00
Daniel Earl Poirier
6b803976f2 Fix a number of typos and misspellings. Reported by Ville Skytta.
PR48496.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1029134 13f79535-47bb-0310-9956-ffa450edef68
2010-10-30 17:56:13 +00:00
Stefan Fritsch
00f70ddc9a more temp pool usage and remove some useless apr_pstrdup()s
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1026660 13f79535-47bb-0310-9956-ffa450edef68
2010-10-23 18:35:06 +00:00
Philip M. Gollucci
ff7cfbdcbb entry is over written immediately below
Reported by:	clang static analyzer



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@983115 13f79535-47bb-0310-9956-ffa450edef68
2010-08-06 20:02:59 +00:00
Stefan Fritsch
51b3ed8a8d Reduce logging noise at graceful restart
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@981092 13f79535-47bb-0310-9956-ffa450edef68
2010-07-31 21:07:41 +00:00
Stefan Fritsch
eedf130332 Introduce note_auth_failure hook to allow modules to add support
for additional auth types. This makes ap_note_auth_failure() work with
mod_auth_digest again.

PR: 48807


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@960399 13f79535-47bb-0310-9956-ffa450edef68
2010-07-04 21:16:53 +00:00
Stefan Fritsch
ed451e94d1 re-order many struct members for better alignment on 64bit
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@959464 13f79535-47bb-0310-9956-ffa450edef68
2010-06-30 22:34:05 +00:00
Stefan Fritsch
ebb62867fb Use the new APLOG_USE_MODULE/AP_DECLARE_MODULE macros everywhere to take
advantage of per-module loglevels


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@951895 13f79535-47bb-0310-9956-ffa450edef68
2010-06-06 16:59:50 +00:00
William A. Rowe Jr
01d300298f Catch up with ap_[proc|global]_mutex_create api change
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@940981 13f79535-47bb-0310-9956-ffa450edef68
2010-05-04 17:40:43 +00:00
Jeff Trawick
b0ab99d9d0 fix this:
mod_auth_digest.c: In function ‘set_shmem_size’:
mod_auth_digest.c:681: warning: format ‘%ld’ expects type ‘long int’, but argument 7 has type ‘apr_size_t’


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@886213 13f79535-47bb-0310-9956-ffa450edef68
2009-12-02 17:34:33 +00:00
William A. Rowe Jr
3e338e488c Elaborate on low hanging XXX fruit
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@885689 13f79535-47bb-0310-9956-ffa450edef68
2009-12-01 08:44:11 +00:00
Jeff Trawick
0644e027f4 tweaks to r883540:
watchdog: use better mutex type name
  ldap/digest: use same FOO_mutex_type variable name as other modules
    for easier searching


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@883708 13f79535-47bb-0310-9956-ffa450edef68
2009-11-24 14:47:55 +00:00
Jeff Trawick
2e9668a33d Replace AcceptMutex, LockFile, RewriteLock, SSLMutex, SSLStaplingMutex,
and WatchdogMutexPath with a single Mutex directive.  Add APIs to
simplify setup and user customization of APR proc and global mutexes.  
(See util_mutex.h.)  Build-time setting DEFAULT_LOCKFILE is no longer
respected; set DEFAULT_REL_RUNTIMEDIR instead.

Some existing modules, such as mod_ldap and mod_auth_digest gain 
configurability for their mutexes.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@883540 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 23:17:51 +00:00
Daniel Earl Poirier
cc4511fcf2 Fail server startup when mod_auth_digest is unable to
provide the security checks configured.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@813396 13f79535-47bb-0310-9956-ffa450edef68
2009-09-10 12:12:58 +00:00
Daniel Earl Poirier
6db0a1889e mod_auth_digest: When qop is none, client doesn't send nonce count,
but module was segfaulting trying to check the nonce count anyway.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@812934 13f79535-47bb-0310-9956-ffa450edef68
2009-09-09 13:04:34 +00:00
Daniel Earl Poirier
ba6c69e738 Make code match warning message: disable nonce-checking
if shared memory isn't available.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@808903 13f79535-47bb-0310-9956-ffa450edef68
2009-08-28 14:42:25 +00:00
Daniel Earl Poirier
f3b90258f0 Don't let the server start if user has asked for qop=auth-int
with mod_auth_digest.  The server can't provide it because it's
not implemented yet.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@808901 13f79535-47bb-0310-9956-ffa450edef68
2009-08-28 14:39:34 +00:00
Daniel Earl Poirier
1bc6da5bb4 Fix shm, rmm, and lock problems.
PR: 16057


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@808150 13f79535-47bb-0310-9956-ffa450edef68
2009-08-26 18:29:49 +00:00
Eric Covener
bb7398fce0 revert r672639 which lacked a necessary major bump, add a major MMN bump
to account for the short-lived API addition/removal.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@678947 13f79535-47bb-0310-9956-ffa450edef68
2008-07-22 23:49:51 +00:00
Eric Covener
bbc850ee33 mod_auth_digest: Detect during startup when AuthDigestProvider
is configured to use an incompatible provider via AuthnProviderAlias.
PR 45196 



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@672639 13f79535-47bb-0310-9956-ffa450edef68
2008-06-29 16:42:43 +00:00
Chris Darroch
fc21f4e72e Determine registered authn/z providers directly in ap_setup_auth_internal(),
which allows optional functions that just wrapped ap_list_provider_names()
to be removed from authn/z modules.

This change requires modules/aaa/mod_auth.h to be included into
server/request.c, which necessitates a minor change to configure.in for
Unix platforms.

I'm unable to tell whether a similar change is necessary for Windows and
NetWare builds or not.  Could developers with access to those platforms
please test and make any needed configuration or build alterations?  Thanks!


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@659160 13f79535-47bb-0310-9956-ffa450edef68
2008-05-22 17:01:14 +00:00
Chris Darroch
9864958fcd Convert common provider version strings ("0") to
AUTHN/Z_PROVIDER_VERSION macros defined in mod_auth.h.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@658046 13f79535-47bb-0310-9956-ffa450edef68
2008-05-19 23:53:05 +00:00
Chris Darroch
8e69b9c41b Let each consumer of authn providers redefine the list_provider_names
callback in case they are loaded individually without mod_authn_core.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@646445 13f79535-47bb-0310-9956-ffa450edef68
2008-04-09 17:25:33 +00:00
Chris Darroch
c8ba67fb83 Avoid calling access control hooks for internal requests with
configurations which match those of the initial request.  Revert to
the original behaviour (call access control hooks for internal requests
with URIs different from the initial request) if any access control hooks
or providers are not registered as permitting this optimization.
Introduce wrappers for access control hook and provider registration
which can accept additional mode and flag data.

The configuration walk optimizations were originally proposed a while
ago (see http://marc.info/?l=apache-httpd-dev&m=116536713506234&w=2);
they have been used since then in production systems and appear to be
stable and effective.  They permit certain combinations of modules
and clients to function efficiently, especially when a deeply recursive
series of internal requests, such as those generated by certain WebDAV
requests, are all subject to the identical authentication and authorization
directives.

The major change from the original proposal is a cleaner mechanism for
detecting modules which may expect the old behaviour.  This has been
tested successfully with Subversion's mod_authz_svn, which specifically
requires the old behaviour when performing path-based authorization based
against its own private access control configuration files.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@644525 13f79535-47bb-0310-9956-ffa450edef68
2008-04-03 21:51:07 +00:00
Roy T. Fielding
de659cbed0 update license header text
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@420983 13f79535-47bb-0310-9956-ffa450edef68
2006-07-11 20:33:53 +00:00
Colm MacCarthaigh
dd95d7c37c Update the copyright year in all .c, .h and .xml files
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@395228 13f79535-47bb-0310-9956-ffa450edef68
2006-04-19 12:11:27 +00:00
Joe Orton
0670cffc27 * modules/aaa/mod_auth_digest.c (hdr): Remove function.
(add_auth_info): Remove dead #if 0'ed code to support 2069-style
entity-digest.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@384467 13f79535-47bb-0310-9956-ffa450edef68
2006-03-09 09:07:08 +00:00
Justin Erenkrantz
2797b883ca Remove support for 'On' and 'Off' for AuthBasicProvider and AuthDigestProvider
as it doesn't actually work as advertised.

Reviewed by: Joshua Slive (concept)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@345054 13f79535-47bb-0310-9956-ffa450edef68
2005-11-16 16:35:49 +00:00
Jim Jagielski
5061d9fa92 No functional Change: Removing trailing whitespace. This also
means that "blank" lines consisting of just spaces or
tabs are now really blank lines


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@332306 13f79535-47bb-0310-9956-ffa450edef68
2005-11-10 15:11:44 +00:00
Joe Orton
d67cf94f72 * modules/aaa/mod_auth_digest.c: Another gcc 4 "structure field may be
used uninitialized" warning; fix validation of digest-uri for CONNECT
requests:

(copy_uri_components): Copy the hostinfo field.
(authenticate_digest_user): Don't pass NULL (or, previously, a random
pointer) to strcmp if a digest-uri is provided which doesn't match the
request-uri in a CONNECT request.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@193127 13f79535-47bb-0310-9956-ffa450edef68
2005-06-23 10:27:27 +00:00
Paul Querna
df86e987f7 Fix segmentation fault in mod_auth_{basic,digest} when no provider is explicitly listed.
Reported by: Ben Collins-Sussman <sussman collab.net>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@178674 13f79535-47bb-0310-9956-ffa450edef68
2005-05-26 20:34:21 +00:00