1
0
mirror of https://github.com/apache/httpd.git synced 2026-10-25 10:59:28 +03:00
Commit Graph

95 Commits

Author SHA1 Message Date
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
Bradley Nicholes
556fb599b5 Add the auth provider name as a note in the request so that authn_provider_alias is able to look up the original provider along with the per_dir configuration.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@178052 13f79535-47bb-0310-9956-ffa450edef68
2005-05-23 23:07:49 +00:00
Justin Erenkrantz
905cdf9f0b Update copyright year to 2005 and standardize on current copyright owner line.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@151408 13f79535-47bb-0310-9956-ffa450edef68
2005-02-04 20:28:49 +00:00
Cliff Woolley
a89bce3fd9 "transfered" is not a word.
s/transfered/transferred/g;



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@111858 13f79535-47bb-0310-9956-ffa450edef68
2004-12-14 18:58:25 +00:00
Geoffrey Young
67d4c4decc Allow Digest providers to return AUTH_DENIED to propagate a 401
status and terminate the provider chain prior to checking the password.
Reviewed by:	justin


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103271 13f79535-47bb-0310-9956-ffa450edef68
2004-04-05 18:00:15 +00:00
Geoffrey Young
7665ccd497 work around MSIE Digest auth bug - if AuthDigestEnableQueryStringHack
is set in r->subprocess_env allow mismatched query strings to pass.
PR: 27758


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103096 13f79535-47bb-0310-9956-ffa450edef68
2004-03-23 13:57:48 +00:00
Geoffrey Young
25c8f1662c minor mod_auth_basic and mod_auth_digest sync. mod_auth_basic
now populates r->user with the (possibly unauthenticated) user,
and mod_auth_digest returns 500 when a provider returns
AUTH_GENERAL_ERROR
Reviewed by:	justin


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102719 13f79535-47bb-0310-9956-ffa450edef68
2004-02-21 00:53:18 +00:00
André Malo
a688f06b19 fix name of The Apache Software Foundation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102618 13f79535-47bb-0310-9956-ffa450edef68
2004-02-09 20:31:03 +00:00
André Malo
1afeb99711 fix copyright dates according to the first check in
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102550 13f79535-47bb-0310-9956-ffa450edef68
2004-02-07 19:38:27 +00:00
André Malo
4f02cb1e18 apply Apache License, Version 2.0
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102525 13f79535-47bb-0310-9956-ffa450edef68
2004-02-06 22:58:42 +00:00
Justin Erenkrantz
87bf129468 Allow mod_auth_digest to work with sub-requests with different methods than
the original request.

PR: 25040
Submitted by:	Josh Dady <jpd@indecisive.com>
Reviewed by:	Justin Erenkrantz, Sander Striker (concept)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102447 13f79535-47bb-0310-9956-ffa450edef68
2004-01-29 19:21:13 +00:00
André Malo
fb07607180 update license to 2004.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102135 13f79535-47bb-0310-9956-ffa450edef68
2004-01-01 13:26:26 +00:00
Justin Erenkrantz
c02dcf4c02 Sync with APR-util deprecated functions.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101789 13f79535-47bb-0310-9956-ffa450edef68
2003-11-16 02:22:25 +00:00
André Malo
a3a4b01dc1 drop the guess_domain function.
Our docs say about AuthDigestDomain:
This directive should always be specified and contain at least the (set of)
root URI(s) for this space. Omitting to do so will cause the client to send
the Authorization header for every request sent to this server.

guessing the parameter is somewhat bogus. guess_domain() also resulted sometimes
in relative URIs, non-URI strings or empty strings, which caused a lot of
problems.
According to the docs, the domain parameter will be omitted now,
if not specified. This is exactly, what one would expect.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98636 13f79535-47bb-0310-9956-ffa450edef68
2003-02-13 02:28:57 +00:00
André Malo
da9f328380 Do not use local paths for the domain parameter on non-unix systems.
PR: 16937


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98610 13f79535-47bb-0310-9956-ffa450edef68
2003-02-11 02:08:01 +00:00
André Malo
742af25096 finished that boring job:
update license to 2003.

Happy New Year! ;-))


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98573 13f79535-47bb-0310-9956-ffa450edef68
2003-02-03 17:53:28 +00:00
André Malo
ee354d8caa make provider selection available in .htaccess files
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98146 13f79535-47bb-0310-9956-ffa450edef68
2003-01-01 16:40:42 +00:00
Wilfredo Sanchez
4273951026 outch. there are some possible NULL pointer references. Have you ever tried
AuthDigestProvider dbm? This results in a great kaboom. The patch makes
apache throw an error, if someone tries a provider, that doesn't support
the particular auth scheme.

Submitted by:	Andre Malo <nd@perlig.de>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97802 13f79535-47bb-0310-9956-ffa450edef68
2002-12-08 21:13:07 +00:00
Wilfredo Sanchez
1f8f74d25c when asking the providers for authentication, the main loop should
not only  break, if access is granted. It should also break, if
access was *denied*  by one provider. To be safe, it has to break
also, if an error occured. So  the patch turns the condition around
and continues only, if the user was  not found.
I find it also weird, that if auth was denied (by password
usually), the  AuthBasicAuthoritative behaviour can override that
by "passing to lower  modules". The patch changes that behaviour,
too.

Justin notes:
I'm kind of on the fence about that.  I was originally thinking
optimistically, but yeah, it might make sense to do it
pessimistically.  If there's any error, bug out.

Submitted by:	Andre Malo <nd@perlig.de>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97801 13f79535-47bb-0310-9956-ffa450edef68
2002-12-08 21:10:37 +00:00
Justin Erenkrantz
1efa9fe703 Per Greg's request, add a version string component to the ap_provider.h
functions.  This allows modules to register different versions of the
same provider.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97696 13f79535-47bb-0310-9956-ffa450edef68
2002-11-30 18:48:41 +00:00
Justin Erenkrantz
7efe307731 Add ap_register_provider and ap_lookup_provider functions which resolve
the DSO link problems for DAV and the new aaa modules by moving the
provider code into the core of the server and generalizing them to be
used by any code.

Remove the auth{nz}_*_provider functions as they are no longer needed.

Change the dav_*_provider functions to wrap the ap_*_provider functions
as they have a bit more of a historical precedent that we should keep
around.

Reviewed by:	John K. Sterling <john@sterls.com> (in concept)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96919 13f79535-47bb-0310-9956-ffa450edef68
2002-09-20 00:57:50 +00:00
Justin Erenkrantz
913278e702 Add ability to use multiple providers for basic and digest authentication.
The syntax is:

AuthBasicProvider file dbm
AuthUserFile conf/basic-user
AuthDBMUserFile conf/basic-user-dbm


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96869 13f79535-47bb-0310-9956-ffa450edef68
2002-09-18 01:05:25 +00:00
Justin Erenkrantz
20202e5cdc Stage #2 of aaa rewrite: Add provider support so that mod_authn_* modules
do not have to re-implement basic auth and to allow mod_auth_digest (and
other modules) to leverage the authn backends.

Adds AuthBasicProvider and AuthDigestProvider directives.

This also moves a lot of the basic auth handling code inside of mod_auth_basic
(but does not remove the code in server/protocol.c - that will have to wait
for a version bump so that we don't totally bust old modules).

This patch incorporates code review comments by Greg Stein.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96739 13f79535-47bb-0310-9956-ffa450edef68
2002-09-10 06:57:03 +00:00
Justin Erenkrantz
9cdc0f0ce9 Stage #1 of the aaa rewrite - refactoring modules.
All modules are reorganized under the following scheme:
- mod_auth_*:   Front-end (basic, digest)
- mod_authn_*:  Authentication (anon, dbm, default, file)
- mod_authz_*:  Authorization (dbm, default, groupfile, host, user)

This passes the httpd-test suite when it accounts for the renaming of
aaa modules.

Originally written by: Dirk-Willem van Gulik
Completed by: Justin Erenkrantz


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96728 13f79535-47bb-0310-9956-ffa450edef68
2002-09-10 00:15:39 +00:00
Victor J. Orlikowski
d982829aa1 Continue the Bill Rowe apr_size_t crusade.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95993 13f79535-47bb-0310-9956-ffa450edef68
2002-07-10 06:01:14 +00:00
Brian Pane
6cbe41d3fe use new time conversion macros in place of APR_USEC_PER_SEC
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95961 13f79535-47bb-0310-9956-ffa450edef68
2002-07-05 00:53:12 +00:00
William A. Rowe Jr
5cf5552b11 Use lowercased macros
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95620 13f79535-47bb-0310-9956-ffa450edef68
2002-06-12 22:27:37 +00:00
William A. Rowe Jr
271ee8497b Use the new APR_TIME_FROM_SEC() wrapper
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95616 13f79535-47bb-0310-9956-ffa450edef68
2002-06-12 16:56:27 +00:00
Jeff Trawick
bc0cf18899 stop using APLOG_NOERRNO in calls to ap_log_[pr]error()
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95151 13f79535-47bb-0310-9956-ffa450edef68
2002-05-17 11:33:10 +00:00
Bradley Nicholes
a05adbc9f5 By using _setn instead of _set, this call is setting a pointer to a stack variable
in the hash entry.  Once initialize_module() returns, the key pointer in the
hash entry is invalid.  This causes a fault the next time that the hash entry
key is checked.  Calling the _set() version will store a copy of the key which
has the same lifetime as the hash table entry.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94914 13f79535-47bb-0310-9956-ffa450edef68
2002-05-02 22:03:58 +00:00
Roy T. Fielding
108504ab8b kill a warning on Darwin for NONCE_LEN becoming a long int by math.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94833 13f79535-47bb-0310-9956-ffa450edef68
2002-04-28 09:02:19 +00:00
Roy T. Fielding
845cbfd508 Update our copyright for this year.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93918 13f79535-47bb-0310-9956-ffa450edef68
2002-03-13 20:48:07 +00:00
Aaron Bannert
bdf5fe9280 Convert mod_auth_digest to use the new apr_global_mutex_t type.
Added some comments that will help us make this more portable.
tmpnam() is not portable to platforms that will not inhereit
the process, so we need to pull the lock filename from somewhere
shared, like a configuration directive.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93533 13f79535-47bb-0310-9956-ffa450edef68
2002-02-21 17:00:50 +00:00
Bradley Nicholes
6bff0e6ab3 Added some type casting to the appropriate types to avoid type mismatches
on the CodeWarrior compiler


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93066 13f79535-47bb-0310-9956-ffa450edef68
2002-01-29 00:23:30 +00:00
William A. Rowe Jr
73430e922d Fixing the apr_shm_ and apr_rmm_ args back to a warning state was good.
Enabling APR_HAS_SHARED_MEMORY again in the previous patch was bad.

  This can be toggled once we straighten out all the pointers into offsets.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92794 13f79535-47bb-0310-9956-ffa450edef68
2002-01-10 02:58:10 +00:00
William A. Rowe Jr
7e1113f913 This patch eliminated from the _SHARED_ segment of the scoreboard all
pointer math.  This is required for portable scoreboards.

  vhost becomes the 'vhost name string' so it now survives ap_generation
  clicks.  next was apparently never used.

  This patch also accounts for the changes to the apr_shm api, and gives
  Win32 the magic of a shared scoreboard.

  Breakage aplenty on non-win32 platforms, I suspect, but this radical
  surgery, and culling of unused functions, was really, really needed.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92791 13f79535-47bb-0310-9956-ffa450edef68
2002-01-10 00:28:00 +00:00
Jeff Trawick
57b42f96ac handle the disappearance of apr_lock_create_np() and
apr_proc_mutex_create_np() and the new parameter to
apr_lock_create() and apr_proc_mutex_create()


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92653 13f79535-47bb-0310-9956-ffa450edef68
2001-12-29 23:16:24 +00:00
William A. Rowe Jr
b04cdf141a Error feedback, PLEASE!
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92645 13f79535-47bb-0310-9956-ffa450edef68
2001-12-29 03:34:33 +00:00
Aaron Bannert
130eaf6e95 Two fixes in one:
- No longer calls exit() when the secret fails to initialize, instead
  post_config just returns !OK and lets the server bail out.

- No longer fails on DSOs -- since we load-unload-reload DSOs we lose
  any static memory that was initialized during the first load.
  This patch allows us to simply pass on the first call to post_config,
  and then do the initialization in the second call.

Tested to work on Linux from an IE5.0 client.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92630 13f79535-47bb-0310-9956-ffa450edef68
2001-12-27 21:36:10 +00:00
Aaron Bannert
470adc87c8 Style changes only. Lots of tab alignment issues, and added lots of
extra {} blocks. I first ran it through M-x untabify, then went through
the whole thing by hand, then compiled/tested it. This is a preemptive
style-strike.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92626 13f79535-47bb-0310-9956-ffa450edef68
2001-12-27 19:40:15 +00:00
Ian Holsman
86b792b21c Modify post_config hook so that it can return a error,
causing the server not to start.
previous method was to call exit(1) which would not fail
gracefully

PR:
Obtained from:
Submitted by:
Reviewed by:	(Idea only Jeff Trawick)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92144 13f79535-47bb-0310-9956-ffa450edef68
2001-11-23 16:35:22 +00:00
Doug MacEachern
2090fa8748 adjust to apr_uri_ rename
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90361 13f79535-47bb-0310-9956-ffa450edef68
2001-08-19 16:01:05 +00:00
Jeff Trawick
c216c2184a fix some homophonic issues in comments, as well as some
mispelings found near "its" or "it's"

(helping our 4th grader with homework, couldn't help but
grep)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90173 13f79535-47bb-0310-9956-ffa450edef68
2001-08-15 21:11:59 +00:00
Ryan Bloom
6e932b2870 Fix the new method code. We need to cast 1 to an apr_int64_t or it will
be treated as a 32-bit integer, and it will wrap after being shifted
32 times.
Submitted by:	Cody Sherr <csherr@covalent.net> and
		Ryan Morgan <rmorgan@covalent.net>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90090 13f79535-47bb-0310-9956-ffa450edef68
2001-08-11 04:04:13 +00:00
Roy T. Fielding
43b9634ceb Moved util_uri to apr-util/uri/apr_uri, which means adding the apr_
prefix to all of the uri functions (yuck), changing some includes,
and using APR error codes instead of HTTP-specific error codes.

Other notes to test this patch:
- You need to delete the util_uri.h file - exports picks up on this.
- I'd like to remove the apr_uri.h from httpd.h, but that might
  increase the complexity of this patch even further.  Once this patch
  is accepted (in some form), then I can focus on removing apr_uri.h
  from httpd.h entirely.  I need baby steps (heh) right now.
- I imagine that this might break a bunch of stuff in Win32 or other OS
  builds with foreign dependency files.  Any help here is appreciated.

This is a start...  -- justin

Submitted by:	Justin Erenkrantz
Reviewed by:	Roy Fielding


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89198 13f79535-47bb-0310-9956-ffa450edef68
2001-05-22 01:31:12 +00:00
Ben Laurie
6dbc2131e3 Fix warnings.
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89173 13f79535-47bb-0310-9956-ffa450edef68
2001-05-20 11:58:03 +00:00
Ryan Bloom
d7ba749612 We don't really treat this field as a const, and currently we are getting
warnings because on line 536, we are trying to assign a non-const to a
const.  This started happening after a fix for Windows.  This change should
solve the problem on all systems.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88860 13f79535-47bb-0310-9956-ffa450edef68
2001-04-14 23:00:28 +00:00