Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Authplugins and AD Improvements #141

Merged
merged 47 commits into from Feb 3, 2013
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
eb274bf
added plugin type 'auth'
janschumann Jan 2, 2012
4ae475a
Added prototype for Auth-Plugins
janschumann Jan 3, 2012
b424512
Load auth types from plugins in settings_authtype class
janschumann Jan 3, 2012
3cbcc65
Added Auth-Plugin-Prototype to autoload
janschumann Jan 3, 2012
9c29eea
Setup auth system from plugins
janschumann Jan 3, 2012
396b87b
Bugfix: auth types are now correcty added
janschumann Jan 3, 2012
f4476bd
Refactored auth system: All auth methods are now introduced as plugins.
janschumann Feb 20, 2012
7b0a749
Better support for multi domain AD setups
splitbrain Aug 22, 2012
e12ea84
use UTF-8 aware lower casing
splitbrain Aug 22, 2012
33c5220
some code cleanup/PHP5ization
splitbrain Aug 22, 2012
70d71ed
fixed domain handling in user names
splitbrain Aug 22, 2012
86bd5c0
add user's domain to the list of groups
splitbrain Aug 22, 2012
bfc6727
Merge branch 'master' into multiad
splitbrain Aug 23, 2012
496e18c
make AD utilitiy functions public
splitbrain Aug 23, 2012
006b89d
lowercase groups
splitbrain Aug 23, 2012
8e41425
make use of adLDAP 4.0.4 in AD backend
Sep 21, 2012
fc129b7
Merge branch 'adldap4' into future
splitbrain Sep 26, 2012
2ca4ac4
Merge branch 'multiad' into future
splitbrain Sep 26, 2012
93a7873
Merge remote-tracking branch 'janschumann/master' into future
splitbrain Oct 6, 2012
4bc5fe9
Merge branch 'master' into future
splitbrain Oct 6, 2012
d48e3de
fixed auth related tests
splitbrain Oct 6, 2012
3094e81
changed default auth to authplain
splitbrain Oct 6, 2012
94c0297
completed plugin.info.txt files
splitbrain Oct 6, 2012
7840324
enabled authplain plugin for testsuite
splitbrain Oct 6, 2012
ecd445c
PHP5ized the auth plugin base
splitbrain Oct 7, 2012
383dc98
Merge branch 'master' into future
splitbrain Nov 4, 2012
4d390d4
don't merge any global confs into auth plugin configs
splitbrain Nov 9, 2012
454d868
make all sub auth classes call the parent constructor
splitbrain Nov 9, 2012
5a65cc7
some comment cleanup in authad
splitbrain Nov 9, 2012
76ce116
moved adLDAP to authad plugin and fixed includes
splitbrain Nov 9, 2012
46b991a
merge old auth style configs with plugin config
splitbrain Nov 9, 2012
5d8f568
adjusted gitignore for auth plugins
splitbrain Nov 9, 2012
32fd494
authad fixes
splitbrain Nov 9, 2012
70e4a08
fixes for authldap
splitbrain Nov 9, 2012
2657e46
authmysql fixes
splitbrain Nov 9, 2012
4476793
authpgsql fixes
splitbrain Nov 9, 2012
311f460
fixed authplain
splitbrain Nov 9, 2012
c189f40
another gitignore path
splitbrain Nov 9, 2012
23e8f02
added 'text' to config plugin for multi line text configs
splitbrain Nov 10, 2012
7e29378
partial revert of 23e8f02b8aa3a74fed70f1a496bdb5423908133a
splitbrain Nov 10, 2012
3295f40
fixed saving in config plugin
splitbrain Nov 10, 2012
33e75ca
Merge branch 'confmanager' into future
splitbrain Jan 25, 2013
b303add
Merge branch 'confmanager' into future
splitbrain Jan 25, 2013
52c3bef
added config metadata to authad plugin
splitbrain Feb 2, 2013
10bf814
dded config metadata for authldap plugin
splitbrain Feb 2, 2013
9a39161
added config metadata for authmysql plugin
splitbrain Feb 2, 2013
6cf2bbf
added config metadata for authpgsql plugin
splitbrain Feb 2, 2013
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions .gitignore
Expand Up @@ -31,6 +31,11 @@
!/lib/tpl/dokuwiki
!/lib/tpl/index.php
/lib/plugins/*
!/lib/plugins/authad
!/lib/plugins/authldap
!/lib/plugins/authmysql
!/lib/plugins/authpgsql
!/lib/plugins/authplain
!/lib/plugins/acl
!/lib/plugins/config
!/lib/plugins/info
Expand Down
1 change: 1 addition & 0 deletions _test/bootstrap.php
Expand Up @@ -27,6 +27,7 @@

// default plugins
$default_plugins = array(
'authplain',
'acl',
'config',
'info',
Expand Down
2 changes: 1 addition & 1 deletion _test/tests/inc/auth_aclcheck.test.php
Expand Up @@ -11,7 +11,7 @@ function setup() {
global $auth;
$this->oldConf = $conf;
$this->oldAuthAcl = $AUTH_ACL;
$auth = new auth_basic();
$auth = new DokuWiki_Auth_Plugin();
}

function teardown() {
Expand Down
4 changes: 2 additions & 2 deletions _test/tests/inc/auth_admincheck.test.php
@@ -1,6 +1,6 @@
<?php

class auth_admin_test_AuthInSensitive extends auth_basic {
class auth_admin_test_AuthInSensitive extends DokuWiki_Auth_Plugin {
function isCaseSensitive(){
return false;
}
Expand All @@ -17,7 +17,7 @@ function setup() {

function setSensitive() {
global $auth;
$auth = new auth_basic();
$auth = new DokuWiki_Auth_Plugin();
}

function setInSensitive() {
Expand Down
2 changes: 1 addition & 1 deletion _test/tests/inc/remote.test.php
@@ -1,6 +1,6 @@
<?php

class MockAuth extends auth_basic {
class MockAuth extends DokuWiki_Auth_Plugin {
function isCaseSensitive() { return true; }
}

Expand Down
2 changes: 1 addition & 1 deletion conf/dokuwiki.php
Expand Up @@ -54,7 +54,7 @@
/* Authentication Settings */
$conf['useacl'] = 0; //Use Access Control Lists to restrict access?
$conf['autopasswd'] = 1; //autogenerate passwords and email them to user
$conf['authtype'] = 'plain'; //which authentication backend should be used
$conf['authtype'] = 'authplain'; //which authentication backend should be used
$conf['passcrypt'] = 'smd5'; //Used crypt method (smd5,md5,sha1,ssha,crypt,mysql,my411)
$conf['defaultgroup']= 'user'; //Default groups new Users are added to
$conf['superuser'] = '!!not set!!'; //The admin can be user or @group or comma separated list user1,@group1,user2
Expand Down