nextcloud / server

apps/encryption/composer/composer/autoload_static.php

Spacing +38 added lines, -38 removed lines

@@ -6,57 +6,57 @@
 
 class ComposerStaticInitEncryption
 {
-    public static $prefixLengthsPsr4 = array (
+    public static $prefixLengthsPsr4 = array(
         'O' => 
-        array (
+        array(
             'OCA\\Encryption\\' => 15,
         ),
     );
 
-    public static $prefixDirsPsr4 = array (
+    public static $prefixDirsPsr4 = array(
         'OCA\\Encryption\\' => 
-        array (
-            0 => __DIR__ . '/..' . '/../lib',
+        array(
+            0 => __DIR__.'/..'.'/../lib',
         ),
     );
 
-    public static $classMap = array (
-        'Composer\\InstalledVersions' => __DIR__ . '/..' . '/composer/InstalledVersions.php',
-        'OCA\\Encryption\\AppInfo\\Application' => __DIR__ . '/..' . '/../lib/AppInfo/Application.php',
-        'OCA\\Encryption\\Command\\CleanOrphanedKeys' => __DIR__ . '/..' . '/../lib/Command/CleanOrphanedKeys.php',
-        'OCA\\Encryption\\Command\\DisableMasterKey' => __DIR__ . '/..' . '/../lib/Command/DisableMasterKey.php',
-        'OCA\\Encryption\\Command\\DropLegacyFileKey' => __DIR__ . '/..' . '/../lib/Command/DropLegacyFileKey.php',
-        'OCA\\Encryption\\Command\\EnableMasterKey' => __DIR__ . '/..' . '/../lib/Command/EnableMasterKey.php',
-        'OCA\\Encryption\\Command\\FixEncryptedVersion' => __DIR__ . '/..' . '/../lib/Command/FixEncryptedVersion.php',
-        'OCA\\Encryption\\Command\\FixKeyLocation' => __DIR__ . '/..' . '/../lib/Command/FixKeyLocation.php',
-        'OCA\\Encryption\\Command\\RecoverUser' => __DIR__ . '/..' . '/../lib/Command/RecoverUser.php',
-        'OCA\\Encryption\\Command\\ScanLegacyFormat' => __DIR__ . '/..' . '/../lib/Command/ScanLegacyFormat.php',
-        'OCA\\Encryption\\Controller\\RecoveryController' => __DIR__ . '/..' . '/../lib/Controller/RecoveryController.php',
-        'OCA\\Encryption\\Controller\\SettingsController' => __DIR__ . '/..' . '/../lib/Controller/SettingsController.php',
-        'OCA\\Encryption\\Controller\\StatusController' => __DIR__ . '/..' . '/../lib/Controller/StatusController.php',
-        'OCA\\Encryption\\Crypto\\Crypt' => __DIR__ . '/..' . '/../lib/Crypto/Crypt.php',
-        'OCA\\Encryption\\Crypto\\DecryptAll' => __DIR__ . '/..' . '/../lib/Crypto/DecryptAll.php',
-        'OCA\\Encryption\\Crypto\\EncryptAll' => __DIR__ . '/..' . '/../lib/Crypto/EncryptAll.php',
-        'OCA\\Encryption\\Crypto\\Encryption' => __DIR__ . '/..' . '/../lib/Crypto/Encryption.php',
-        'OCA\\Encryption\\Exceptions\\MultiKeyDecryptException' => __DIR__ . '/..' . '/../lib/Exceptions/MultiKeyDecryptException.php',
-        'OCA\\Encryption\\Exceptions\\MultiKeyEncryptException' => __DIR__ . '/..' . '/../lib/Exceptions/MultiKeyEncryptException.php',
-        'OCA\\Encryption\\Exceptions\\PrivateKeyMissingException' => __DIR__ . '/..' . '/../lib/Exceptions/PrivateKeyMissingException.php',
-        'OCA\\Encryption\\Exceptions\\PublicKeyMissingException' => __DIR__ . '/..' . '/../lib/Exceptions/PublicKeyMissingException.php',
-        'OCA\\Encryption\\KeyManager' => __DIR__ . '/..' . '/../lib/KeyManager.php',
-        'OCA\\Encryption\\Listeners\\UserEventsListener' => __DIR__ . '/..' . '/../lib/Listeners/UserEventsListener.php',
-        'OCA\\Encryption\\Migration\\SetMasterKeyStatus' => __DIR__ . '/..' . '/../lib/Migration/SetMasterKeyStatus.php',
-        'OCA\\Encryption\\Recovery' => __DIR__ . '/..' . '/../lib/Recovery.php',
-        'OCA\\Encryption\\Services\\PassphraseService' => __DIR__ . '/..' . '/../lib/Services/PassphraseService.php',
-        'OCA\\Encryption\\Session' => __DIR__ . '/..' . '/../lib/Session.php',
-        'OCA\\Encryption\\Settings\\Admin' => __DIR__ . '/..' . '/../lib/Settings/Admin.php',
-        'OCA\\Encryption\\Settings\\Personal' => __DIR__ . '/..' . '/../lib/Settings/Personal.php',
-        'OCA\\Encryption\\Users\\Setup' => __DIR__ . '/..' . '/../lib/Users/Setup.php',
-        'OCA\\Encryption\\Util' => __DIR__ . '/..' . '/../lib/Util.php',
+    public static $classMap = array(
+        'Composer\\InstalledVersions' => __DIR__.'/..'.'/composer/InstalledVersions.php',
+        'OCA\\Encryption\\AppInfo\\Application' => __DIR__.'/..'.'/../lib/AppInfo/Application.php',
+        'OCA\\Encryption\\Command\\CleanOrphanedKeys' => __DIR__.'/..'.'/../lib/Command/CleanOrphanedKeys.php',
+        'OCA\\Encryption\\Command\\DisableMasterKey' => __DIR__.'/..'.'/../lib/Command/DisableMasterKey.php',
+        'OCA\\Encryption\\Command\\DropLegacyFileKey' => __DIR__.'/..'.'/../lib/Command/DropLegacyFileKey.php',
+        'OCA\\Encryption\\Command\\EnableMasterKey' => __DIR__.'/..'.'/../lib/Command/EnableMasterKey.php',
+        'OCA\\Encryption\\Command\\FixEncryptedVersion' => __DIR__.'/..'.'/../lib/Command/FixEncryptedVersion.php',
+        'OCA\\Encryption\\Command\\FixKeyLocation' => __DIR__.'/..'.'/../lib/Command/FixKeyLocation.php',
+        'OCA\\Encryption\\Command\\RecoverUser' => __DIR__.'/..'.'/../lib/Command/RecoverUser.php',
+        'OCA\\Encryption\\Command\\ScanLegacyFormat' => __DIR__.'/..'.'/../lib/Command/ScanLegacyFormat.php',
+        'OCA\\Encryption\\Controller\\RecoveryController' => __DIR__.'/..'.'/../lib/Controller/RecoveryController.php',
+        'OCA\\Encryption\\Controller\\SettingsController' => __DIR__.'/..'.'/../lib/Controller/SettingsController.php',
+        'OCA\\Encryption\\Controller\\StatusController' => __DIR__.'/..'.'/../lib/Controller/StatusController.php',
+        'OCA\\Encryption\\Crypto\\Crypt' => __DIR__.'/..'.'/../lib/Crypto/Crypt.php',
+        'OCA\\Encryption\\Crypto\\DecryptAll' => __DIR__.'/..'.'/../lib/Crypto/DecryptAll.php',
+        'OCA\\Encryption\\Crypto\\EncryptAll' => __DIR__.'/..'.'/../lib/Crypto/EncryptAll.php',
+        'OCA\\Encryption\\Crypto\\Encryption' => __DIR__.'/..'.'/../lib/Crypto/Encryption.php',
+        'OCA\\Encryption\\Exceptions\\MultiKeyDecryptException' => __DIR__.'/..'.'/../lib/Exceptions/MultiKeyDecryptException.php',
+        'OCA\\Encryption\\Exceptions\\MultiKeyEncryptException' => __DIR__.'/..'.'/../lib/Exceptions/MultiKeyEncryptException.php',
+        'OCA\\Encryption\\Exceptions\\PrivateKeyMissingException' => __DIR__.'/..'.'/../lib/Exceptions/PrivateKeyMissingException.php',
+        'OCA\\Encryption\\Exceptions\\PublicKeyMissingException' => __DIR__.'/..'.'/../lib/Exceptions/PublicKeyMissingException.php',
+        'OCA\\Encryption\\KeyManager' => __DIR__.'/..'.'/../lib/KeyManager.php',
+        'OCA\\Encryption\\Listeners\\UserEventsListener' => __DIR__.'/..'.'/../lib/Listeners/UserEventsListener.php',
+        'OCA\\Encryption\\Migration\\SetMasterKeyStatus' => __DIR__.'/..'.'/../lib/Migration/SetMasterKeyStatus.php',
+        'OCA\\Encryption\\Recovery' => __DIR__.'/..'.'/../lib/Recovery.php',
+        'OCA\\Encryption\\Services\\PassphraseService' => __DIR__.'/..'.'/../lib/Services/PassphraseService.php',
+        'OCA\\Encryption\\Session' => __DIR__.'/..'.'/../lib/Session.php',
+        'OCA\\Encryption\\Settings\\Admin' => __DIR__.'/..'.'/../lib/Settings/Admin.php',
+        'OCA\\Encryption\\Settings\\Personal' => __DIR__.'/..'.'/../lib/Settings/Personal.php',
+        'OCA\\Encryption\\Users\\Setup' => __DIR__.'/..'.'/../lib/Users/Setup.php',
+        'OCA\\Encryption\\Util' => __DIR__.'/..'.'/../lib/Util.php',
     );
 
     public static function getInitializer(ClassLoader $loader)
     {
-        return \Closure::bind(function () use ($loader) {
+        return \Closure::bind(function() use ($loader) {
             $loader->prefixLengthsPsr4 = ComposerStaticInitEncryption::$prefixLengthsPsr4;
             $loader->prefixDirsPsr4 = ComposerStaticInitEncryption::$prefixDirsPsr4;
             $loader->classMap = ComposerStaticInitEncryption::$classMap;

apps/encryption/composer/composer/autoload_classmap.php

Spacing +31 added lines, -31 removed lines

@@ -6,35 +6,35 @@
 $baseDir = $vendorDir;
 
 return array(
-    'Composer\\InstalledVersions' => $vendorDir . '/composer/InstalledVersions.php',
-    'OCA\\Encryption\\AppInfo\\Application' => $baseDir . '/../lib/AppInfo/Application.php',
-    'OCA\\Encryption\\Command\\CleanOrphanedKeys' => $baseDir . '/../lib/Command/CleanOrphanedKeys.php',
-    'OCA\\Encryption\\Command\\DisableMasterKey' => $baseDir . '/../lib/Command/DisableMasterKey.php',
-    'OCA\\Encryption\\Command\\DropLegacyFileKey' => $baseDir . '/../lib/Command/DropLegacyFileKey.php',
-    'OCA\\Encryption\\Command\\EnableMasterKey' => $baseDir . '/../lib/Command/EnableMasterKey.php',
-    'OCA\\Encryption\\Command\\FixEncryptedVersion' => $baseDir . '/../lib/Command/FixEncryptedVersion.php',
-    'OCA\\Encryption\\Command\\FixKeyLocation' => $baseDir . '/../lib/Command/FixKeyLocation.php',
-    'OCA\\Encryption\\Command\\RecoverUser' => $baseDir . '/../lib/Command/RecoverUser.php',
-    'OCA\\Encryption\\Command\\ScanLegacyFormat' => $baseDir . '/../lib/Command/ScanLegacyFormat.php',
-    'OCA\\Encryption\\Controller\\RecoveryController' => $baseDir . '/../lib/Controller/RecoveryController.php',
-    'OCA\\Encryption\\Controller\\SettingsController' => $baseDir . '/../lib/Controller/SettingsController.php',
-    'OCA\\Encryption\\Controller\\StatusController' => $baseDir . '/../lib/Controller/StatusController.php',
-    'OCA\\Encryption\\Crypto\\Crypt' => $baseDir . '/../lib/Crypto/Crypt.php',
-    'OCA\\Encryption\\Crypto\\DecryptAll' => $baseDir . '/../lib/Crypto/DecryptAll.php',
-    'OCA\\Encryption\\Crypto\\EncryptAll' => $baseDir . '/../lib/Crypto/EncryptAll.php',
-    'OCA\\Encryption\\Crypto\\Encryption' => $baseDir . '/../lib/Crypto/Encryption.php',
-    'OCA\\Encryption\\Exceptions\\MultiKeyDecryptException' => $baseDir . '/../lib/Exceptions/MultiKeyDecryptException.php',
-    'OCA\\Encryption\\Exceptions\\MultiKeyEncryptException' => $baseDir . '/../lib/Exceptions/MultiKeyEncryptException.php',
-    'OCA\\Encryption\\Exceptions\\PrivateKeyMissingException' => $baseDir . '/../lib/Exceptions/PrivateKeyMissingException.php',
-    'OCA\\Encryption\\Exceptions\\PublicKeyMissingException' => $baseDir . '/../lib/Exceptions/PublicKeyMissingException.php',
-    'OCA\\Encryption\\KeyManager' => $baseDir . '/../lib/KeyManager.php',
-    'OCA\\Encryption\\Listeners\\UserEventsListener' => $baseDir . '/../lib/Listeners/UserEventsListener.php',
-    'OCA\\Encryption\\Migration\\SetMasterKeyStatus' => $baseDir . '/../lib/Migration/SetMasterKeyStatus.php',
-    'OCA\\Encryption\\Recovery' => $baseDir . '/../lib/Recovery.php',
-    'OCA\\Encryption\\Services\\PassphraseService' => $baseDir . '/../lib/Services/PassphraseService.php',
-    'OCA\\Encryption\\Session' => $baseDir . '/../lib/Session.php',
-    'OCA\\Encryption\\Settings\\Admin' => $baseDir . '/../lib/Settings/Admin.php',
-    'OCA\\Encryption\\Settings\\Personal' => $baseDir . '/../lib/Settings/Personal.php',
-    'OCA\\Encryption\\Users\\Setup' => $baseDir . '/../lib/Users/Setup.php',
-    'OCA\\Encryption\\Util' => $baseDir . '/../lib/Util.php',
+    'Composer\\InstalledVersions' => $vendorDir.'/composer/InstalledVersions.php',
+    'OCA\\Encryption\\AppInfo\\Application' => $baseDir.'/../lib/AppInfo/Application.php',
+    'OCA\\Encryption\\Command\\CleanOrphanedKeys' => $baseDir.'/../lib/Command/CleanOrphanedKeys.php',
+    'OCA\\Encryption\\Command\\DisableMasterKey' => $baseDir.'/../lib/Command/DisableMasterKey.php',
+    'OCA\\Encryption\\Command\\DropLegacyFileKey' => $baseDir.'/../lib/Command/DropLegacyFileKey.php',
+    'OCA\\Encryption\\Command\\EnableMasterKey' => $baseDir.'/../lib/Command/EnableMasterKey.php',
+    'OCA\\Encryption\\Command\\FixEncryptedVersion' => $baseDir.'/../lib/Command/FixEncryptedVersion.php',
+    'OCA\\Encryption\\Command\\FixKeyLocation' => $baseDir.'/../lib/Command/FixKeyLocation.php',
+    'OCA\\Encryption\\Command\\RecoverUser' => $baseDir.'/../lib/Command/RecoverUser.php',
+    'OCA\\Encryption\\Command\\ScanLegacyFormat' => $baseDir.'/../lib/Command/ScanLegacyFormat.php',
+    'OCA\\Encryption\\Controller\\RecoveryController' => $baseDir.'/../lib/Controller/RecoveryController.php',
+    'OCA\\Encryption\\Controller\\SettingsController' => $baseDir.'/../lib/Controller/SettingsController.php',
+    'OCA\\Encryption\\Controller\\StatusController' => $baseDir.'/../lib/Controller/StatusController.php',
+    'OCA\\Encryption\\Crypto\\Crypt' => $baseDir.'/../lib/Crypto/Crypt.php',
+    'OCA\\Encryption\\Crypto\\DecryptAll' => $baseDir.'/../lib/Crypto/DecryptAll.php',
+    'OCA\\Encryption\\Crypto\\EncryptAll' => $baseDir.'/../lib/Crypto/EncryptAll.php',
+    'OCA\\Encryption\\Crypto\\Encryption' => $baseDir.'/../lib/Crypto/Encryption.php',
+    'OCA\\Encryption\\Exceptions\\MultiKeyDecryptException' => $baseDir.'/../lib/Exceptions/MultiKeyDecryptException.php',
+    'OCA\\Encryption\\Exceptions\\MultiKeyEncryptException' => $baseDir.'/../lib/Exceptions/MultiKeyEncryptException.php',
+    'OCA\\Encryption\\Exceptions\\PrivateKeyMissingException' => $baseDir.'/../lib/Exceptions/PrivateKeyMissingException.php',
+    'OCA\\Encryption\\Exceptions\\PublicKeyMissingException' => $baseDir.'/../lib/Exceptions/PublicKeyMissingException.php',
+    'OCA\\Encryption\\KeyManager' => $baseDir.'/../lib/KeyManager.php',
+    'OCA\\Encryption\\Listeners\\UserEventsListener' => $baseDir.'/../lib/Listeners/UserEventsListener.php',
+    'OCA\\Encryption\\Migration\\SetMasterKeyStatus' => $baseDir.'/../lib/Migration/SetMasterKeyStatus.php',
+    'OCA\\Encryption\\Recovery' => $baseDir.'/../lib/Recovery.php',
+    'OCA\\Encryption\\Services\\PassphraseService' => $baseDir.'/../lib/Services/PassphraseService.php',
+    'OCA\\Encryption\\Session' => $baseDir.'/../lib/Session.php',
+    'OCA\\Encryption\\Settings\\Admin' => $baseDir.'/../lib/Settings/Admin.php',
+    'OCA\\Encryption\\Settings\\Personal' => $baseDir.'/../lib/Settings/Personal.php',
+    'OCA\\Encryption\\Users\\Setup' => $baseDir.'/../lib/Users/Setup.php',
+    'OCA\\Encryption\\Util' => $baseDir.'/../lib/Util.php',
 );

apps/encryption/lib/Command/CleanOrphanedKeys.php

Indentation +170 added lines, -170 removed lines

@@ -29,174 +29,174 @@
 
 class CleanOrphanedKeys extends Command {
 
-	public function __construct(
-		protected IConfig $config,
-		protected QuestionHelper $questionHelper,
-		private IUserManager $userManager,
-		private Util $encryptionUtil,
-		private SetupManager $setupManager,
-		private IRootFolder $rootFolder,
-		private LoggerInterface $logger,
-	) {
-		parent::__construct();
-
-	}
-
-	protected function configure(): void {
-		$this
-			->setName('encryption:clean-orphaned-keys')
-			->setDescription('Scan the keys storage for orphaned keys and remove them');
-	}
-
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$orphanedKeys = [];
-		$headline = 'Scanning all keys for file parity';
-		$output->writeln($headline);
-		$output->writeln(str_pad('', strlen($headline), '='));
-		$output->writeln("\n");
-		$progress = new ProgressBar($output);
-		$progress->setFormat(" %message% \n [%bar%]");
-
-		foreach ($this->userManager->getSeenUsers() as $user) {
-			$uid = $user->getUID();
-			$progress->setMessage('Scanning all keys for: ' . $uid);
-			$progress->advance();
-			$this->setupUserFileSystem($user);
-			$root = $this->encryptionUtil->getKeyStorageRoot() . '/' . $uid . '/files_encryption/keys';
-			$userOrphanedKeys = $this->scanFolder($output, $root, $uid);
-			$orphanedKeys = array_merge($orphanedKeys, $userOrphanedKeys);
-		}
-		$progress->setMessage('Scanned orphaned keys for all users');
-		$progress->finish();
-		$output->writeln("\n");
-		foreach ($orphanedKeys as $keyPath) {
-			$output->writeln('Orphaned key found: ' . $keyPath);
-		}
-		if (count($orphanedKeys) == 0) {
-			return self::SUCCESS;
-		}
-		$question = new ConfirmationQuestion('Do you want to delete all orphaned keys? (y/n) ', false);
-		if ($this->questionHelper->ask($input, $output, $question)) {
-			$this->deleteAll($orphanedKeys, $output);
-		} else {
-
-			$question = new ConfirmationQuestion('Do you want to delete specific keys? (y/n) ', false);
-			if ($this->questionHelper->ask($input, $output, $question)) {
-				$this->deleteSpecific($input, $output, $orphanedKeys);
-			}
-		}
-
-		return self::SUCCESS;
-	}
-
-	private function scanFolder(OutputInterface $output, string $folderPath, string $user) : array {
-		$orphanedKeys = [];
-		try {
-			$folder = $this->rootFolder->get($folderPath);
-		} catch (NotFoundException $e) {
-			// Happens when user doesn't have encrypted files
-			$this->logger->error('Error when accessing folder ' . $folderPath . ' for user ' . $user, ['exception' => $e]);
-			return [];
-		}
-
-		if (!($folder instanceof Folder)) {
-			$this->logger->error('Invalid folder');
-			return [];
-		}
-
-		foreach ($folder->getDirectoryListing() as $item) {
-			$path = $folderPath . '/' . $item->getName();
-			$stopValue = $this->stopCondition($path);
-			if ($stopValue === null) {
-				$this->logger->error('Reached unexpected state when scanning user\'s filesystem for orphaned encryption keys' . $path);
-			} elseif ($stopValue) {
-				$filePath = str_replace('files_encryption/keys/', '', $path);
-				try {
-					$this->rootFolder->get($filePath);
-				} catch (NotFoundException $e) {
-					// We found an orphaned key
-					$orphanedKeys[] = $path;
-					continue;
-				}
-			} else {
-				$orphanedKeys = array_merge($orphanedKeys, $this->scanFolder($output, $path, $user));
-			}
-		}
-		return $orphanedKeys;
-	}
-	/**
-	 * Checks the stop considition for the recursion
-	 * following the logic that keys are stored in files_encryption/keys/<user>/<path>/<fileName>/OC_DEFAULT_MODULE/<key>.sharekey
-	 * @param string $path path of the current folder
-	 * @return bool|null true if we should stop and found a key, false if we should continue, null if we shouldn't end up here
-	 */
-	private function stopCondition(string $path) : ?bool {
-		$folder = $this->rootFolder->get($path);
-		if ($folder instanceof Folder) {
-			$content = $folder->getDirectoryListing();
-			$subfolder = $content[0];
-			if (count($content) === 1 && $subfolder->getName() === Encryption::ID) {
-				if ($subfolder instanceof Folder) {
-					$content = $subfolder->getDirectoryListing();
-					if (count($content) === 1 && $content[0] instanceof File) {
-						return strtolower($content[0]->getExtension()) === 'sharekey' ;
-					}
-				}
-			}
-			return false;
-		}
-		// We shouldn't end up here, because we return true when reaching the folder named after the file containing OC_DEFAULT_MODULE
-		return null;
-	}
-	private function deleteAll(array $keys, OutputInterface $output) {
-		foreach ($keys as $key) {
-			$file = $this->rootFolder->get($key);
-			try {
-				$file->delete();
-				$output->writeln('Key deleted: ' . $key);
-			} catch (\Exception $e) {
-				$output->writeln('Failed to delete  ' . $key);
-				$this->logger->error('Error when deleting orphaned key ' . $key . '. ' . $e->getMessage());
-			}
-		}
-	}
-
-	private function deleteSpecific(InputInterface $input, OutputInterface $output, array $orphanedKeys) {
-		$question = new Question('Please enter path for key to delete: ');
-		$path = $this->questionHelper->ask($input, $output, $question);
-		if (!in_array(trim($path), $orphanedKeys)) {
-			$output->writeln('Wrong key path');
-		} else {
-			try {
-				$this->rootFolder->get(trim($path))->delete();
-				$output->writeln('Key deleted: ' . $path);
-			} catch (\Exception $e) {
-				$output->writeln('Failed to delete  ' . $path);
-				$this->logger->error('Error when deleting orphaned key ' . $path . '. ' . $e->getMessage());
-			}
-			$orphanedKeys = array_filter($orphanedKeys, function ($k) use ($path) {
-				return $k !== trim($path);
-			});
-		}
-		if (count($orphanedKeys) == 0) {
-			return;
-		}
-		$output->writeln('Remaining orphaned keys: ');
-		foreach ($orphanedKeys as $keyPath) {
-			$output->writeln($keyPath);
-		}
-		$question = new ConfirmationQuestion('Do you want to delete more orphaned keys? (y/n) ', false);
-		if ($this->questionHelper->ask($input, $output, $question)) {
-			$this->deleteSpecific($input, $output, $orphanedKeys);
-		}
-
-	}
-
-	/**
-	 * setup user file system
-	 */
-	protected function setupUserFileSystem(IUser $user): void {
-		$this->setupManager->tearDown();
-		$this->setupManager->setupForUser($user);
-	}
+    public function __construct(
+        protected IConfig $config,
+        protected QuestionHelper $questionHelper,
+        private IUserManager $userManager,
+        private Util $encryptionUtil,
+        private SetupManager $setupManager,
+        private IRootFolder $rootFolder,
+        private LoggerInterface $logger,
+    ) {
+        parent::__construct();
+
+    }
+
+    protected function configure(): void {
+        $this
+            ->setName('encryption:clean-orphaned-keys')
+            ->setDescription('Scan the keys storage for orphaned keys and remove them');
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $orphanedKeys = [];
+        $headline = 'Scanning all keys for file parity';
+        $output->writeln($headline);
+        $output->writeln(str_pad('', strlen($headline), '='));
+        $output->writeln("\n");
+        $progress = new ProgressBar($output);
+        $progress->setFormat(" %message% \n [%bar%]");
+
+        foreach ($this->userManager->getSeenUsers() as $user) {
+            $uid = $user->getUID();
+            $progress->setMessage('Scanning all keys for: ' . $uid);
+            $progress->advance();
+            $this->setupUserFileSystem($user);
+            $root = $this->encryptionUtil->getKeyStorageRoot() . '/' . $uid . '/files_encryption/keys';
+            $userOrphanedKeys = $this->scanFolder($output, $root, $uid);
+            $orphanedKeys = array_merge($orphanedKeys, $userOrphanedKeys);
+        }
+        $progress->setMessage('Scanned orphaned keys for all users');
+        $progress->finish();
+        $output->writeln("\n");
+        foreach ($orphanedKeys as $keyPath) {
+            $output->writeln('Orphaned key found: ' . $keyPath);
+        }
+        if (count($orphanedKeys) == 0) {
+            return self::SUCCESS;
+        }
+        $question = new ConfirmationQuestion('Do you want to delete all orphaned keys? (y/n) ', false);
+        if ($this->questionHelper->ask($input, $output, $question)) {
+            $this->deleteAll($orphanedKeys, $output);
+        } else {
+
+            $question = new ConfirmationQuestion('Do you want to delete specific keys? (y/n) ', false);
+            if ($this->questionHelper->ask($input, $output, $question)) {
+                $this->deleteSpecific($input, $output, $orphanedKeys);
+            }
+        }
+
+        return self::SUCCESS;
+    }
+
+    private function scanFolder(OutputInterface $output, string $folderPath, string $user) : array {
+        $orphanedKeys = [];
+        try {
+            $folder = $this->rootFolder->get($folderPath);
+        } catch (NotFoundException $e) {
+            // Happens when user doesn't have encrypted files
+            $this->logger->error('Error when accessing folder ' . $folderPath . ' for user ' . $user, ['exception' => $e]);
+            return [];
+        }
+
+        if (!($folder instanceof Folder)) {
+            $this->logger->error('Invalid folder');
+            return [];
+        }
+
+        foreach ($folder->getDirectoryListing() as $item) {
+            $path = $folderPath . '/' . $item->getName();
+            $stopValue = $this->stopCondition($path);
+            if ($stopValue === null) {
+                $this->logger->error('Reached unexpected state when scanning user\'s filesystem for orphaned encryption keys' . $path);
+            } elseif ($stopValue) {
+                $filePath = str_replace('files_encryption/keys/', '', $path);
+                try {
+                    $this->rootFolder->get($filePath);
+                } catch (NotFoundException $e) {
+                    // We found an orphaned key
+                    $orphanedKeys[] = $path;
+                    continue;
+                }
+            } else {
+                $orphanedKeys = array_merge($orphanedKeys, $this->scanFolder($output, $path, $user));
+            }
+        }
+        return $orphanedKeys;
+    }
+    /**
+     * Checks the stop considition for the recursion
+     * following the logic that keys are stored in files_encryption/keys/<user>/<path>/<fileName>/OC_DEFAULT_MODULE/<key>.sharekey
+     * @param string $path path of the current folder
+     * @return bool|null true if we should stop and found a key, false if we should continue, null if we shouldn't end up here
+     */
+    private function stopCondition(string $path) : ?bool {
+        $folder = $this->rootFolder->get($path);
+        if ($folder instanceof Folder) {
+            $content = $folder->getDirectoryListing();
+            $subfolder = $content[0];
+            if (count($content) === 1 && $subfolder->getName() === Encryption::ID) {
+                if ($subfolder instanceof Folder) {
+                    $content = $subfolder->getDirectoryListing();
+                    if (count($content) === 1 && $content[0] instanceof File) {
+                        return strtolower($content[0]->getExtension()) === 'sharekey' ;
+                    }
+                }
+            }
+            return false;
+        }
+        // We shouldn't end up here, because we return true when reaching the folder named after the file containing OC_DEFAULT_MODULE
+        return null;
+    }
+    private function deleteAll(array $keys, OutputInterface $output) {
+        foreach ($keys as $key) {
+            $file = $this->rootFolder->get($key);
+            try {
+                $file->delete();
+                $output->writeln('Key deleted: ' . $key);
+            } catch (\Exception $e) {
+                $output->writeln('Failed to delete  ' . $key);
+                $this->logger->error('Error when deleting orphaned key ' . $key . '. ' . $e->getMessage());
+            }
+        }
+    }
+
+    private function deleteSpecific(InputInterface $input, OutputInterface $output, array $orphanedKeys) {
+        $question = new Question('Please enter path for key to delete: ');
+        $path = $this->questionHelper->ask($input, $output, $question);
+        if (!in_array(trim($path), $orphanedKeys)) {
+            $output->writeln('Wrong key path');
+        } else {
+            try {
+                $this->rootFolder->get(trim($path))->delete();
+                $output->writeln('Key deleted: ' . $path);
+            } catch (\Exception $e) {
+                $output->writeln('Failed to delete  ' . $path);
+                $this->logger->error('Error when deleting orphaned key ' . $path . '. ' . $e->getMessage());
+            }
+            $orphanedKeys = array_filter($orphanedKeys, function ($k) use ($path) {
+                return $k !== trim($path);
+            });
+        }
+        if (count($orphanedKeys) == 0) {
+            return;
+        }
+        $output->writeln('Remaining orphaned keys: ');
+        foreach ($orphanedKeys as $keyPath) {
+            $output->writeln($keyPath);
+        }
+        $question = new ConfirmationQuestion('Do you want to delete more orphaned keys? (y/n) ', false);
+        if ($this->questionHelper->ask($input, $output, $question)) {
+            $this->deleteSpecific($input, $output, $orphanedKeys);
+        }
+
+    }
+
+    /**
+     * setup user file system
+     */
+    protected function setupUserFileSystem(IUser $user): void {
+        $this->setupManager->tearDown();
+        $this->setupManager->setupForUser($user);
+    }
 }

Spacing +14 added lines, -14 removed lines

@@ -59,10 +59,10 @@ 
 
 		foreach ($this->userManager->getSeenUsers() as $user) {
 			$uid = $user->getUID();
-			$progress->setMessage('Scanning all keys for: ' . $uid);
+			$progress->setMessage('Scanning all keys for: '.$uid);
 			$progress->advance();
 			$this->setupUserFileSystem($user);
-			$root = $this->encryptionUtil->getKeyStorageRoot() . '/' . $uid . '/files_encryption/keys';
+			$root = $this->encryptionUtil->getKeyStorageRoot().'/'.$uid.'/files_encryption/keys';
 			$userOrphanedKeys = $this->scanFolder($output, $root, $uid);
 			$orphanedKeys = array_merge($orphanedKeys, $userOrphanedKeys);
 		}
@@ -70,7 +70,7 @@ 
 		$progress->finish();
 		$output->writeln("\n");
 		foreach ($orphanedKeys as $keyPath) {
-			$output->writeln('Orphaned key found: ' . $keyPath);
+			$output->writeln('Orphaned key found: '.$keyPath);
 		}
 		if (count($orphanedKeys) == 0) {
 			return self::SUCCESS;
@@ -95,7 +95,7 @@ 
 			$folder = $this->rootFolder->get($folderPath);
 		} catch (NotFoundException $e) {
 			// Happens when user doesn't have encrypted files
-			$this->logger->error('Error when accessing folder ' . $folderPath . ' for user ' . $user, ['exception' => $e]);
+			$this->logger->error('Error when accessing folder '.$folderPath.' for user '.$user, ['exception' => $e]);
 			return [];
 		}
 
@@ -105,10 +105,10 @@ 
 		}
 
 		foreach ($folder->getDirectoryListing() as $item) {
-			$path = $folderPath . '/' . $item->getName();
+			$path = $folderPath.'/'.$item->getName();
 			$stopValue = $this->stopCondition($path);
 			if ($stopValue === null) {
-				$this->logger->error('Reached unexpected state when scanning user\'s filesystem for orphaned encryption keys' . $path);
+				$this->logger->error('Reached unexpected state when scanning user\'s filesystem for orphaned encryption keys'.$path);
 			} elseif ($stopValue) {
 				$filePath = str_replace('files_encryption/keys/', '', $path);
 				try {
@@ -139,7 +139,7 @@ 
 				if ($subfolder instanceof Folder) {
 					$content = $subfolder->getDirectoryListing();
 					if (count($content) === 1 && $content[0] instanceof File) {
-						return strtolower($content[0]->getExtension()) === 'sharekey' ;
+						return strtolower($content[0]->getExtension()) === 'sharekey';
 					}
 				}
 			}
@@ -153,10 +153,10 @@ 
 			$file = $this->rootFolder->get($key);
 			try {
 				$file->delete();
-				$output->writeln('Key deleted: ' . $key);
+				$output->writeln('Key deleted: '.$key);
 			} catch (\Exception $e) {
-				$output->writeln('Failed to delete  ' . $key);
-				$this->logger->error('Error when deleting orphaned key ' . $key . '. ' . $e->getMessage());
+				$output->writeln('Failed to delete  '.$key);
+				$this->logger->error('Error when deleting orphaned key '.$key.'. '.$e->getMessage());
 			}
 		}
 	}
@@ -169,12 +169,12 @@ 
 		} else {
 			try {
 				$this->rootFolder->get(trim($path))->delete();
-				$output->writeln('Key deleted: ' . $path);
+				$output->writeln('Key deleted: '.$path);
 			} catch (\Exception $e) {
-				$output->writeln('Failed to delete  ' . $path);
-				$this->logger->error('Error when deleting orphaned key ' . $path . '. ' . $e->getMessage());
+				$output->writeln('Failed to delete  '.$path);
+				$this->logger->error('Error when deleting orphaned key '.$path.'. '.$e->getMessage());
 			}
-			$orphanedKeys = array_filter($orphanedKeys, function ($k) use ($path) {
+			$orphanedKeys = array_filter($orphanedKeys, function($k) use ($path) {
 				return $k !== trim($path);
 			});
 		}