Fix encryption:fix-encrypted-version command when encrypted is set to 0

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>

diff --git a/apps/encryption/lib/Command/FixEncryptedVersion.php b/apps/encryption/lib/Command/FixEncryptedVersion.php
index b3c0d8c4d1692597bdf55321fb3a8bbccfd101ee..d4c5eddbfe5ab845ecb8552c1c8fb7ac31b72301 100644 (file)
--- a/apps/encryption/lib/Command/FixEncryptedVersion.php
+++ b/apps/encryption/lib/Command/FixEncryptedVersion.php
@@ -175,6 +175,22 @@ class FixEncryptedVersion extends Command {
                        $handle = $this->view->fopen($path, 'rb');
 
                        if (\fread($handle, 9001) !== false) {
+                               $fileInfo = $this->view->getFileInfo($path);
+                               if (!$fileInfo) {
+                                       $output->writeln("<warning>File info not found for file: \"$path\"</warning>");
+                                       return true;
+                               }
+                               $encryptedVersion = $fileInfo->getEncryptedVersion();
+                               $stat = $this->view->stat($path);
+                               if (($encryptedVersion == 0) && isset($stat['hasHeader']) && ($stat['hasHeader'] == true)) {
+                                       // The file has encrypted to false but has an encryption header
+                                       if ($ignoreCorrectEncVersionCall === true) {
+                                               // Lets rectify the file by correcting encrypted version
+                                               $output->writeln("<info>Attempting to fix the path: \"$path\"</info>");
+                                               return $this->correctEncryptedVersion($path, $output);
+                                       }
+                                       return false;
+                               }
                                $output->writeln("<info>The file \"$path\" is: OK</info>");
                        }