resolved #1
This commit is contained in:
@@ -31,9 +31,9 @@ use exception;
|
||||
* @param string COLLECTION Name of the collection in ArangoDB
|
||||
* @param verification VERIFICATION Type of session verification
|
||||
*
|
||||
* @method void __construct(?string $hash, ?int $expires, array &$errors) Constructor
|
||||
* @method document|null hash(string $hash, array &$errors) Search by hash
|
||||
* @method document|null address(string $address, array &$errors) Search by IP-address
|
||||
* @method void __construct(?string $$hash, ?int $$expires, array &$$errors) Constructor
|
||||
* @method document|null hash(string $$hash, array &$$errors) Search by hash
|
||||
* @method document|null address(string $$address, array &$$errors) Search by IP-address
|
||||
*
|
||||
* @license http://www.wtfpl.net/ Do What The Fuck You Want To Public License
|
||||
* @author ${REPO_OWNER} <mail@domain.zone>
|
||||
@@ -62,47 +62,47 @@ final class session extends core implements document_interface, collection_inter
|
||||
/**
|
||||
* Constructor
|
||||
*
|
||||
* Initialize session and write into the $this->document property
|
||||
* Initialize session and write into the $$this->document property
|
||||
*
|
||||
* @param ?string $hash Hash of the session in ArangoDB
|
||||
* @param ?int $expires Date of expiring of the session (used for creating a new session)
|
||||
* @param array &$errors Registry of errors
|
||||
* @param ?string $$hash Hash of the session in ArangoDB
|
||||
* @param ?int $$expires Date of expiring of the session (used for creating a new session)
|
||||
* @param array &$$errors Registry of errors
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function __construct(?string $hash = null, ?int $expires = null, array &$errors = [])
|
||||
public function __construct(?string $$hash = null, ?int $$expires = null, array &$$errors = [])
|
||||
{
|
||||
try {
|
||||
if (collection::initialize(static::COLLECTION, static::TYPE, errors: $errors)) {
|
||||
if (collection::initialize(static::COLLECTION, static::TYPE, errors: $$errors)) {
|
||||
// Initialized the collection
|
||||
|
||||
if (isset($hash) && $document = $this->hash($hash, errors: $errors)) {
|
||||
if (isset($$hash) && $$document = $$this->hash($$hash, errors: $$errors)) {
|
||||
// Found the instance of the ArangoDB document of session and received a session hash
|
||||
|
||||
// Writing document instance of the session from ArangoDB to the property of the implementing object
|
||||
$this->__document($document);
|
||||
} else if (static::VERIFICATION === verification::hash_else_address && $document = $this->address($_SERVER['REMOTE_ADDR'], errors: $errors)) {
|
||||
$$this->__document($$document);
|
||||
} else if (static::VERIFICATION === verification::hash_else_address && $$document = $$this->address($$_SERVER['REMOTE_ADDR'], errors: $$errors)) {
|
||||
// Found the instance of the ArangoDB document of session and received a session hash
|
||||
|
||||
// Writing document instance of the session from ArangoDB to the property of the implementing object
|
||||
$this->__document($document);
|
||||
$$this->__document($$document);
|
||||
} else {
|
||||
// Not found the instance of the ArangoDB document of session
|
||||
|
||||
// Initializing a new session and write they into ArangoDB
|
||||
$_id = document::write(
|
||||
$$_id = document::write(
|
||||
static::COLLECTION,
|
||||
[
|
||||
'active' => true,
|
||||
'expires' => $expires ?? time() + 604800,
|
||||
'address' => $_SERVER['REMOTE_ADDR'],
|
||||
'x-forwarded-for' => $_SERVER['HTTP_X_FORWARDED_FOR'] ?? null,
|
||||
'referer' => $_SERVER['HTTP_REFERER'] ?? null,
|
||||
'useragent' => $_SERVER['HTTP_USER_AGENT'] ?? null
|
||||
'expires' => $$expires ?? time() + 604800,
|
||||
'address' => $$_SERVER['REMOTE_ADDR'],
|
||||
'x-forwarded-for' => $$_SERVER['HTTP_X_FORWARDED_FOR'] ?? null,
|
||||
'referer' => $$_SERVER['HTTP_REFERER'] ?? null,
|
||||
'useragent' => $$_SERVER['HTTP_USER_AGENT'] ?? null
|
||||
]
|
||||
);
|
||||
|
||||
if ($session = collection::execute(
|
||||
if ($$session = collection::execute(
|
||||
<<<'AQL'
|
||||
FOR d IN @@collection
|
||||
FILTER d._id == @_id && d.expires > @time && d.active == true
|
||||
@@ -110,32 +110,32 @@ final class session extends core implements document_interface, collection_inter
|
||||
AQL,
|
||||
[
|
||||
'@collection' => static::COLLECTION,
|
||||
'_id' => $_id,
|
||||
'_id' => $$_id,
|
||||
'time' => time()
|
||||
],
|
||||
errors: $errors
|
||||
errors: $$errors
|
||||
)) {
|
||||
// Found the instance of just created new session
|
||||
|
||||
// Generating a hash and write into the instance of the ArangoDB document of session property
|
||||
$session->hash = sodium_bin2hex(sodium_crypto_generichash($_id));
|
||||
$$session->hash = sodium_bin2hex(sodium_crypto_generichash($$_id));
|
||||
|
||||
if (document::update($session, errors: $errors)) {
|
||||
if (document::update($$session, errors: $$errors)) {
|
||||
// Writed to ArangoDB
|
||||
|
||||
// Writing instance of the session document from ArangoDB to the property of the implementing object
|
||||
$this->__document($session);
|
||||
$$this->__document($$session);
|
||||
} else throw new exception('Failed to write the session data');
|
||||
} else throw new exception('Failed to create or find just created session');
|
||||
}
|
||||
} else throw new exception('Failed to initialize ' . static::TYPE . ' collection: ' . static::COLLECTION);
|
||||
} catch (exception $e) {
|
||||
} catch (exception $$e) {
|
||||
// Writing to the registry of errors
|
||||
$errors[] = [
|
||||
'text' => $e->getMessage(),
|
||||
'file' => $e->getFile(),
|
||||
'line' => $e->getLine(),
|
||||
'stack' => $e->getTrace()
|
||||
$$errors[] = [
|
||||
'text' => $$e->getMessage(),
|
||||
'file' => $$e->getFile(),
|
||||
'line' => $$e->getLine(),
|
||||
'stack' => $$e->getTrace()
|
||||
];
|
||||
}
|
||||
}
|
||||
@@ -145,15 +145,15 @@ final class session extends core implements document_interface, collection_inter
|
||||
*
|
||||
* Search for the session in ArangoDB by hash
|
||||
*
|
||||
* @param string $hash Hash of the session in ArangoDB
|
||||
* @param array &$errors Registry of errors
|
||||
* @param string $$hash Hash of the session in ArangoDB
|
||||
* @param array &$$errors Registry of errors
|
||||
*
|
||||
* @return _document|null instance of document of the session in ArangoDB
|
||||
*/
|
||||
public static function hash(string $hash, array &$errors = []): ?_document
|
||||
public static function hash(string $$hash, array &$$errors = []): ?_document
|
||||
{
|
||||
try {
|
||||
if (collection::initialize(static::COLLECTION, static::TYPE, errors: $errors)) {
|
||||
if (collection::initialize(static::COLLECTION, static::TYPE, errors: $$errors)) {
|
||||
// Collection initialized
|
||||
|
||||
// Search the session data in ArangoDB
|
||||
@@ -165,19 +165,19 @@ final class session extends core implements document_interface, collection_inter
|
||||
AQL,
|
||||
[
|
||||
'@collection' => static::COLLECTION,
|
||||
'hash' => $hash,
|
||||
'hash' => $$hash,
|
||||
'time' => time()
|
||||
],
|
||||
errors: $errors
|
||||
errors: $$errors
|
||||
);
|
||||
} else throw new exception('Failed to initialize ' . static::TYPE . ' collection: ' . static::COLLECTION);
|
||||
} catch (exception $e) {
|
||||
} catch (exception $$e) {
|
||||
// Writing to the registry of errors
|
||||
$errors[] = [
|
||||
'text' => $e->getMessage(),
|
||||
'file' => $e->getFile(),
|
||||
'line' => $e->getLine(),
|
||||
'stack' => $e->getTrace()
|
||||
$$errors[] = [
|
||||
'text' => $$e->getMessage(),
|
||||
'file' => $$e->getFile(),
|
||||
'line' => $$e->getLine(),
|
||||
'stack' => $$e->getTrace()
|
||||
];
|
||||
}
|
||||
|
||||
@@ -190,15 +190,15 @@ final class session extends core implements document_interface, collection_inter
|
||||
*
|
||||
* Search for the session in ArangoDB by IP-address
|
||||
*
|
||||
* @param string $address IP-address writed to the session in ArangoDB
|
||||
* @param array &$errors Registry of errors
|
||||
* @param string $$address IP-address writed to the session in ArangoDB
|
||||
* @param array &$$errors Registry of errors
|
||||
*
|
||||
* @return _document|null instance of document of the session in ArangoDB
|
||||
*/
|
||||
public static function address(string $address, array &$errors = []): ?_document
|
||||
public static function address(string $$address, array &$$errors = []): ?_document
|
||||
{
|
||||
try {
|
||||
if (collection::initialize(static::COLLECTION, static::TYPE, errors: $errors)) {
|
||||
if (collection::initialize(static::COLLECTION, static::TYPE, errors: $$errors)) {
|
||||
// Collection initialized
|
||||
|
||||
// Search the session data in ArangoDB
|
||||
@@ -212,19 +212,19 @@ final class session extends core implements document_interface, collection_inter
|
||||
AQL,
|
||||
[
|
||||
'@collection' => static::COLLECTION,
|
||||
'address' => $address,
|
||||
'address' => $$address,
|
||||
'time' => time()
|
||||
],
|
||||
errors: $errors
|
||||
errors: $$errors
|
||||
);
|
||||
} else throw new exception('Failed to initialize ' . static::TYPE . ' collection: ' . static::COLLECTION);
|
||||
} catch (exception $e) {
|
||||
} catch (exception $$e) {
|
||||
// Writing to the registry of errors
|
||||
$errors[] = [
|
||||
'text' => $e->getMessage(),
|
||||
'file' => $e->getFile(),
|
||||
'line' => $e->getLine(),
|
||||
'stack' => $e->getTrace()
|
||||
$$errors[] = [
|
||||
'text' => $$e->getMessage(),
|
||||
'file' => $$e->getFile(),
|
||||
'line' => $$e->getLine(),
|
||||
'stack' => $$e->getTrace()
|
||||
];
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user