bugfixes

lib/Command/PointDownload.php

@@ -36,10 +36,10 @@
 use ArtificialOwl\MySmallPhpTools\Exceptions\SignatureException;
 use OC\Core\Command\Base;
 use OCA\Backup\Db\PointRequest;
-use OCA\Backup\Exceptions\RestoringChunkNotFoundException;
 use OCA\Backup\Exceptions\RemoteInstanceException;
 use OCA\Backup\Exceptions\RemoteInstanceNotFoundException;
 use OCA\Backup\Exceptions\RemoteResourceNotFoundException;
+use OCA\Backup\Exceptions\RestoringChunkNotFoundException;
 use OCA\Backup\Exceptions\RestoringPointNotFoundException;
 use OCA\Backup\Model\RestoringChunkHealth;
 use OCA\Backup\Model\RestoringHealth;
@@ -53,6 +53,7 @@
 use OCP\Files\NotPermittedException;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
 
@@ -119,22 +120,24 @@ protected function configure() {
 		$this->setName('backup:point:download')
 			 ->setDescription('Download restoring point from remote instance')
 			 ->addArgument('instance', InputArgument::REQUIRED, 'address of the remote instance')
-			 ->addArgument('pointId', InputArgument::REQUIRED, 'Id of the restoring point');
+			 ->addArgument('pointId', InputArgument::REQUIRED, 'Id of the restoring point')
+			 ->addOption('no-check', '', InputOption::VALUE_NONE, 'do not check integrity of restoring point');
 	}
 
 
 	/**
 	 * @param InputInterface $input
 	 * @param OutputInterface $output
 	 *
+	 * @throws NotFoundException
+	 * @throws NotPermittedException
 	 * @throws RemoteInstanceException
 	 * @throws RemoteInstanceNotFoundException
 	 * @throws RemoteResourceNotFoundException
+	 * @throws RestoringChunkNotFoundException
 	 * @throws RestoringPointNotFoundException
-	 * @throws SignatoryException
 	 * @throws SignatureException
-	 * @throws NotFoundException
-	 * @throws NotPermittedException
+	 * @throws SignatoryException
 	 */
 	protected function execute(InputInterface $input, OutputInterface $output) {
 		$instance = $input->getArgument('instance');
@@ -147,7 +150,16 @@ protected function execute(InputInterface $input, OutputInterface $output) {
 			$output->writeln('> downloading metadata');
 
 			$point = $this->remoteService->getRestoringPoint($instance, $pointId);
-			$this->remoteStreamService->verifyPoint($point);
+			if (!$input->getOption('no-check')) {
+				try {
+					$this->remoteStreamService->verifyPoint($point);
+				} catch (SignatureException $e) {
+					throw new SignatureException(
+						'Cannot confirm restoring point integrity.' . "\n"
+						. 'You can bypass this verification using --no-check'
+					);
+				}
+			}
 
 			$point->unsetHealth()
 				  ->setInstance('');

lib/Command/RemoteAdd.php

@@ -318,9 +318,9 @@ private function saveRemoteInstance(
 		$output->writeln('It is advised to export the setup of the Backup App in the file of your choice.');
 		$output->writeln('Keep in mind that with this file, any installation of Nextcloud can access your backup,');
 		$output->writeln('restore them and access the data of your users');
-		$output->writeln('While this is an option, ts is also advised to use a passphrase to encrypt the content of the file:');
+		$output->writeln('While this is an option, ts is also advised to force the creation of a key to encrypt the content of the file:');
 		$output->writeln('');
-		$output->writeln('   ./occ backup:setup:export [--passphrase your-passphrase] > ~/backup_setup.json');
+		$output->writeln('   ./occ backup:setup:export [--key] > ~/backup_setup.json');
 		$output->writeln('');
 	}
 

lib/Listeners/NodeEvent.php

@@ -46,7 +46,7 @@
 
 
 /**
- * Class FileCreated
+ * Class NodeEvent
  *
  * @package OCA\Backup\Listeners
  */
@@ -61,7 +61,7 @@ class NodeEvent implements IEventListener {
 
 
 	/**
-	 * FileCreated constructor.
+	 * NodeEvent constructor.
 	 *
 	 * @param FilesService $filesService
 	 */

lib/Service/ArchiveService.php

@@ -41,9 +41,9 @@
 use OCA\Backup\Exceptions\ArchiveNotFoundException;
 use OCA\Backup\Exceptions\BackupAppCopyException;
 use OCA\Backup\Exceptions\BackupScriptNotFoundException;
-use OCA\Backup\Exceptions\RestoringChunkNotFoundException;
 use OCA\Backup\Exceptions\EncryptionKeyException;
 use OCA\Backup\Exceptions\RestoreChunkException;
+use OCA\Backup\Exceptions\RestoringChunkNotFoundException;
 use OCA\Backup\Exceptions\RestoringDataNotFoundException;
 use OCA\Backup\Model\ArchiveFile;
 use OCA\Backup\Model\Backup;
@@ -432,6 +432,10 @@ private function generateChunk(
 		$zipSize = 0;
 		while (($filename = array_shift($files)) !== null) {
 			$fileSize = filesize($data->getAbsolutePath() . $filename);
+			if (is_bool($fileSize)) {
+				$fileSize = 1;
+			}
+
 			if ($zipSize > 0 && ($zipSize + $fileSize) > self::MAX_ZIP_SIZE) {
 				$this->finalizeZip($zip, $chunk->setCount()->setSize($zipSize));
 				array_unshift($files, $filename);