1
0
mirror of https://github.com/apache/httpd.git synced 2026-01-06 09:01:14 +03:00
Commit Graph

300 Commits

Author SHA1 Message Date
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
Joe Orton
c4aa600023 Use -export-dynamic only when linking an httpd which includes mod_so,
not when linking modules or support programs.

* modules/aaa/config.m4, modules/arch/win32/config.m4,
modules/cache/config.m4, modules/echo/config.m4,
modules/filters/config.m4, modules/generators/config5.m4,
modules/metadata/config.m4: Don't add -export-dynamic to LT_LDFLAGS.

* modules/mappers/config9.m4: Add -export-dynamic to HTTPD_LDFLAGS
when mod_so is enabled.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102235 13f79535-47bb-0310-9956-ffa450edef68
2004-01-08 20:47:29 +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
a4ef421fa7 re-add explaining comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101730 13f79535-47bb-0310-9956-ffa450edef68
2003-11-09 20:05:06 +00:00
André Malo
60f4a2189b allow any user id when configured with 'anonymous *'
PR: 11428


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101728 13f79535-47bb-0310-9956-ffa450edef68
2003-11-09 18:21:51 +00:00
André Malo
9583ac39c8 less confusion with identifiers && style
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101727 13f79535-47bb-0310-9956-ffa450edef68
2003-11-09 18:02:26 +00:00
André Malo
ce1d7d03e4 strip trailing spaces of groupnames.
PR:	12863


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@100620 13f79535-47bb-0310-9956-ffa450edef68
2003-07-14 23:23:00 +00:00
Jeff Trawick
805422eb77 get function prototypes for strcasecmp() and strncasecmp()
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@99202 13f79535-47bb-0310-9956-ffa450edef68
2003-04-04 04:02:01 +00:00
William A. Rowe Jr
281948b722 After discussions at length on dev@apr/httpd, it is determined that
the older .dbg format symbols are not worth the interference with
  generating complete .pdb symbolic debugging databases.

  This patch further eliminates pdbtype:sept flags that interfere with
  deciphering local symbols and type information.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98970 13f79535-47bb-0310-9956-ffa450edef68
2003-03-11 00:58:59 +00:00
Jeff Trawick
481c8dd845 use APR_CHECK_APR_DEFINE() where possible
an anomaly noticed before and after this commit:

"--enable-cgi=shared --disable-so" is not recognized as inconsistent


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98946 13f79535-47bb-0310-9956-ffa450edef68
2003-03-08 13:54:17 +00:00
William A. Rowe Jr
25ac108fe2 After consultations on the APR list, it was decided that /map files are
fairly redundant when you retain rich .pdb debugging symbol files.  We
  have rarely used them, and generally .dbg and .pdb files prove much more
  useful for the cases we have.

  While eliminating /map files, we are also shrinking the size of the .dbg
  files by stripping 'private' symbol information.  Really this means less
  rich diagnostics from Dr. Watson on NT or Win9x when they query the .dbg
  symbols in creating a DrWatson log file.  But it's more than compensated
  for on newer OS'es where Dr. Watson will query the .pdb symbols, on all
  Win32 flavors when WinDbg is used with the .pdb symbols, and the fact that
  the distribution of binary symbols will use less bandwidth when less
  information is duplicated from the .pdb format into the .dbg files.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98743 13f79535-47bb-0310-9956-ffa450edef68
2003-02-20 15:56:04 +00:00
William A. Rowe Jr
e8c0a9532f foo.dbgmark turned out to be the same 8.3 name as foo.dbg itself, which
was badness.  Twist this puppy to .dbr, the only name I could invent that
  doesn't look like any database file extension I recall.

  It stands for .dbg rebased.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98712 13f79535-47bb-0310-9956-ffa450edef68
2003-02-18 22:07:21 +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
William A. Rowe Jr
a45632ba37 *) Introduce debugging symbols for Win32 release builds, both .pdb
and .dbg files (older debuggers and Dr. Watson-type utilities
     on WinNT or Win9x don't support the newer .pdb flavor.)
     [Allen Edwards, William Rowe]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98596 13f79535-47bb-0310-9956-ffa450edef68
2003-02-07 21:30:53 +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
William A. Rowe Jr
b67d127829 Catch up with the changes to apr/build/win32ver.awk and name all loadable
httpd modules as .so, internally.  Credit to Mladen Turk for identifing
  the issue.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98380 13f79535-47bb-0310-9956-ffa450edef68
2003-01-20 19:52:30 +00:00
Roy T. Fielding
b62eed7e80 Use ap_strchr instead of strchr and get the constness right.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98304 13f79535-47bb-0310-9956-ffa450edef68
2003-01-17 04:42:43 +00:00
André Malo
4c84c2cd03 add support for "Require file-group"
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98283 13f79535-47bb-0310-9956-ffa450edef68
2003-01-15 22:14:45 +00:00
André Malo
e6f0842d81 add support for "require file-group"
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98282 13f79535-47bb-0310-9956-ffa450edef68
2003-01-15 22:12:36 +00:00
André Malo
ca0c66ee6f as announced and with no objections:
mod_authz_owner: forward port of require file-owner/file-group functionality

The goal of the module is to do all the neccessary file system work to
figure out username and groupname. "Require file-owner" is completely
resolved within the module. "file-group" is only determined there and the
groupname will be extracted from the stat call and stored within the
r->notes. Done that, the module will decline, so that the group database
modules (mod_authz_groupfile, mod_authz_dbm) can verify the groupname with
their lists.
Thus every group module that supports the file-group requirement must be
hooked after mod_authz_owner. They have to recognize "file-group" and read
the groupname from r->notes. (If there's no name stored, the modules should
ignore the file-group requirement). The backstopper module will do its work
in worst case.

not solved yet:
- the module doesn't work as one could expect if the file doesn't exist in
  the first request round (consider MultiViews) (the 1.3 version has the
  same problem). I played around with some subrequest techniques, but got
  no helpful result. Is there any magic to recognize the actual resulting
  filename (if there is)?


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98281 13f79535-47bb-0310-9956-ffa450edef68
2003-01-15 22:08:54 +00:00
Jeff Trawick
0436eb0a93 fix a type mismatch (char * vs. const char *)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98183 13f79535-47bb-0310-9956-ffa450edef68
2003-01-06 16:02:08 +00:00
André Malo
cee3603117 be consistent:
evaluate multiple "require group" directives even for DBM files.
this was always applicable for plain text group files.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98180 13f79535-47bb-0310-9956-ffa450edef68
2003-01-06 08:07:51 +00:00
André Malo
ae27bd3b52 not very spectacular ;-)
break overlong line.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98179 13f79535-47bb-0310-9956-ffa450edef68
2003-01-06 07:12:56 +00:00
André Malo
7d05b7ac57 cleanup.
- remove superfluid #include
- remove no longer neccessary bitmask handling
- be more efficient if there are no groups for the user
- call ap_note_auth_failure instead of ap_note_basic_auth_failure


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98178 13f79535-47bb-0310-9956-ffa450edef68
2003-01-06 06:52:48 +00:00
André Malo
550bc4dcb9 some cleanup.
- The weird bit mask handling is not really neccessary.
- call ap_note_auth_failure instead of ap_note_basic_auth_failure


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98177 13f79535-47bb-0310-9956-ffa450edef68
2003-01-06 06:13:44 +00:00
André Malo
c1ee12bd0d use less specific ap_note_auth_failure API call, since it _is_ less specific.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98176 13f79535-47bb-0310-9956-ffa450edef68
2003-01-06 04:01:17 +00:00
André Malo
fd8557b150 allow group authorization to be stored in either basic or digest dbm user
files. This is done by looking up first "$user:$realm" and if no success
then $user as key.
The patch also restores the possibility of group files only
($user -> group,group... or "$user:$realm" -> group,group...).
That got somehow lost during the auth rewrite.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98175 13f79535-47bb-0310-9956-ffa450edef68
2003-01-06 03:35:48 +00:00
André Malo
7e38c68850 well, it's a backstopper. So stop also misconfigured Digest
authentication requests.

e.g.:
  AuthType Digest
  AuthName foo
  require user nd

with no mod_auth_digest present; or consider a TP digest module
with Authoritative funcionality etc.

It's still a question whether we should throw a 500 instead of 401
in that case...


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98167 13f79535-47bb-0310-9956-ffa450edef68
2003-01-05 09:58:30 +00:00
André Malo
5102cfe62a allow empty user ids to be supplied without responding a 500.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98165 13f79535-47bb-0310-9956-ffa450edef68
2003-01-05 06:36:29 +00:00
André Malo
4d0dc7ab81 oh, cool. the recent commit fixed accidentally a null
pointer bug ;-)
now remove the remaining scrap.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98156 13f79535-47bb-0310-9956-ffa450edef68
2003-01-03 07:27:56 +00:00
André Malo
1852450fd8 some cleanup.
- use already existing apr functionality
- remove unused variable


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98155 13f79535-47bb-0310-9956-ffa450edef68
2003-01-03 02:45:30 +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
André Malo
25093c448c add support for digest authentication to the authn_dbm module. The
key is "$user:$realm" (perl speaking), the value is the MD5-hash,
optionally followed by a colon and other garbage.

Note that currently there's no tool to create such databases.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98144 13f79535-47bb-0310-9956-ffa450edef68
2003-01-01 04:08:26 +00:00
André Malo
219df484cd cut password at the first colon.
This readds the ability to store password and group
information within the same dbm file


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98142 13f79535-47bb-0310-9956-ffa450edef68
2003-01-01 03:23:11 +00:00
Wilfredo Sanchez
1302759b77 mod_authn_anon should be a provider
This drops the Anonymous_Authoritative directive

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


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97805 13f79535-47bb-0310-9956-ffa450edef68
2002-12-08 21:23:02 +00:00
Wilfredo Sanchez
426bf3ea29 the AccessAuthoritative directive should be AuthzDefaultAuthoritative
Submitted by:	Andre Malo <nd@perlig.de>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97804 13f79535-47bb-0310-9956-ffa450edef68
2002-12-08 21:18:29 +00:00
Wilfredo Sanchez
c4eb2f83d4 there is some confusion with "yes" and "no" and "on" and "off"... ;-)
Submitted by: Andre Malo <nd@perlig.de>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97803 13f79535-47bb-0310-9956-ffa450edef68
2002-12-08 21:16:05 +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
Wilfredo Sanchez
2253b5cd9b Use $INCLUDES rather than adding yet another place to edit include dirs.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97669 13f79535-47bb-0310-9956-ffa450edef68
2002-11-28 23:02:44 +00:00
Bradley Nicholes
7d357a59bf Adding the current version string to the link of each NLM
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97251 13f79535-47bb-0310-9956-ffa450edef68
2002-10-16 23:52:35 +00:00
Bradley Nicholes
d24232b7dc Updating the NLM descriptions in the NetWare make files
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97241 13f79535-47bb-0310-9956-ffa450edef68
2002-10-16 16:03:44 +00:00
Roy T. Fielding
c5f6ba7402 kill a warning
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96948 13f79535-47bb-0310-9956-ffa450edef68
2002-09-22 05:18:33 +00:00