mirror of
https://code.mensbeam.com/MensBeam/Arsse.git
synced 2024-12-22 21:22:40 +00:00
Various database fixes
Authentication appears to be broken with a real database
This commit is contained in:
parent
0c410fcf50
commit
007e3747ef
12 changed files with 109 additions and 177 deletions
|
@ -2,11 +2,11 @@
|
|||
declare(strict_types=1);
|
||||
namespace JKingWeb\NewsSync;
|
||||
use PasswordGenerator\Generator as PassGen;
|
||||
|
||||
class Database {
|
||||
use PicoFeed\Reader\Reader;
|
||||
use PicoFeed\PicoFeedException;
|
||||
|
||||
class Database {
|
||||
|
||||
const SCHEMA_VERSION = 1;
|
||||
const FORMAT_TS = "Y-m-d h:i:s";
|
||||
const FORMAT_DATE = "Y-m-d";
|
||||
|
@ -26,7 +26,7 @@ class Database {
|
|||
$this->db = new $driver($data, INSTALL);
|
||||
$ver = $this->db->schemaVersion();
|
||||
if(!INSTALL && $ver < self::SCHEMA_VERSION) {
|
||||
$this->db->update(self::SCHEMA_VERSION);
|
||||
$this->db->schemaUpdate(self::SCHEMA_VERSION);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -50,7 +50,7 @@ class Database {
|
|||
return $this->db->schemaVersion();
|
||||
}
|
||||
|
||||
public function dbUpdate(): bool {
|
||||
public function schemaUpdate(): bool {
|
||||
if($this->db->schemaVersion() < self::SCHEMA_VERSION) return $this->db->update(self::SCHEMA_VERSION);
|
||||
return false;
|
||||
}
|
||||
|
|
|
@ -3,7 +3,7 @@ declare(strict_types=1);
|
|||
namespace JKingWeb\NewsSync\Db;
|
||||
use JKingWeb\DrUUID\UUID as UUID;
|
||||
|
||||
Trait Common {
|
||||
abstract class AbstractDriver implements Driver {
|
||||
protected $transDepth = 0;
|
||||
|
||||
public function schemaVersion(): int {
|
|
@ -2,9 +2,7 @@
|
|||
declare(strict_types=1);
|
||||
namespace JKingWeb\NewsSync\Db;
|
||||
|
||||
class DriverSQLite3 implements Driver {
|
||||
use Common;
|
||||
|
||||
class DriverSQLite3 extends AbstractDriver {
|
||||
protected $db;
|
||||
protected $data;
|
||||
|
||||
|
@ -47,7 +45,7 @@ class DriverSQLite3 implements Driver {
|
|||
return $this->query("PRAGMA user_version")->getSingle();
|
||||
}
|
||||
|
||||
public function update(int $to): bool {
|
||||
public function schemaUpdate(int $to): bool {
|
||||
$ver = $this->schemaVersion();
|
||||
if(!$this->data->conf->dbSQLite3AutoUpd) throw new Update\Exception("manual", ['version' => $ver, 'driver_name' => $this->driverName()]);
|
||||
if($ver >= $to) throw new Update\Exception("tooNew", ['difference' => ($ver - $to), 'current' => $ver, 'target' => $to, 'driver_name' => $this->driverName()]);
|
||||
|
|
|
@ -13,7 +13,7 @@ trait InternalFunctions {
|
|||
function auth(string $user, string $password): bool {
|
||||
if(!$this->data->user->exists($user)) return false;
|
||||
$hash = $this->db->userPasswordGet($user);
|
||||
if(!$hash) return false;
|
||||
if($password==="" && $hash==="") return true;
|
||||
return password_verify($password, $hash);
|
||||
}
|
||||
|
||||
|
@ -33,7 +33,7 @@ trait InternalFunctions {
|
|||
return $this->db->userList($domain);
|
||||
}
|
||||
|
||||
function userPasswordSet(string $user, string $newPassword = null, string $oldPassword = null): bool {
|
||||
function userPasswordSet(string $user, string $newPassword = null, string $oldPassword = null): string {
|
||||
return $this->db->userPasswordSet($user, $newPassword);
|
||||
}
|
||||
|
||||
|
|
|
@ -1,135 +0,0 @@
|
|||
<?php
|
||||
declare(strict_types=1);
|
||||
namespace JKingWeb\NewsSync;
|
||||
|
||||
|
||||
class TestUserExternal extends \PHPUnit\Framework\TestCase {
|
||||
use Test\Tools;
|
||||
|
||||
const USER1 = "john.doe@example.com";
|
||||
const USER2 = "jane.doe@example.com";
|
||||
|
||||
protected $data;
|
||||
|
||||
function setUp() {
|
||||
$drv = Test\User\DriverExternalMock::class;
|
||||
$conf = new Conf();
|
||||
$conf->userDriver = $drv;
|
||||
$conf->userAuthPreferHTTP = true;
|
||||
$this->data = new Test\RuntimeData($conf);
|
||||
$this->data->db = new Test\User\Database($this->data);
|
||||
$this->data->user = new User($this->data);
|
||||
$this->data->user->authorizationEnabled(false);
|
||||
$_SERVER['PHP_AUTH_USER'] = self::USER1;
|
||||
$_SERVER['PHP_AUTH_PW'] = "secret";
|
||||
}
|
||||
|
||||
function testListUsers() {
|
||||
$this->assertCount(0,$this->data->user->list());
|
||||
}
|
||||
|
||||
function testCheckIfAUserDoesNotExist() {
|
||||
$this->assertFalse($this->data->user->exists(self::USER1));
|
||||
}
|
||||
|
||||
function testAddAUser() {
|
||||
$this->data->user->add(self::USER1, "");
|
||||
$this->assertCount(1,$this->data->user->list());
|
||||
}
|
||||
|
||||
function testCheckIfAUserDoesExist() {
|
||||
$this->data->user->add(self::USER1, "");
|
||||
$this->assertTrue($this->data->user->exists(self::USER1));
|
||||
}
|
||||
|
||||
function testAddADuplicateUser() {
|
||||
$this->data->user->add(self::USER1, "");
|
||||
$this->assertException("alreadyExists", "User");
|
||||
$this->data->user->add(self::USER1, "");
|
||||
}
|
||||
|
||||
function testAddMultipleUsers() {
|
||||
$this->data->user->add(self::USER1, "");
|
||||
$this->data->user->add(self::USER2, "");
|
||||
$this->assertCount(2,$this->data->user->list());
|
||||
}
|
||||
|
||||
function testRemoveAUser() {
|
||||
$this->data->user->add(self::USER1, "");
|
||||
$this->assertCount(1,$this->data->user->list());
|
||||
$this->data->user->remove(self::USER1);
|
||||
$this->assertCount(0,$this->data->user->list());
|
||||
}
|
||||
|
||||
function testRemoveAMissingUser() {
|
||||
$this->assertException("doesNotExist", "User");
|
||||
$this->data->user->remove(self::USER1);
|
||||
}
|
||||
|
||||
function testAuthenticateAUser() {
|
||||
$this->data->user->add(self::USER1, "secret");
|
||||
$this->data->user->add(self::USER2, "");
|
||||
$this->assertTrue($this->data->user->auth(self::USER1, "secret"));
|
||||
$this->assertFalse($this->data->user->auth(self::USER1, "superman"));
|
||||
$this->assertTrue($this->data->user->auth(self::USER2, ""));
|
||||
}
|
||||
|
||||
function testChangeAPassword() {
|
||||
$this->data->user->add(self::USER1, "secret");
|
||||
$this->assertEquals("superman", $this->data->user->passwordSet(self::USER1, "superman"));
|
||||
$this->assertTrue($this->data->user->auth(self::USER1, "superman"));
|
||||
$this->assertFalse($this->data->user->auth(self::USER1, "secret"));
|
||||
$this->assertEquals("", $this->data->user->passwordSet(self::USER1, ""));
|
||||
$this->assertTrue($this->data->user->auth(self::USER1, ""));
|
||||
$this->assertEquals($this->data->conf->userTempPasswordLength, strlen($this->data->user->passwordSet(self::USER1)));
|
||||
}
|
||||
|
||||
function testChangeAPasswordForAMissingUser() {
|
||||
$this->assertException("doesNotExist", "User");
|
||||
$this->data->user->passwordSet(self::USER1, "superman");
|
||||
}
|
||||
|
||||
function testGetThePropertiesOfAUser() {
|
||||
$this->data->user->add(self::USER1, "secret");
|
||||
$p = $this->data->user->propertiesGet(self::USER1);
|
||||
$this->assertArrayHasKey('id', $p);
|
||||
$this->assertArrayHasKey('name', $p);
|
||||
$this->assertArrayHasKey('domain', $p);
|
||||
$this->assertArrayHasKey('rights', $p);
|
||||
$this->assertArrayNotHasKey('password', $p);
|
||||
$this->assertEquals(self::USER1, $p['name']);
|
||||
}
|
||||
|
||||
function testSetThePropertiesOfAUser() {
|
||||
$pSet = [
|
||||
'name' => 'John Doe',
|
||||
'id' => 'invalid',
|
||||
'domain' => 'localhost',
|
||||
'rights' => User\Driver::RIGHTS_GLOBAL_ADMIN,
|
||||
'password' => 'superman',
|
||||
];
|
||||
$pGet = [
|
||||
'name' => 'John Doe',
|
||||
'id' => self::USER1,
|
||||
'domain' => 'example.com',
|
||||
'rights' => User\Driver::RIGHTS_NONE,
|
||||
];
|
||||
$this->data->user->add(self::USER1, "secret");
|
||||
$this->data->user->propertiesSet(self::USER1, $pSet);
|
||||
$p = $this->data->user->propertiesGet(self::USER1);
|
||||
$this->assertArraySubset($pGet, $p);
|
||||
$this->assertArrayNotHasKey('password', $p);
|
||||
$this->assertFalse($this->data->user->auth(self::USER1, "superman"));
|
||||
}
|
||||
|
||||
function testGetTheRightsOfAUser() {
|
||||
$this->data->user->add(self::USER1, "");
|
||||
$this->assertEquals(User\Driver::RIGHTS_NONE, $this->data->user->rightsGet(self::USER1));
|
||||
}
|
||||
|
||||
function testSetTheRightsOfAUser() {
|
||||
$this->data->user->add(self::USER1, "");
|
||||
$this->data->user->rightsSet(self::USER1, User\Driver::RIGHTS_GLOBAL_ADMIN);
|
||||
$this->assertEquals(User\Driver::RIGHTS_GLOBAL_ADMIN, $this->data->user->rightsGet(self::USER1));
|
||||
}
|
||||
}
|
26
tests/User/TestUserInternalDriver.php
Normal file
26
tests/User/TestUserInternalDriver.php
Normal file
|
@ -0,0 +1,26 @@
|
|||
<?php
|
||||
declare(strict_types=1);
|
||||
namespace JKingWeb\NewsSync;
|
||||
|
||||
|
||||
class TestUserInternalDriver extends \PHPUnit\Framework\TestCase {
|
||||
use Test\Tools, Test\User\CommonTests;
|
||||
|
||||
const USER1 = "john.doe@example.com";
|
||||
const USER2 = "jane.doe@example.com";
|
||||
|
||||
protected $data;
|
||||
|
||||
function setUp() {
|
||||
$drv = User\DriverInternal::class;
|
||||
$conf = new Conf();
|
||||
$conf->userDriver = $drv;
|
||||
$conf->userAuthPreferHTTP = true;
|
||||
$this->data = new Test\RuntimeData($conf);
|
||||
$this->data->db = new Test\User\Database($this->data);
|
||||
$this->data->user = new User($this->data);
|
||||
$this->data->user->authorizationEnabled(false);
|
||||
$_SERVER['PHP_AUTH_USER'] = self::USER1;
|
||||
$_SERVER['PHP_AUTH_PW'] = "secret";
|
||||
}
|
||||
}
|
26
tests/User/TestUserMockExternal.php
Normal file
26
tests/User/TestUserMockExternal.php
Normal file
|
@ -0,0 +1,26 @@
|
|||
<?php
|
||||
declare(strict_types=1);
|
||||
namespace JKingWeb\NewsSync;
|
||||
|
||||
|
||||
class TestUserMockExternal extends \PHPUnit\Framework\TestCase {
|
||||
use Test\Tools, Test\User\CommonTests;
|
||||
|
||||
const USER1 = "john.doe@example.com";
|
||||
const USER2 = "jane.doe@example.com";
|
||||
|
||||
protected $data;
|
||||
|
||||
function setUp() {
|
||||
$drv = Test\User\DriverExternalMock::class;
|
||||
$conf = new Conf();
|
||||
$conf->userDriver = $drv;
|
||||
$conf->userAuthPreferHTTP = true;
|
||||
$this->data = new Test\RuntimeData($conf);
|
||||
$this->data->db = new Test\User\Database($this->data);
|
||||
$this->data->user = new User($this->data);
|
||||
$this->data->user->authorizationEnabled(false);
|
||||
$_SERVER['PHP_AUTH_USER'] = self::USER1;
|
||||
$_SERVER['PHP_AUTH_PW'] = "secret";
|
||||
}
|
||||
}
|
25
tests/User/TestUserMockInternal.php
Normal file
25
tests/User/TestUserMockInternal.php
Normal file
|
@ -0,0 +1,25 @@
|
|||
<?php
|
||||
declare(strict_types=1);
|
||||
namespace JKingWeb\NewsSync;
|
||||
|
||||
|
||||
class TestUserMockInternal extends \PHPUnit\Framework\TestCase {
|
||||
use Test\Tools, Test\User\CommonTests;
|
||||
|
||||
const USER1 = "john.doe@example.com";
|
||||
const USER2 = "jane.doe@example.com";
|
||||
|
||||
protected $data;
|
||||
|
||||
function setUp() {
|
||||
$drv = Test\User\DriverInternalMock::class;
|
||||
$conf = new Conf();
|
||||
$conf->userDriver = $drv;
|
||||
$conf->userAuthPreferHTTP = true;
|
||||
$this->data = new Test\RuntimeData($conf);
|
||||
$this->data->user = new User($this->data);
|
||||
$this->data->user->authorizationEnabled(false);
|
||||
$_SERVER['PHP_AUTH_USER'] = self::USER1;
|
||||
$_SERVER['PHP_AUTH_PW'] = "secret";
|
||||
}
|
||||
}
|
|
@ -2,7 +2,6 @@
|
|||
declare(strict_types=1);
|
||||
namespace JKingWeb\NewsSync\Test\Db;
|
||||
use JKingWeb\NewsSync\Db\Statement;
|
||||
use JKingWeb\NewsSync\Db\Driver;
|
||||
|
||||
trait BindingTests {
|
||||
|
||||
|
|
|
@ -1,28 +1,9 @@
|
|||
<?php
|
||||
declare(strict_types=1);
|
||||
namespace JKingWeb\NewsSync;
|
||||
|
||||
|
||||
class TestUser extends \PHPUnit\Framework\TestCase {
|
||||
use Test\Tools;
|
||||
|
||||
const USER1 = "john.doe@example.com";
|
||||
const USER2 = "jane.doe@example.com";
|
||||
|
||||
protected $data;
|
||||
|
||||
function setUp() {
|
||||
$drv = Test\User\DriverInternalMock::class;
|
||||
$conf = new Conf();
|
||||
$conf->userDriver = $drv;
|
||||
$conf->userAuthPreferHTTP = true;
|
||||
$this->data = new Test\RuntimeData($conf);
|
||||
$this->data->user = new User($this->data);
|
||||
$this->data->user->authorizationEnabled(false);
|
||||
$_SERVER['PHP_AUTH_USER'] = self::USER1;
|
||||
$_SERVER['PHP_AUTH_PW'] = "secret";
|
||||
}
|
||||
namespace JKingWeb\NewsSync\Test\User;
|
||||
use JKingWeb\NewsSync\User\Driver;
|
||||
|
||||
trait CommonTests {
|
||||
function testListUsers() {
|
||||
$this->assertCount(0,$this->data->user->list());
|
||||
}
|
||||
|
@ -66,8 +47,11 @@ class TestUser extends \PHPUnit\Framework\TestCase {
|
|||
}
|
||||
|
||||
function testAuthenticateAUser() {
|
||||
$_SERVER['PHP_AUTH_USER'] = self::USER1;
|
||||
$_SERVER['PHP_AUTH_PW'] = "secret";
|
||||
$this->data->user->add(self::USER1, "secret");
|
||||
$this->data->user->add(self::USER2, "");
|
||||
$this->assertTrue($this->data->user->auth());
|
||||
$this->assertTrue($this->data->user->auth(self::USER1, "secret"));
|
||||
$this->assertFalse($this->data->user->auth(self::USER1, "superman"));
|
||||
$this->assertTrue($this->data->user->auth(self::USER2, ""));
|
||||
|
@ -104,14 +88,14 @@ class TestUser extends \PHPUnit\Framework\TestCase {
|
|||
'name' => 'John Doe',
|
||||
'id' => 'invalid',
|
||||
'domain' => 'localhost',
|
||||
'rights' => User\Driver::RIGHTS_GLOBAL_ADMIN,
|
||||
'rights' => Driver::RIGHTS_GLOBAL_ADMIN,
|
||||
'password' => 'superman',
|
||||
];
|
||||
$pGet = [
|
||||
'name' => 'John Doe',
|
||||
'id' => self::USER1,
|
||||
'domain' => 'example.com',
|
||||
'rights' => User\Driver::RIGHTS_NONE,
|
||||
'rights' => Driver::RIGHTS_NONE,
|
||||
];
|
||||
$this->data->user->add(self::USER1, "secret");
|
||||
$this->data->user->propertiesSet(self::USER1, $pSet);
|
||||
|
@ -123,12 +107,12 @@ class TestUser extends \PHPUnit\Framework\TestCase {
|
|||
|
||||
function testGetTheRightsOfAUser() {
|
||||
$this->data->user->add(self::USER1, "");
|
||||
$this->assertEquals(User\Driver::RIGHTS_NONE, $this->data->user->rightsGet(self::USER1));
|
||||
$this->assertEquals(Driver::RIGHTS_NONE, $this->data->user->rightsGet(self::USER1));
|
||||
}
|
||||
|
||||
function testSetTheRightsOfAUser() {
|
||||
$this->data->user->add(self::USER1, "");
|
||||
$this->data->user->rightsSet(self::USER1, User\Driver::RIGHTS_GLOBAL_ADMIN);
|
||||
$this->assertEquals(User\Driver::RIGHTS_GLOBAL_ADMIN, $this->data->user->rightsGet(self::USER1));
|
||||
$this->data->user->rightsSet(self::USER1, Driver::RIGHTS_GLOBAL_ADMIN);
|
||||
$this->assertEquals(Driver::RIGHTS_GLOBAL_ADMIN, $this->data->user->rightsGet(self::USER1));
|
||||
}
|
||||
}
|
|
@ -76,4 +76,12 @@ class Database extends DriverSkeleton {
|
|||
if(!$this->userExists($user)) throw new Exception("doesNotExist", ["action" => __FUNCTION__, "user" => $user]);
|
||||
return parent::userRightsSet($user, $level);
|
||||
}
|
||||
|
||||
// specific to mock database
|
||||
|
||||
function userPasswordGet(string $user): string {
|
||||
if(!$this->data->user->authorize($user, __FUNCTION__)) throw new ExceptionAuthz("notAuthorized", ["action" => __FUNCTION__, "user" => $user]);
|
||||
if(!$this->userExists($user)) throw new Exception("doesNotExist", ["action" => __FUNCTION__, "user" => $user]);
|
||||
return $this->db[$user]['password'];
|
||||
}
|
||||
}
|
|
@ -22,8 +22,9 @@
|
|||
</testsuite>
|
||||
|
||||
<testsuite name="User management">
|
||||
<file>User/TestUser.php</file>
|
||||
<file>User/TestUserExternal.php</file>
|
||||
<file>User/TestUserMockInternal.php</file>
|
||||
<file>User/TestUserMockExternal.php</file>
|
||||
<file>User/TestUserInternalDriver.php</file>
|
||||
<file>User/TestAuthorization.php</file>
|
||||
</testsuite>
|
||||
|
||||
|
|
Loading…
Reference in a new issue