Bradley Nicholes
ccff75199f
Change <RequireAll><RequireOne> to <SatisfyAll><SatisfyOne>. The keyword 'Satisfy' seems to fit a little better since the blocks can contain both 'Require' and 'Reject' directives
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/authz-dev@367678 13f79535-47bb-0310-9956-ffa450edef68
2006-01-10 16:35:10 +00:00
Bradley Nicholes
2b438a059c
Fix a few minor compiler errors in the merge of mod_authn_alias into mod_authn_core
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/authz-dev@366604 13f79535-47bb-0310-9956-ffa450edef68
2006-01-07 00:03:20 +00:00
Bradley Nicholes
de0a8728c9
Update the configuration file templates to use the new authorization syntax
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/authz-dev@366602 13f79535-47bb-0310-9956-ffa450edef68
2006-01-07 00:01:49 +00:00
Bradley Nicholes
fa3163af4d
Merge mod_authn_alias into mod_authn_core
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/authz-dev@366526 13f79535-47bb-0310-9956-ffa450edef68
2006-01-06 16:45:07 +00:00
Bradley Nicholes
477807ed15
Clean up the #defines for the Satisfy directive that no longer exists
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/authz-dev@366524 13f79535-47bb-0310-9956-ffa450edef68
2006-01-06 16:33:50 +00:00
Bradley Nicholes
43d23b0c12
Remove the references to the Satisfy directive from the documentation since this directive no longer exists
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/authz-dev@366521 13f79535-47bb-0310-9956-ffa450edef68
2006-01-06 16:25:42 +00:00
Bradley Nicholes
5b9562f04b
Remove the references to all of the AuthzXXXAuthoritative directives in the documentation since these directives no longer exist
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/authz-dev@366519 13f79535-47bb-0310-9956-ffa450edef68
2006-01-06 16:15:13 +00:00
Bradley Nicholes
bf7ea61646
Clean up and remove dead code
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/authz-dev@360213 13f79535-47bb-0310-9956-ffa450edef68
2005-12-31 01:12:27 +00:00
Bradley Nicholes
bc1b6dd45d
update the todo list
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/authz-dev@360208 13f79535-47bb-0310-9956-ffa450edef68
2005-12-31 00:33:35 +00:00
Bradley Nicholes
d6676fc30d
Remove the 'satisfy' directive and the ap_satisfy() and ap_requires() APIs since they no longer serve a purpose
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/authz-dev@360207 13f79535-47bb-0310-9956-ffa450edef68
2005-12-31 00:28:46 +00:00
Bradley Nicholes
2e4de43937
Update the module list doc
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/authz-dev@360029 13f79535-47bb-0310-9956-ffa450edef68
2005-12-30 08:25:17 +00:00
Bradley Nicholes
0529a26d24
Update the documentation to show the new provider based authorization
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/authz-dev@360027 13f79535-47bb-0310-9956-ffa450edef68
2005-12-30 08:21:06 +00:00
Bradley Nicholes
aa1358ed3e
Add 'granted' and 'denied' arguments to the authz 'all' provider to try to mimic the previous 'allow from all' and 'deny from all' functionality
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/authz-dev@359936 13f79535-47bb-0310-9956-ffa450edef68
2005-12-30 00:09:38 +00:00
Bradley Nicholes
a2331f33bc
If there aren't any providers configured, then just decline allowing other hook based authorization modules to have a crack at it
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/authz-dev@359935 13f79535-47bb-0310-9956-ffa450edef68
2005-12-30 00:07:29 +00:00
Bradley Nicholes
c4ae507d9d
If there isn't any authentication configured for the location, then do nothing and return OK
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/authz-dev@359930 13f79535-47bb-0310-9956-ffa450edef68
2005-12-30 00:01:37 +00:00
Bradley Nicholes
3dd929ba43
Remove all of the Satisfy functionality from the request handing. All the various auth hooks to be called all of the time without restriction
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/authz-dev@359929 13f79535-47bb-0310-9956-ffa450edef68
2005-12-30 00:00:31 +00:00
Bradley Nicholes
1ede741ac5
After further review, it is determined that mod_authz_default needs to remain a authz hook rather than a provider
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/authz-dev@359928 13f79535-47bb-0310-9956-ffa450edef68
2005-12-29 23:56:19 +00:00
Bradley Nicholes
8adf71d19e
First cut at converting the host based access control directives (allow, deny) into authz providers. Needs testing
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/authz-dev@359885 13f79535-47bb-0310-9956-ffa450edef68
2005-12-29 19:37:08 +00:00
Bradley Nicholes
f8e59ced47
Implement the 'Reject' directive into authz. The 'Reject' directive acts just like a NOT Require.
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/authz-dev@359176 13f79535-47bb-0310-9956-ffa450edef68
2005-12-27 05:29:37 +00:00
Bradley Nicholes
12315b2fce
Remove the calls to ap_some_auth_required() from the request handling to allow the authn and authz hooks to be called without restriction
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/authz-dev@359172 13f79535-47bb-0310-9956-ffa450edef68
2005-12-27 04:44:18 +00:00
Bradley Nicholes
82bac33761
debugged the require_one and require_all linked list set up to make sure that the lists are being created to match the logic that is layed out in the configuration file. Also debugged the authz provider handling to make sure that the 'and/or' logic is being followed as the providers are checked and return the authorization result
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/authz-dev@359160 13f79535-47bb-0310-9956-ffa450edef68
2005-12-27 02:29:34 +00:00
Bradley Nicholes
f0ffb8921b
added the directives <RequireAll>, <RequireOne> and <RequireAlias>
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/authz-dev@358364 13f79535-47bb-0310-9956-ffa450edef68
2005-12-21 20:11:42 +00:00
Bradley Nicholes
af65af1f78
Make the authz provider changes build on NetWare
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/authz-dev@356323 13f79535-47bb-0310-9956-ffa450edef68
2005-12-12 18:52:47 +00:00
Bradley Nicholes
6d98335134
initial conversion of mod_authz_default to the provider based
...
authorization
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/authz-dev@355684 13f79535-47bb-0310-9956-ffa450edef68
2005-12-10 01:29:48 +00:00
Bradley Nicholes
4bcd44617d
Remove the ap_requires API since it no longer fits with the new provider
...
based authorization architecture
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/authz-dev@355681 13f79535-47bb-0310-9956-ffa450edef68
2005-12-10 01:29:03 +00:00
Bradley Nicholes
03a1ef2828
Remove the AuthzXXXAuthoritative directives from all of the authz
...
modules. This functionality will be handled by the Satify directive
when that gets refactored.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/authz-dev@355670 13f79535-47bb-0310-9956-ffa450edef68
2005-12-10 00:55:59 +00:00
Bradley Nicholes
9cc14fdbb6
Initial conversion of mod_authz_dbd to provider based authorization
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/authz-dev@355655 13f79535-47bb-0310-9956-ffa450edef68
2005-12-09 23:53:00 +00:00
Bradley Nicholes
8b53d5d79f
Initial conversion of mod_authnz_ldap to provider based authorization
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/authz-dev@355629 13f79535-47bb-0310-9956-ffa450edef68
2005-12-09 23:03:59 +00:00
Bradley Nicholes
30bd4ac7b8
Replace the wrong get_word function with the right one.
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/authz-dev@355627 13f79535-47bb-0310-9956-ffa450edef68
2005-12-09 23:03:03 +00:00
Bradley Nicholes
8a3a956d8d
initial conversion of mod_authz_dbm to provider based authorization
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/authz-dev@355580 13f79535-47bb-0310-9956-ffa450edef68
2005-12-09 19:42:04 +00:00
Bradley Nicholes
162f350062
clean up a few loose ends
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/authz-dev@355577 13f79535-47bb-0310-9956-ffa450edef68
2005-12-09 19:40:37 +00:00
Bradley Nicholes
584fb10cdb
Initial conversion of mod_authz_groupfile to be provider based
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/authz-dev@354998 13f79535-47bb-0310-9956-ffa450edef68
2005-12-08 05:36:14 +00:00
Bradley Nicholes
909cc96e2f
Finish initial conversion of mod_authz_owner
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/authz-dev@354979 13f79535-47bb-0310-9956-ffa450edef68
2005-12-08 04:50:45 +00:00
Bradley Nicholes
10ae85759d
start conversion of mod_authz_owner
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/authz-dev@354717 13f79535-47bb-0310-9956-ffa450edef68
2005-12-07 05:20:46 +00:00
Bradley Nicholes
98a7c53882
Split the authz type from the arguments when the
...
authz provider is registered and store the type
in ->provider_name and the arguments in ->requirement
Move the check for METHOD_MASK out of the authz
providers and into the provider vector
Change the status code to AUTHZ_DENIED, AUTHZ_GRANTED
and AUTHZ_GENERAL_ERROR
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/authz-dev@354716 13f79535-47bb-0310-9956-ffa450edef68
2005-12-07 05:19:21 +00:00
Bradley Nicholes
6e8e10ce60
switch the internal names from authn to authn_core and authz to authz_core
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/authz-dev@354699 13f79535-47bb-0310-9956-ffa450edef68
2005-12-07 04:12:08 +00:00
Bradley Nicholes
3dcde1bf50
Add some to-do items to the list
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/authz-dev@354498 13f79535-47bb-0310-9956-ffa450edef68
2005-12-06 18:58:23 +00:00
Justin Erenkrantz
6ccf6c9e68
Rename mod_authn -> mod_authn_core & mod_authz -> mod_authz_core per
...
discussions on list.
(This just renames the files - doesn't touch the content.)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/authz-dev@354490 13f79535-47bb-0310-9956-ffa450edef68
2005-12-06 18:24:41 +00:00
Bradley Nicholes
69ffda34aa
Add general authn and authz modules to hold non-authxxx specific directives such as authtype, authname and require. Remove authtype and authname from mod_core.
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/authz-dev@354331 13f79535-47bb-0310-9956-ffa450edef68
2005-12-06 06:07:04 +00:00
Bradley Nicholes
fe3b73d061
Still need AUTHZ_DECLINED for now, The converted mod_authz_user is
...
referencing it
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/authz-dev@354141 13f79535-47bb-0310-9956-ffa450edef68
2005-12-05 19:31:24 +00:00
Justin Erenkrantz
8cbc2dbb69
Take a quick pass through the refactored authz code. No real big changes here.
...
* modules/aaa/mod_authz_host.c: Tweak locations of some comments; reflow
long lines; correct and simplify (I think) ap_some_auth_required logic.
* modules/aaa/mod_auth.h: Remove AUTHZ_DECLINED for now; reflow long lines;
improve comments; remove some no longer useful comments
* modules/aaa/mod_authz_user.c: Reflow long lines and remove unneeded variable.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/authz-dev@351902 13f79535-47bb-0310-9956-ffa450edef68
2005-12-03 07:26:54 +00:00
Bradley Nicholes
4a8d4c42dd
work out a few more bugs and now it works. Still needs some clean up and the rest of the authz modules need to be converted
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/authz-dev@351573 13f79535-47bb-0310-9956-ffa450edef68
2005-12-02 04:15:56 +00:00
Bradley Nicholes
4e7c9f4aa3
Reimplement ap_some_auth_required as an optional function since the data has moved to mod_authz_host yet it is still needed by the request handler
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/authz-dev@351547 13f79535-47bb-0310-9956-ffa450edef68
2005-12-02 01:19:07 +00:00
Bradley Nicholes
e5d1c04df7
convert mod_authz_user to register its require providers
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/authz-dev@350149 13f79535-47bb-0310-9956-ffa450edef68
2005-12-01 04:14:50 +00:00
Bradley Nicholes
16011b5c97
first cut at moving the require directive out of mod_core and implementing it as a provider vector.
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/authz-dev@349875 13f79535-47bb-0310-9956-ffa450edef68
2005-11-30 04:22:48 +00:00
Bradley Nicholes
c7f9ec697e
Location for authz refactoring development
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/authz-dev@349837 13f79535-47bb-0310-9956-ffa450edef68
2005-11-29 23:41:08 +00:00
Colm MacCarthaigh
573c18f599
Remove the problematic block which is causing problems with the latest versions
...
of MSVS. Sacrifice some borland options which don't really work anyway, and for
Borland to work, we'e really going to need a Makefile.bor.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@349833 13f79535-47bb-0310-9956-ffa450edef68
2005-11-29 23:34:28 +00:00
André Malo
be41776f78
update transformation
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@349790 13f79535-47bb-0310-9956-ffa450edef68
2005-11-29 18:54:35 +00:00
André Malo
acce61de0e
upgrading.html.fr no longer exists, but the the entry commented for reference
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@349788 13f79535-47bb-0310-9956-ffa450edef68
2005-11-29 18:46:23 +00:00
Colm MacCarthaigh
314e894126
Adding mod_authn_dbd to the Windows build environments.
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@349777 13f79535-47bb-0310-9956-ffa450edef68
2005-11-29 18:12:33 +00:00