Merge pull request #236 from nextcloud/fix/handle-encryption-errors

Handle encryption error

2 files changed, 13 insertions, 2 deletions

diff --git a/lib/Scanner/ScannerBase.php b/lib/Scanner/ScannerBase.php
index 65d1ae3..1e93572 100644
--- a/lib/Scanner/ScannerBase.php
+++ b/lib/Scanner/ScannerBase.php
@@ -111,8 +111,14 @@ abstract class ScannerBase implements IScanner {
 	public function scan(Item $item): Status {
 		$this->initScanner();
 
-		while (false !== ($chunk = $item->fread())) {
-			$this->writeChunk($chunk);
+		try {
+			while (false !== ($chunk = $item->fread())) {
+				$this->writeChunk($chunk);
+			}
+		} catch (\OCP\Encryption\Exceptions\GenericEncryptionException $e) {
+			// We can't read the file, ignore
+			$this->status->setNumericStatus(Status::SCANRESULT_CLEAN);
+			return $this->getStatus();
 		}
 
 		$this->shutdownScanner();
diff --git a/tests/stub.phpstub b/tests/stub.phpstub
index 2a961dd..8d25d21 100644
--- a/tests/stub.phpstub
+++ b/tests/stub.phpstub
@@ -40,6 +40,11 @@ namespace {
 	}
 }
 
+namespace OC {
+    class HintException extends \Exception {
+    }
+}
+
 namespace OC\Hooks {
 	class Emitter {
 	}