Hardunlink for directory + typo

24eme · Jul 30, 2024 · 356d8a4 · 356d8a4
1 parent aa16fe6
commit 356d8a4
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/app.php b/app.php
@@ -311,8 +311,11 @@ function($f3) {
         if($f3->get('DEBUG')) {
             return;
         }
-
-        array_map('unlink', glob($finalFile."*"));
+        if ($f3->get('PDF_STORAGE_PATH') != $sharingFolder && $cryptor->isEncrypted()) {
+            CryptographyClass::hardUnlink($sharingFolder);
+        } else {
+            array_map('unlink', glob($finalFile."*"));
+        }
     }
 );
 

diff --git a/lib/cryptography.class.php b/lib/cryptography.class.php
@@ -30,7 +30,7 @@ public function encrypt() {
             $command = "gpg --batch --passphrase $this->symmetricKey --symmetric --cipher-algo AES256 -o $outputFile $file";
             $result = shell_exec($command);
             if ($result) {
-                echo "Cypher failure";
+                echo "Cipher failure";
                 return $result;
             }
             $this->hardUnlink($file);
@@ -46,15 +46,15 @@ public function decrypt() {
         if (!$this->symmetricKey) {
             return false;
         }
-        $decryptFolder = sys_get_temp_dir()."/".uniqid('pdfsignature.'.getmypid(), true);
+        $decryptFolder = sys_get_temp_dir()."/".uniqid('pdfsignature.decrypted.'.getmypid(), true);
         echo $decryptFolder."\n";
         mkdir($decryptFolder);
         foreach ($this->getFiles(true) as $file) {
             $outputFile = $decryptFolder."/".str_replace(".gpg", "", basename($file));
             $command = "gpg --batch --passphrase $this->symmetricKey --decrypt -o $outputFile $file";
             $result = shell_exec($command);
             if ($result) {
-                throw new Exception("Decypher failure");
+                throw new Exception("Decipher failure");
             }
         }
         return $decryptFolder;
@@ -68,6 +68,13 @@ public static function hardUnlink($element) {
         if (!$element) {
             return;
         }
+        if (is_dir($element)) {
+            foreach (glob($element.'/*') as $file) {
+                self::hardUnlink($file);
+            }
+            rmdir($element);
+            return;
+        }
         $eraser = str_repeat(0, strlen(file_get_contents($element)));
         file_put_contents($element, $eraser);
         unlink($element);