mirror of
https://code.mensbeam.com/MensBeam/Arsse.git
synced 2024-12-22 21:22:40 +00:00
Split Fever user management from protocol handler
This commit is contained in:
J. King
parent
1ce95ef4d9
commit
7d95e8fc09
5 changed files with 129 additions and 79 deletions
|
|
@ -97,26 +97,4 @@ class API extends \JKingWeb\Arsse\REST\AbstractHandler {
|
||||||
Arsse::$user->id = $s['user'];
|
Arsse::$user->id = $s['user'];
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static function userRegister(string $user, string $password = null): string {
|
|
||||||
$password = $password ?? Arsse::$user->generatePassword();
|
|
||||||
$hash = md5("$user:$password");
|
|
||||||
$tr = Arsse::$db->begin();
|
|
||||||
Arsse::$db->tokenRevoke($user, "fever.login");
|
|
||||||
Arsse::$db->tokenCreate($user, "fever.login", $hash);
|
|
||||||
$tr->commit();
|
|
||||||
return $password;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static function userUnregister(string $user): bool {
|
|
||||||
return (bool) Arsse::$db->tokenRevoke($user, "fever.login");
|
|
||||||
}
|
|
||||||
|
|
||||||
public static function userAuthenticate(string $user, string $password): bool {
|
|
||||||
try {
|
|
||||||
return (bool) Arsse::$db->tokenLookup("fever.login", md5("$user:$password"));
|
|
||||||
} catch (ExceptionInput $e) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
34
lib/REST/Fever/User.php
Normal file
34
lib/REST/Fever/User.php
Normal file
|
|
@ -0,0 +1,34 @@
|
||||||
|
<?php
|
||||||
|
/** @license MIT
|
||||||
|
* Copyright 2017 J. King, Dustin Wilson et al.
|
||||||
|
* See LICENSE and AUTHORS files for details */
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
namespace JKingWeb\Arsse\REST\Fever;
|
||||||
|
|
||||||
|
use JKingWeb\Arsse\Arsse;
|
||||||
|
use JKingWeb\Arsse\Db\ExceptionInput;
|
||||||
|
|
||||||
|
class User {
|
||||||
|
public static function register(string $user, string $password = null): string {
|
||||||
|
$password = $password ?? Arsse::$user->generatePassword();
|
||||||
|
$hash = md5("$user:$password");
|
||||||
|
$tr = Arsse::$db->begin();
|
||||||
|
Arsse::$db->tokenRevoke($user, "fever.login");
|
||||||
|
Arsse::$db->tokenCreate($user, "fever.login", $hash);
|
||||||
|
$tr->commit();
|
||||||
|
return $password;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static function unregister(string $user): bool {
|
||||||
|
return (bool) Arsse::$db->tokenRevoke($user, "fever.login");
|
||||||
|
}
|
||||||
|
|
||||||
|
public static function authenticate(string $user, string $password): bool {
|
||||||
|
try {
|
||||||
|
return (bool) Arsse::$db->tokenLookup("fever.login", md5("$user:$password"));
|
||||||
|
} catch (ExceptionInput $e) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -144,61 +144,4 @@ class TestAPI extends \JKingWeb\Arsse\Test\AbstractTest {
|
||||||
[true, false, "validUser", ['api_key' => "invalidToken"], ['api' => null], $success],
|
[true, false, "validUser", ['api_key' => "invalidToken"], ['api' => null], $success],
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
/** @dataProvider providePasswordCreations */
|
|
||||||
public function testRegisterAUserPassword(string $user, string $password = null, $exp) {
|
|
||||||
\Phake::when(Arsse::$user)->generatePassword->thenReturn("RANDOM_PASSWORD");
|
|
||||||
\Phake::when(Arsse::$db)->tokenCreate->thenReturnCallback(function($user, $class, $id = null) {
|
|
||||||
return $id ?? "RANDOM_TOKEN";
|
|
||||||
});
|
|
||||||
\Phake::when(Arsse::$db)->tokenCreate("john.doe@example.org", $this->anything(), $this->anything())->thenThrow(new UserException("doesNotExist"));
|
|
||||||
try {
|
|
||||||
if ($exp instanceof \JKingWeb\Arsse\AbstractException) {
|
|
||||||
$this->assertException($exp);
|
|
||||||
API::userRegister($user, $password);
|
|
||||||
} else {
|
|
||||||
$this->assertSame($exp, API::userRegister($user, $password));
|
|
||||||
}
|
|
||||||
} finally {
|
|
||||||
\Phake::verify(Arsse::$db)->tokenRevoke($user, "fever.login");
|
|
||||||
\Phake::verify(Arsse::$db)->tokenCreate($user, "fever.login", md5($user.":".($password ?? "RANDOM_PASSWORD")));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public function providePasswordCreations() {
|
|
||||||
return [
|
|
||||||
["jane.doe@example.com", "secret", "secret"],
|
|
||||||
["jane.doe@example.com", "superman", "superman"],
|
|
||||||
["jane.doe@example.com", null, "RANDOM_PASSWORD"],
|
|
||||||
["john.doe@example.org", null, new UserException("doesNotExist")],
|
|
||||||
["john.doe@example.net", null, "RANDOM_PASSWORD"],
|
|
||||||
["john.doe@example.net", "secret", "secret"],
|
|
||||||
];
|
|
||||||
}
|
|
||||||
|
|
||||||
public function testUnregisterAUser() {
|
|
||||||
\Phake::when(Arsse::$db)->tokenRevoke->thenReturn(3);
|
|
||||||
$this->assertTrue(API::userUnregister("jane.doe@example.com"));
|
|
||||||
\Phake::verify(Arsse::$db)->tokenRevoke("jane.doe@example.com", "fever.login");
|
|
||||||
\Phake::when(Arsse::$db)->tokenRevoke->thenReturn(0);
|
|
||||||
$this->assertFalse(API::userUnregister("john.doe@example.com"));
|
|
||||||
\Phake::verify(Arsse::$db)->tokenRevoke("john.doe@example.com", "fever.login");
|
|
||||||
}
|
|
||||||
|
|
||||||
/** @dataProvider provideUserAuthenticationRequests */
|
|
||||||
public function testAuthenticateAUserName(string $user, string $password, bool $exp) {
|
|
||||||
\Phake::when(Arsse::$db)->tokenLookup->thenThrow(new ExceptionInput("constraintViolation"));
|
|
||||||
\Phake::when(Arsse::$db)->tokenLookup("fever.login", md5("jane.doe@example.com:secret"))->thenReturn(['user' => "jane.doe@example.com"]);
|
|
||||||
\Phake::when(Arsse::$db)->tokenLookup("fever.login", md5("john.doe@example.com:superman"))->thenReturn(['user' => "john.doe@example.com"]);
|
|
||||||
$this->assertSame($exp, API::userAuthenticate($user, $password));
|
|
||||||
}
|
|
||||||
|
|
||||||
public function provideUserAuthenticationRequests() {
|
|
||||||
return [
|
|
||||||
["jane.doe@example.com", "secret", true],
|
|
||||||
["jane.doe@example.com", "superman", false],
|
|
||||||
["john.doe@example.com", "secret", false],
|
|
||||||
["john.doe@example.com", "superman", true],
|
|
||||||
];
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
94
tests/cases/REST/Fever/TestUser.php
Normal file
94
tests/cases/REST/Fever/TestUser.php
Normal file
|
|
@ -0,0 +1,94 @@
|
||||||
|
<?php
|
||||||
|
/** @license MIT
|
||||||
|
* Copyright 2017 J. King, Dustin Wilson et al.
|
||||||
|
* See LICENSE and AUTHORS files for details */
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
namespace JKingWeb\Arsse\TestCase\REST\Fever;
|
||||||
|
|
||||||
|
use JKingWeb\Arsse\Arsse;
|
||||||
|
use JKingWeb\Arsse\User;
|
||||||
|
use JKingWeb\Arsse\Database;
|
||||||
|
use JKingWeb\Arsse\Db\ExceptionInput;
|
||||||
|
use JKingWeb\Arsse\User\Exception as UserException;
|
||||||
|
use JKingWeb\Arsse\Db\Transaction;
|
||||||
|
use JKingWeb\Arsse\REST\Fever\User as FeverUser;
|
||||||
|
|
||||||
|
/** @covers \JKingWeb\Arsse\REST\Fever\User<extended> */
|
||||||
|
class TestUser extends \JKingWeb\Arsse\Test\AbstractTest {
|
||||||
|
protected $u;
|
||||||
|
|
||||||
|
public function setUp() {
|
||||||
|
self::clearData();
|
||||||
|
self::setConf();
|
||||||
|
// create a mock user manager
|
||||||
|
Arsse::$user = \Phake::mock(User::class);
|
||||||
|
\Phake::when(Arsse::$user)->auth->thenReturn(true);
|
||||||
|
// create a mock database interface
|
||||||
|
Arsse::$db = \Phake::mock(Database::class);
|
||||||
|
\Phake::when(Arsse::$db)->begin->thenReturn(\Phake::mock(Transaction::class));
|
||||||
|
// instantiate the handler
|
||||||
|
$this->u = new FeverUser();
|
||||||
|
}
|
||||||
|
|
||||||
|
public function tearDown() {
|
||||||
|
self::clearData();
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @dataProvider providePasswordCreations */
|
||||||
|
public function testRegisterAUserPassword(string $user, string $password = null, $exp) {
|
||||||
|
\Phake::when(Arsse::$user)->generatePassword->thenReturn("RANDOM_PASSWORD");
|
||||||
|
\Phake::when(Arsse::$db)->tokenCreate->thenReturnCallback(function($user, $class, $id = null) {
|
||||||
|
return $id ?? "RANDOM_TOKEN";
|
||||||
|
});
|
||||||
|
\Phake::when(Arsse::$db)->tokenCreate("john.doe@example.org", $this->anything(), $this->anything())->thenThrow(new UserException("doesNotExist"));
|
||||||
|
try {
|
||||||
|
if ($exp instanceof \JKingWeb\Arsse\AbstractException) {
|
||||||
|
$this->assertException($exp);
|
||||||
|
$this->u->register($user, $password);
|
||||||
|
} else {
|
||||||
|
$this->assertSame($exp, $this->u->register($user, $password));
|
||||||
|
}
|
||||||
|
} finally {
|
||||||
|
\Phake::verify(Arsse::$db)->tokenRevoke($user, "fever.login");
|
||||||
|
\Phake::verify(Arsse::$db)->tokenCreate($user, "fever.login", md5($user.":".($password ?? "RANDOM_PASSWORD")));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public function providePasswordCreations() {
|
||||||
|
return [
|
||||||
|
["jane.doe@example.com", "secret", "secret"],
|
||||||
|
["jane.doe@example.com", "superman", "superman"],
|
||||||
|
["jane.doe@example.com", null, "RANDOM_PASSWORD"],
|
||||||
|
["john.doe@example.org", null, new UserException("doesNotExist")],
|
||||||
|
["john.doe@example.net", null, "RANDOM_PASSWORD"],
|
||||||
|
["john.doe@example.net", "secret", "secret"],
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testUnregisterAUser() {
|
||||||
|
\Phake::when(Arsse::$db)->tokenRevoke->thenReturn(3);
|
||||||
|
$this->assertTrue($this->u->unregister("jane.doe@example.com"));
|
||||||
|
\Phake::verify(Arsse::$db)->tokenRevoke("jane.doe@example.com", "fever.login");
|
||||||
|
\Phake::when(Arsse::$db)->tokenRevoke->thenReturn(0);
|
||||||
|
$this->assertFalse($this->u->unregister("john.doe@example.com"));
|
||||||
|
\Phake::verify(Arsse::$db)->tokenRevoke("john.doe@example.com", "fever.login");
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @dataProvider provideUserAuthenticationRequests */
|
||||||
|
public function testAuthenticateAUserName(string $user, string $password, bool $exp) {
|
||||||
|
\Phake::when(Arsse::$db)->tokenLookup->thenThrow(new ExceptionInput("constraintViolation"));
|
||||||
|
\Phake::when(Arsse::$db)->tokenLookup("fever.login", md5("jane.doe@example.com:secret"))->thenReturn(['user' => "jane.doe@example.com"]);
|
||||||
|
\Phake::when(Arsse::$db)->tokenLookup("fever.login", md5("john.doe@example.com:superman"))->thenReturn(['user' => "john.doe@example.com"]);
|
||||||
|
$this->assertSame($exp, $this->u->authenticate($user, $password));
|
||||||
|
}
|
||||||
|
|
||||||
|
public function provideUserAuthenticationRequests() {
|
||||||
|
return [
|
||||||
|
["jane.doe@example.com", "secret", true],
|
||||||
|
["jane.doe@example.com", "superman", false],
|
||||||
|
["john.doe@example.com", "secret", false],
|
||||||
|
["john.doe@example.com", "superman", true],
|
||||||
|
];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -105,6 +105,7 @@
|
||||||
<file>cases/REST/TinyTinyRSS/PDO/TestAPI.php</file>
|
<file>cases/REST/TinyTinyRSS/PDO/TestAPI.php</file>
|
||||||
</testsuite>
|
</testsuite>
|
||||||
<testsuite name="Fever">
|
<testsuite name="Fever">
|
||||||
|
<file>cases/REST/Fever/TestUser.php</file>
|
||||||
<file>cases/REST/Fever/TestAPI.php</file>
|
<file>cases/REST/Fever/TestAPI.php</file>
|
||||||
<file>cases/REST/Fever/PDO/TestAPI.php</file>
|
<file>cases/REST/Fever/PDO/TestAPI.php</file>
|
||||||
</testsuite>
|
</testsuite>
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue