Bläddra i källkod

Start implementing access cache

Signed-off-by: Joas Schilling <coding@schilljs.com>
tags/v16.0.0alpha1
Joas Schilling 5 år sedan
förälder
incheckning
ece471de36
Inget konto är kopplat till bidragsgivarens mejladress

core/Migrations/Version15000Date20180917092725.php → core/Migrations/Version16000Date20190207141427.php Visa fil

use OCP\Migration\SimpleMigrationStep; use OCP\Migration\SimpleMigrationStep;
use OCP\Migration\IOutput; use OCP\Migration\IOutput;


class Version15000Date20180917092725 extends SimpleMigrationStep {
class Version16000Date20190207141427 extends SimpleMigrationStep {




/** /**
$table->addUniqueIndex(['collection_id', 'resource_type', 'resource_id'], 'collres_unique_res'); $table->addUniqueIndex(['collection_id', 'resource_type', 'resource_id'], 'collres_unique_res');
} }


if (!$schema->hasTable('collres_accesscache')) {
$table = $schema->createTable('collres_accesscache');

$table->addColumn('user_id', Type::STRING, [
'notnull' => true,
'length' => 64,
]);
$table->addColumn('collection_id', Type::BIGINT, [
'notnull' => false,
]);
$table->addColumn('resource_id', Type::STRING, [
'notnull' => false,
'length' => 64,
]);
$table->addColumn('access', Type::SMALLINT, [
'notnull' => true,
'default' => 0,
]);

$table->addUniqueIndex(['user_id', 'collection_id', 'resource_id'], 'collres_unique_user');
$table->addIndex(['user_id', 'resource_id'], 'collres_user_res');
$table->addIndex(['user_id', 'collection_id'], 'collres_user_coll');
}

return $schema; return $schema;
} }



+ 13
- 5
lib/private/Collaboration/Resources/Collection.php Visa fil

/** @var string */ /** @var string */
protected $name; protected $name;


/** @var bool|null */
protected $access;

/** @var IResource[] */ /** @var IResource[] */
protected $resources; protected $resources;


IManager $manager, IManager $manager,
IDBConnection $connection, IDBConnection $connection,
int $id, int $id,
string $name
string $name,
?bool $access
) { ) {
$this->manager = $manager; $this->manager = $manager;
$this->connection = $connection; $this->connection = $connection;
$this->id = $id; $this->id = $id;
$this->name = $name; $this->name = $name;
$this->access = $access;
$this->resources = []; $this->resources = [];
} }


* @since 16.0.0 * @since 16.0.0
*/ */
public function canAccess(IUser $user = null): bool { public function canAccess(IUser $user = null): bool {
foreach ($this->getResources() as $resource) {
if ($resource->canAccess($user)) {
return true;
if ($this->access === null) {
$this->access = false;
foreach ($this->getResources() as $resource) {
if ($resource->canAccess($user)) {
$this->access = true;
}
} }
} }


return false;
return $this->access;
} }


protected function isSameResource(IResource $resource1, IResource $resource2): bool { protected function isSameResource(IResource $resource1, IResource $resource2): bool {

+ 79
- 0
lib/private/Collaboration/Resources/Manager.php Visa fil

return false; return false;
} }


public function cacheAccessForResource(IResource $resource, ?IUser $user, bool $access): void {
$query = $this->connection->getQueryBuilder();
$userId = $user instanceof IUser ? $user->getUID() : '';

$query->insert('collres_accesscache')
->values([
'user_id' => $query->createNamedParameter($userId),
'resource_id' => $query->createNamedParameter($resource->getId()),
'access' => $query->createNamedParameter($access),
]);
$query->execute();
}

public function cacheAccessForCollection(ICollection $collection, ?IUser $user, bool $access): void {
$query = $this->connection->getQueryBuilder();
$userId = $user instanceof IUser ? $user->getUID() : '';

$query->insert('collres_accesscache')
->values([
'user_id' => $query->createNamedParameter($userId),
'collection_id' => $query->createNamedParameter($collection->getId()),
'access' => $query->createNamedParameter($access),
]);
$query->execute();
}

public function invalidateAccessCacheForUser(?IUser $user): void {
$query = $this->connection->getQueryBuilder();
$userId = $user instanceof IUser ? $user->getUID() : '';

$query->delete('collres_accesscache')
->where($query->expr()->eq('user_id', $query->createNamedParameter($userId)));
$query->execute();
}

public function invalidateAccessCacheForResource(IResource $resource): void {
$query = $this->connection->getQueryBuilder();

$query->delete('collres_accesscache')
->where($query->expr()->eq('resource_id', $query->createNamedParameter($resource->getId())));
$query->execute();

foreach ($resource->getCollections() as $collection) {
$this->invalidateAccessCacheForCollection($collection);
}
}

protected function invalidateAccessCacheForCollection(ICollection $collection): void {
$query = $this->connection->getQueryBuilder();

$query->delete('collres_accesscache')
->where($query->expr()->eq('collection_id', $query->createNamedParameter($collection->getId())));
$query->execute();
}

public function invalidateAccessCacheForResourceByUser(IResource $resource, ?IUser $user): void {
$query = $this->connection->getQueryBuilder();
$userId = $user instanceof IUser ? $user->getUID() : '';

$query->delete('collres_accesscache')
->where($query->expr()->eq('resource_id', $query->createNamedParameter($resource->getId())))
->andWhere($query->expr()->eq('user_id', $query->createNamedParameter($userId)));
$query->execute();

foreach ($resource->getCollections() as $collection) {
$this->invalidateAccessCacheForCollectionByUser($collection, $user);
}
}

protected function invalidateAccessCacheForCollectionByUser(ICollection $collection, ?IUser $user): void {
$query = $this->connection->getQueryBuilder();
$userId = $user instanceof IUser ? $user->getUID() : '';

$query->delete('collres_accesscache')
->where($query->expr()->eq('collection_id', $query->createNamedParameter($collection->getId())))
->andWhere($query->expr()->eq('user_id', $query->createNamedParameter($userId)));
$query->execute();
}

/** /**
* @param IProvider $provider * @param IProvider $provider
*/ */

+ 10
- 3
lib/private/Collaboration/Resources/Resource.php Visa fil

use OCP\Collaboration\Resources\ICollection; use OCP\Collaboration\Resources\ICollection;
use OCP\Collaboration\Resources\IManager; use OCP\Collaboration\Resources\IManager;
use OCP\Collaboration\Resources\IResource; use OCP\Collaboration\Resources\IResource;
use OCP\Collaboration\Resources\ResourceException;
use OCP\IDBConnection; use OCP\IDBConnection;
use OCP\IUser; use OCP\IUser;


/** @var string */ /** @var string */
protected $id; protected $id;


/** @var bool|null */
protected $access;

/** @var string|null */ /** @var string|null */
protected $name; protected $name;


IManager $manager, IManager $manager,
IDBConnection $connection, IDBConnection $connection,
string $type, string $type,
string $id
string $id,
?bool $access
) { ) {
$this->manager = $manager; $this->manager = $manager;
$this->connection = $connection; $this->connection = $connection;
$this->type = $type; $this->type = $type;
$this->id = $id; $this->id = $id;
$this->access = $access;
} }


/** /**
* @since 16.0.0 * @since 16.0.0
*/ */
public function canAccess(IUser $user = null): bool { public function canAccess(IUser $user = null): bool {
return $this->manager->canAccess($this, $user);
if ($this->access === null) {
$this->access = $this->manager->canAccess($this, $user);
}
return $this->access;
} }


/** /**

Laddar…
Avbryt
Spara