com web/wiki: Some juggling to get our custom auth to work with latest dokuwiki: dokuwiki/conf/local.php dokuwiki/inc/auth/phpcvs.class.php
dokuwiki/lib/plugins/authphpcvs/auth.php
| From: | Hannes Magnusson | Date: | Wed, 27 Nov 2013 23:28:58 +0000 |
| Subject: | com web/wiki: Some juggling to get our custom auth to work with latest dokuwiki: dokuwiki/conf/local.php dokuwiki/inc/auth/phpcvs.class.php dokuwiki/lib/plugins/authphpcvs/auth.php |
||
| Groups: | php.webmaster | ||
| Request: | Send a blank email to php-webmaster+get-17257@lists.php.net to get a copy of this message | ||
Commit: bdcfd0df18bd8667fd6fcce96ced02e28e216050
Author: Hannes Magnusson <bjori@mongodb.com> Wed, 27 Nov 2013 15:28:58 -0800
Parents: 064c66fb234ac2f5d3b423df1311e41924e5454b
Branches: master
Link: http://git.php.net/?p=web/wiki.git;a=commitdiff;h=bdcfd0df18bd8667fd6fcce96ced02e28e216050
Log:
Some juggling to get our custom auth to work with latest dokuwiki
Changed paths:
M dokuwiki/conf/local.php
D dokuwiki/inc/auth/phpcvs.class.php
A dokuwiki/lib/plugins/authphpcvs/auth.php
diff --git a/dokuwiki/conf/local.php b/dokuwiki/conf/local.php index 7409702..63412d5 100644 --- a/dokuwiki/conf/local.php +++ b/dokuwiki/conf/local.php @@ -10,7 +10,7 @@ $conf['title'] = 'PHP Wiki'; $conf['template'] = 'phpwiki'; $conf['useacl'] = 1; -$conf['authtype'] = 'phpcvs'; +$conf['authtype'] = 'authphpcvs'; $conf['superuser'] = '@admin'; $conf['manager'] = '@phpcvs'; $conf['registernotify'] = 'webmaster@php.net'; diff --git a/dokuwiki/inc/auth/phpcvs.class.php b/dokuwiki/inc/auth/phpcvs.class.php deleted file mode 100644 index 0c0371b..0000000 --- a/dokuwiki/inc/auth/phpcvs.class.php +++ /dev/null @@ -1,168 +0,0 @@ -<?php -/** - * master.php.net Login backend with dokuwiki Plaintext authentication fallback - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * @author Lukas Smith <smith@pooteeweet.org> - */ - -require_once(dirname(__FILE__).'/plain.class.php'); - -class auth_phpcvs extends auth_plain { - /** - * Constructor - * - * Carry out sanity checks to ensure the object is - * able to operate. Set capabilities. - * - * @author Christopher Smith <chris@jalakai.co.uk> - */ - function auth_phpcvs() { - parent::auth_plain(); - global $conf; - $this->cnf = $conf['auth']['phpcvs']; - $this->cando['external'] = true; - } - - function trustExternal($user,$pass,$sticky=false){ - $silent = false; - if ($user === '' && isset($_COOKIE['MAGIC_COOKIE'])) { - list ($user, $pass) = explode(':', base64_decode($_COOKIE['MAGIC_COOKIE']), 2); - $sticky = false; - $silent = true; - } - return auth_login($user,$pass,$sticky,$silent); - } - - /** - * Set a user read via master.php.net - * - * Checks if the given user exists and the given - * plaintext password is correct - * - * @return bool true or int error code - */ - function _setCVSUser($user){ - $this->_loadUserData(); - $this->users[$user]['pass'] = null; - $this->users[$user]['name'] = $user; - $this->users[$user]['mail'] = $user.'@php.net'; - $grps = array('phpcvs'); - if (in_array($user, $this->cnf['admins'])) { - $grps[] = 'admin'; - } - $this->users[$user]['grps'] = $grps; - } - - /** - * Check user+password against master.php.net [required auth function] - * - * Checks if the given user exists and the given - * plaintext password is correct - * - * @return bool true or int error code - */ - function _checkCVSPass($user,$pass = ''){ - $post = http_build_query( - array( - "token" => getenv("dokuwikitoken"), - "username" => $user, - "password" => $pass, - ), '', '&' - ); - - $opts = array( - "method" => "POST", - "header" => "Content-type: application/x-www-form-urlencoded", - "content" => $post, - ); - - $ctx = stream_context_create(array("http" => $opts)); - - $s = file_get_contents("https://master.php.net/fetch/cvsauth.php", false, $ctx); - - $a = unserialize($s); - /* - define("E_UNKNOWN", 0); - define("E_USERNAME", 1); - define("E_PASSWORD", 2); - */ - if (!is_array($a)) { - return 0; - } - if (isset($a["errno"])) { - return (int)$a["errno"]; - } - - $this->_setCVSUser($user); - - return true; - } - - /** - * Check user+password [required auth function] - * - * Checks if the given user exists and the given - * plaintext password is correct - * - * @return bool - */ - function checkPass($user,$pass){ - $cvs_reply = $this->_checkCVSPass($user,$pass); - - if ($cvs_reply === true) { - return true; - // username did not match an existing username - } elseif($cvs_reply < 2) { - return parent::checkPass($user,$pass); - } - - return false; - } - - /** - * Return user info - * - * Returns info about the given user needs to contain - * at least these fields: - * - * name string full name of the user - * mail string email addres of the user - * grps array list of groups the user is in - * - * @author Andreas Gohr <andi@splitbrain.org> - */ - function getUserData($user){ - $cvs_reply = $this->_checkCVSPass($user); - if ($cvs_reply === 2) { - $this->_setCVSUser($user); - } - - if($this->users === null) $this->_loadUserData(); - return isset($this->users[$user]) ? $this->users[$user] : false; - } - - /** - * Remove one or more users from the list of registered users - * - * @author Christopher Smith <chris@jalakai.co.uk> - * @param array $users array of users to be deleted - * @return int the number of users deleted - */ - function deleteUsers($users) { - $deleted = array(); - foreach ($users as $key => $user) { - $cvs_reply = $this->_checkCVSPass($user); - // user exists because we got a password mismatch error - if($cvs_reply === 2) { - unset($users[$key]); - } - } - - $users = array_values($users); - - return parent::deleteUsers($users); - } -} - -//Setup VIM: ex: et ts=2 enc=utf-8 : diff --git a/dokuwiki/lib/plugins/authphpcvs/auth.php b/dokuwiki/lib/plugins/authphpcvs/auth.php new file mode 100755 index 0000000..c9317af --- /dev/null +++ b/dokuwiki/lib/plugins/authphpcvs/auth.php @@ -0,0 +1,170 @@ +<?php +/** + * DokuWiki Plugin phpcvs (Auth Component) + * + * + * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) + * @author Lukas Smith <smith@pooteeweet.org> + */ + +// must be run within Dokuwiki +if(!defined('DOKU_INC')) die(); + +class auth_plugin_phpcvs extends DokuWiki_Auth_Plugin { + + + /** + * Constructor. + */ + public function __construct() { + parent::__construct(); // for compatibility + + global $conf; + $this->cnf = $conf['auth']['phpcvs']; + $this->cando['external'] = true; + $this->success = true; + } + + + function trustExternal($user,$pass,$sticky=false){ + $silent = false; + if ($user === '' && isset($_COOKIE['MAGIC_COOKIE'])) { + list ($user, $pass) = explode(':', base64_decode($_COOKIE['MAGIC_COOKIE']), 2); + $sticky = false; + $silent = true; + } + return auth_login($user,$pass,$sticky,$silent); + } + + /** + * Set a user read via master.php.net + * + * Checks if the given user exists and the given + * plaintext password is correct + * + * @return bool true or int error code + */ + function _setCVSUser($user){ + $this->_loadUserData(); + $this->users[$user]['pass'] = null; + $this->users[$user]['name'] = $user; + $this->users[$user]['mail'] = $user.'@php.net'; + $grps = array('phpcvs'); + if (in_array($user, $this->cnf['admins'])) { + $grps[] = 'admin'; + } + $this->users[$user]['grps'] = $grps; + } + + /** + * Check user+password against master.php.net [required auth function] + * + * Checks if the given user exists and the given + * plaintext password is correct + * + * @return bool true or int error code + */ + function _checkCVSPass($user,$pass = ''){ + $post = http_build_query( + array( + "token" => getenv("dokuwikitoken"), + "username" => $user, + "password" => $pass, + ), '', '&' + ); + + $opts = array( + "method" => "POST", + "header" => "Content-type: application/x-www-form-urlencoded", + "content" => $post, + ); + + $ctx = stream_context_create(array("http" => $opts)); + + $s = file_get_contents("https://master.php.net/fetch/cvsauth.php", false, $ctx); + + $a = unserialize($s); + /* + define("E_UNKNOWN", 0); + define("E_USERNAME", 1); + define("E_PASSWORD", 2); + */ + if (!is_array($a)) { + return 0; + } + if (isset($a["errno"])) { + return (int)$a["errno"]; + } + + $this->_setCVSUser($user); + + return true; + } + + /** + * Check user+password [required auth function] + * + * Checks if the given user exists and the given + * plaintext password is correct + * + * @return bool + */ + function checkPass($user,$pass){ + $cvs_reply = $this->_checkCVSPass($user,$pass); + + if ($cvs_reply === true) { + return true; + // username did not match an existing username + } elseif($cvs_reply < 2) { + return parent::checkPass($user,$pass); + } + + return false; + } + + /** + * Return user info + * + * Returns info about the given user needs to contain + * at least these fields: + * + * name string full name of the user + * mail string email addres of the user + * grps array list of groups the user is in + * + * @author Andreas Gohr <andi@splitbrain.org> + */ + function getUserData($user){ + $cvs_reply = $this->_checkCVSPass($user); + if ($cvs_reply === 2) { + $this->_setCVSUser($user); + } + + if($this->users === null) $this->_loadUserData(); + return isset($this->users[$user]) ? $this->users[$user] : false; + } + + /** + * Remove one or more users from the list of registered users + * + * @author Christopher Smith <chris@jalakai.co.uk> + * @param array $users array of users to be deleted + * @return int the number of users deleted + */ + function deleteUsers($users) { + $deleted = array(); + foreach ($users as $key => $user) { + $cvs_reply = $this->_checkCVSPass($user); + // user exists because we got a password mismatch error + if($cvs_reply === 2) { + unset($users[$key]); + } + } + + $users = array_values($users); + + return parent::deleteUsers($users); + } +} + +// vim:ts=4:sw=4:et:
diff --git a/dokuwiki/conf/local.php b/dokuwiki/conf/local.php index 7409702..63412d5 100644 --- a/dokuwiki/conf/local.php +++ b/dokuwiki/conf/local.php @@ -10,7 +10,7 @@ $conf['title'] = 'PHP Wiki'; $conf['template'] = 'phpwiki'; $conf['useacl'] = 1; -$conf['authtype'] = 'phpcvs'; +$conf['authtype'] = 'authphpcvs'; $conf['superuser'] = '@admin'; $conf['manager'] = '@phpcvs'; $conf['registernotify'] = 'webmaster@php.net'; diff --git a/dokuwiki/inc/auth/phpcvs.class.php b/dokuwiki/inc/auth/phpcvs.class.php deleted file mode 100644 index 0c0371b..0000000 --- a/dokuwiki/inc/auth/phpcvs.class.php +++ /dev/null @@ -1,168 +0,0 @@ -<?php -/** - * master.php.net Login backend with dokuwiki Plaintext authentication fallback - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * @author Lukas Smith <smith@pooteeweet.org> - */ - -require_once(dirname(__FILE__).'/plain.class.php'); - -class auth_phpcvs extends auth_plain { - /** - * Constructor - * - * Carry out sanity checks to ensure the object is - * able to operate. Set capabilities. - * - * @author Christopher Smith <chris@jalakai.co.uk> - */ - function auth_phpcvs() { - parent::auth_plain(); - global $conf; - $this->cnf = $conf['auth']['phpcvs']; - $this->cando['external'] = true; - } - - function trustExternal($user,$pass,$sticky=false){ - $silent = false; - if ($user === '' && isset($_COOKIE['MAGIC_COOKIE'])) { - list ($user, $pass) = explode(':', base64_decode($_COOKIE['MAGIC_COOKIE']), 2); - $sticky = false; - $silent = true; - } - return auth_login($user,$pass,$sticky,$silent); - } - - /** - * Set a user read via master.php.net - * - * Checks if the given user exists and the given - * plaintext password is correct - * - * @return bool true or int error code - */ - function _setCVSUser($user){ - $this->_loadUserData(); - $this->users[$user]['pass'] = null; - $this->users[$user]['name'] = $user; - $this->users[$user]['mail'] = $user.'@php.net'; - $grps = array('phpcvs'); - if (in_array($user, $this->cnf['admins'])) { - $grps[] = 'admin'; - } - $this->users[$user]['grps'] = $grps; - } - - /** - * Check user+password against master.php.net [required auth function] - * - * Checks if the given user exists and the given - * plaintext password is correct - * - * @return bool true or int error code - */ - function _checkCVSPass($user,$pass = ''){ - $post = http_build_query( - array( - "token" => getenv("dokuwikitoken"), - "username" => $user, - "password" => $pass, - ), '', '&' - ); - - $opts = array( - "method" => "POST", - "header" => "Content-type: application/x-www-form-urlencoded", - "content" => $post, - ); - - $ctx = stream_context_create(array("http" => $opts)); - - $s = file_get_contents("https://master.php.net/fetch/cvsauth.php", false, $ctx); - - $a = unserialize($s); - /* - define("E_UNKNOWN", 0); - define("E_USERNAME", 1); - define("E_PASSWORD", 2); - */ - if (!is_array($a)) { - return 0; - } - if (isset($a["errno"])) { - return (int)$a["errno"]; - } - - $this->_setCVSUser($user); - - return true; - } - - /** - * Check user+password [required auth function] - * - * Checks if the given user exists and the given - * plaintext password is correct - * - * @return bool - */ - function checkPass($user,$pass){ - $cvs_reply = $this->_checkCVSPass($user,$pass); - - if ($cvs_reply === true) { - return true; - // username did not match an existing username - } elseif($cvs_reply < 2) { - return parent::checkPass($user,$pass); - } - - return false; - } - - /** - * Return user info - * - * Returns info about the given user needs to contain - * at least these fields: - * - * name string full name of the user - * mail string email addres of the user - * grps array list of groups the user is in - * - * @author Andreas Gohr <andi@splitbrain.org> - */ - function getUserData($user){ - $cvs_reply = $this->_checkCVSPass($user); - if ($cvs_reply === 2) { - $this->_setCVSUser($user); - } - - if($this->users === null) $this->_loadUserData(); - return isset($this->users[$user]) ? $this->users[$user] : false; - } - - /** - * Remove one or more users from the list of registered users - * - * @author Christopher Smith <chris@jalakai.co.uk> - * @param array $users array of users to be deleted - * @return int the number of users deleted - */ - function deleteUsers($users) { - $deleted = array(); - foreach ($users as $key => $user) { - $cvs_reply = $this->_checkCVSPass($user); - // user exists because we got a password mismatch error - if($cvs_reply === 2) { - unset($users[$key]); - } - } - - $users = array_values($users); - - return parent::deleteUsers($users); - } -} - -//Setup VIM: ex: et ts=2 enc=utf-8 : diff --git a/dokuwiki/lib/plugins/authphpcvs/auth.php b/dokuwiki/lib/plugins/authphpcvs/auth.php new file mode 100755 index 0000000..c9317af --- /dev/null +++ b/dokuwiki/lib/plugins/authphpcvs/auth.php @@ -0,0 +1,170 @@ +<?php +/** + * DokuWiki Plugin phpcvs (Auth Component) + * + * + * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) + * @author Lukas Smith <smith@pooteeweet.org> + */ + +// must be run within Dokuwiki +if(!defined('DOKU_INC')) die(); + +class auth_plugin_phpcvs extends DokuWiki_Auth_Plugin { + + + /** + * Constructor. + */ + public function __construct() { + parent::__construct(); // for compatibility + + global $conf; + $this->cnf = $conf['auth']['phpcvs']; + $this->cando['external'] = true; + $this->success = true; + } + + + function trustExternal($user,$pass,$sticky=false){ + $silent = false; + if ($user === '' && isset($_COOKIE['MAGIC_COOKIE'])) { + list ($user, $pass) = explode(':', base64_decode($_COOKIE['MAGIC_COOKIE']), 2); + $sticky = false; + $silent = true; + } + return auth_login($user,$pass,$sticky,$silent); + } + + /** + * Set a user read via master.php.net + * + * Checks if the given user exists and the given + * plaintext password is correct + * + * @return bool true or int error code + */ + function _setCVSUser($user){ + $this->_loadUserData(); + $this->users[$user]['pass'] = null; + $this->users[$user]['name'] = $user; + $this->users[$user]['mail'] = $user.'@php.net'; + $grps = array('phpcvs'); + if (in_array($user, $this->cnf['admins'])) { + $grps[] = 'admin'; + } + $this->users[$user]['grps'] = $grps; + } + + /** + * Check user+password against master.php.net [required auth function] + * + * Checks if the given user exists and the given + * plaintext password is correct + * + * @return bool true or int error code + */ + function _checkCVSPass($user,$pass = ''){ + $post = http_build_query( + array( + "token" => getenv("dokuwikitoken"), + "username" => $user, + "password" => $pass, + ), '', '&' + ); + + $opts = array( + "method" => "POST", + "header" => "Content-type: application/x-www-form-urlencoded", + "content" => $post, + ); + + $ctx = stream_context_create(array("http" => $opts)); + + $s = file_get_contents("https://master.php.net/fetch/cvsauth.php", false, $ctx); + + $a = unserialize($s); + /* + define("E_UNKNOWN", 0); + define("E_USERNAME", 1); + define("E_PASSWORD", 2); + */ + if (!is_array($a)) { + return 0; + } + if (isset($a["errno"])) { + return (int)$a["errno"]; + } + + $this->_setCVSUser($user); + + return true; + } + + /** + * Check user+password [required auth function] + * + * Checks if the given user exists and the given + * plaintext password is correct + * + * @return bool + */ + function checkPass($user,$pass){ + $cvs_reply = $this->_checkCVSPass($user,$pass); + + if ($cvs_reply === true) { + return true; + // username did not match an existing username + } elseif($cvs_reply < 2) { + return parent::checkPass($user,$pass); + } + + return false; + } + + /** + * Return user info + * + * Returns info about the given user needs to contain + * at least these fields: + * + * name string full name of the user + * mail string email addres of the user + * grps array list of groups the user is in + * + * @author Andreas Gohr <andi@splitbrain.org> + */ + function getUserData($user){ + $cvs_reply = $this->_checkCVSPass($user); + if ($cvs_reply === 2) { + $this->_setCVSUser($user); + } + + if($this->users === null) $this->_loadUserData(); + return isset($this->users[$user]) ? $this->users[$user] : false; + } + + /** + * Remove one or more users from the list of registered users + * + * @author Christopher Smith <chris@jalakai.co.uk> + * @param array $users array of users to be deleted + * @return int the number of users deleted + */ + function deleteUsers($users) { + $deleted = array(); + foreach ($users as $key => $user) { + $cvs_reply = $this->_checkCVSPass($user); + // user exists because we got a password mismatch error + if($cvs_reply === 2) { + unset($users[$key]); + } + } + + $users = array_values($users); + + return parent::deleteUsers($users); + } +} + +// vim:ts=4:sw=4:et: