diff --git a/README.md b/README.md index 5d2510f..704522d 100644 --- a/README.md +++ b/README.md @@ -146,7 +146,7 @@ Add the following to your `config.php`: 'user_backends' => array( array( - 'class' => '\OCA\User_External\BasicAuth', + 'class' => 'OC_User_BasicAuth', 'arguments' => array('https://example.com/basic_auth'), ), ), diff --git a/lib/basicauth.php b/lib/basicauth.php index d8f7acc..2427ea1 100644 --- a/lib/basicauth.php +++ b/lib/basicauth.php @@ -32,9 +32,9 @@ class OC_User_BasicAuth extends \OCA\user_external\Base { ); $headers = get_headers($this->authUrl); - if($headers === false) { + if(!$headers) { OC::$server->getLogger()->error( - 'ERROR: Not possible to connect to BasicAuth Url: "'.$this->authUrl.'"', + 'ERROR: Not possible to connect to BasicAuth Url: '.$this->authUrl, ['app' => 'user_external'] ); return false; diff --git a/tests/basic_auth.php b/tests/basic_auth.php new file mode 100644 index 0000000..d7c77cd --- /dev/null +++ b/tests/basic_auth.php @@ -0,0 +1,35 @@ + + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + */ + +class Test_User_BasicAuth extends \Test\TestCase { + /** + * @var OC_User_BasicAuth $instance + */ + private $instance; + + private function getConfig() { + return include(__DIR__.'/config.php'); + } + + function skip() { + $config=$this->getConfig(); + $this->skipUnless($config['basic_auth']['run']); + } + + protected function setUp() { + parent::setUp(); + $config=$this->getConfig(); + $this->instance=new OC_User_BasicAuth($config['basic_auth']['url']); + } + + function testLogin() { + $config=$this->getConfig(); + $this->assertEquals($config['basic_auth']['user'],$this->instance->checkPassword($config['basic_auth']['user'],$config['basic_auth']['password'])); + $this->assertFalse($this->instance->checkPassword($config['basic_auth']['user'],$config['basic_auth']['password'].'foo')); + } +} diff --git a/tests/config.php b/tests/config.php index a5c7ce8..b29c6c7 100644 --- a/tests/config.php +++ b/tests/config.php @@ -26,4 +26,10 @@ return array( 'user'=>'test',//valid username/password combination 'password'=>'test', ), + 'basic_auth'=>array( + 'run'=>false, + 'url'=>'localhost/basic_auth', + 'user'=>'test',//valid username/password combination + 'password'=>'test', + ), );