point locking

Author: ArtificialOwl

lib/Db/PointRequest.php

@@ -111,6 +111,17 @@ public function deletePoint(string $pointId): void {
 	}
 
 
+	/**
+	 * @param RestoringPoint $point
+	 */
+	public function updateLock(RestoringPoint $point): void {
+		$qb = $this->getPointUpdateSql();
+		$qb->set('lock', $qb->createNamedParameter($point->getLock()));
+		$qb->exprLimit('uid', $point->getId());
+		$qb->execute();
+	}
+
+
 	/**
 	 * @param int $since
 	 * @param int $until

lib/Model/RestoringPoint.php

@@ -60,6 +60,8 @@ class RestoringPoint implements IDeserializable, INC23QueryRow, ISignedModel, Js
 	public const STATUS_COMPRESSED = 2;
 	public const STATUS_ENCRYPTED = 4;
 
+	const LOCK_TIMEOUT = 3600 * 3;
+
 	public static $DEF_STATUS =
 		[
 			self::STATUS_PACKED => 'packed',
@@ -300,8 +302,8 @@ public function getLock(): int {
 	/**
 	 * @return bool
 	 */
-	public function isLock(): bool {
-		return ($this->lock > 0);
+	public function isLocked(): bool {
+		return ($this->getLock() < (time() - self::LOCK_TIMEOUT));
 	}
 
 
@@ -376,7 +378,9 @@ public function getNCVersion(): string {
 		return implode('.', $this->getNc());
 	}
 
-
+	/**
+	 * @return int
+	 */
 	public function getNCInt(): int {
 		$nc = $this->getNc();
 
@@ -460,19 +464,6 @@ public function getRootFolder(): ISimpleRoot {
 	 */
 	public function getRestoringData(): array {
 		return $this->restoringData;
-//		$options = $this->getOptions();
-//		if (!$filtered || $options->getChunk() === '') {
-//			return $this->chunks;
-//		}
-//
-//		$options = $this->getOptions();
-//		foreach ($this->chunks as $chunk) {
-//			if ($chunk->getName() === $options->getChunk()) {
-//				return [$chunk];
-//			}
-//		}
-//
-//		return [];
 	}
 
 	/**

lib/Service/MetadataService.php

@@ -31,7 +31,10 @@
 
 namespace OCA\Backup\Service;
 
-use OCA\Backup\Exceptions\MetadataException;
+
+use OCA\Backup\Db\PointRequest;
+use OCA\Backup\Exceptions\RestoringPointException;
+use OCA\Backup\Exceptions\RestoringPointNotFoundException;
 use OCA\Backup\Model\RestoringPoint;
 use OCP\Files\NotFoundException;
 use OCP\Files\NotPermittedException;
@@ -44,6 +47,13 @@
 class MetadataService {
 	public const METADATA_FILE = 'restoring-point.data';
 
+
+	const METADATA_FILE = 'restoring-point.data';
+
+
+	/** @var PointRequest */
+	private $pointRequest;
+
 	/** @var RemoteService */
 	private $remoteService;
 
@@ -54,13 +64,16 @@ class MetadataService {
 	/**
 	 * MetadataService constructor.
 	 *
+	 * @param PointRequest $pointRequest
 	 * @param RemoteService $remoteService
 	 * @param ExternalFolderService $externalFolderService
 	 */
 	public function __construct(
+		PointRequest $pointRequest,
 		RemoteService $remoteService,
 		ExternalFolderService $externalFolderService
 	) {
+		$this->pointRequest = $pointRequest;
 		$this->remoteService = $remoteService;
 		$this->externalFolderService = $externalFolderService;
 	}
@@ -87,11 +100,55 @@ public function saveMetadata(RestoringPoint $point) {
 
 	/**
 	 * @param RestoringPoint $point
-	 *
-	 * @throws MetadataException
 	 */
 	public function globalUpdate(RestoringPoint $point) {
 		$this->externalFolderService->updateMetadata($point);
 		$this->remoteService->updateMetadata($point);
 	}
+
+
+	/**
+	 * @param RestoringPoint $point
+	 */
+	public function lock(RestoringPoint $point): void {
+		$time = time();
+		if ($point->getLock() > $time - 60) {
+			return;
+		}
+
+		$point->setLock($time);
+		$this->pointRequest->updateLock($point);
+	}
+
+	/**
+	 * @param RestoringPoint $point
+	 */
+	public function unlock(RestoringPoint $point): void {
+		if ($point->getLock() === 0) {
+			return;
+		}
+
+		$point->setLock(0);
+		$this->pointRequest->updateLock($point);
+	}
+
+	/**
+	 * @param RestoringPoint $point
+	 *
+	 * @throws RestoringPointException
+	 */
+	public function isLock(RestoringPoint $point): void {
+		try {
+			$stored = $this->pointRequest->getById($point->getId());
+		} catch (RestoringPointNotFoundException $e) {
+			return;
+		}
+
+		$point->setLock($stored->getLock());
+
+		if ($point->isLocked()) {
+			throw new RestoringPointException('point is locked');
+		}
+	}
+
 }

lib/Service/PackService.php

@@ -41,6 +41,7 @@
 use OCA\Backup\Exceptions\EncryptionKeyException;
 use OCA\Backup\Exceptions\RestoringChunkNotFoundException;
 use OCA\Backup\Exceptions\RestoringChunkPartNotFoundException;
+use OCA\Backup\Exceptions\RestoringPointException;
 use OCA\Backup\Exceptions\RestoringPointNotInitiatedException;
 use OCA\Backup\Exceptions\RestoringPointPackException;
 use OCA\Backup\Model\RestoringChunk;
@@ -132,6 +133,8 @@ public function packPoint(RestoringPoint $point, bool $force = false): void {
 			throw new RestoringPointPackException('restoring point is already packed');
 		}
 
+		$this->metadataService->isLock($point);
+
 		if ($point->isStatus(RestoringPoint::STATUS_ISSUE)) {
 			if (!$force && $point->getNotes()->gInt('pack_date') > time() - 3600 * 6) {
 				throw new RestoringPointPackException('restoring point already failed few hours ago');