load encrypt password from env (#52)

Signed-off-by: rahul <[email protected]>

Author: rcsofttech85

src/FileEncryptor.php

@@ -3,7 +3,6 @@
 namespace Rcsofttech85\FileHandler;
 
 use Exception;
-use Rcsofttech85\FileHandler\DependencyInjection\ServiceContainer;
 use Rcsofttech85\FileHandler\Exception\FileEncryptorException;
 use Rcsofttech85\FileHandler\Exception\FileHandlerException;
 use Rcsofttech85\FileHandler\Validator\FileValidatorTrait;
@@ -15,10 +14,6 @@ final class FileEncryptor
 
     public const ENCRYPT_PASSWORD = 'ENCRYPT_PASSWORD';
 
-    public function __construct(private ServiceContainer $serviceContainer)
-    {
-    }
-
     /**
      *
      * @throws FileEncryptorException
@@ -40,9 +35,8 @@ public function encryptFile(string $filename): bool
 
         $nonce = random_bytes(SODIUM_CRYPTO_SECRETBOX_NONCEBYTES);
 
-        $container = $this->serviceContainer->getContainerBuilder();
 
-        $secret = $this->getParam($container, self::ENCRYPT_PASSWORD);
+        $secret = $this->getParam(self::ENCRYPT_PASSWORD);
 
         $key = hash('sha256', $secret, true);
 
@@ -87,9 +81,8 @@ public function decryptFile(string $filename): bool
         $nonce = substr($bytes, 0, SODIUM_CRYPTO_SECRETBOX_NONCEBYTES);
         $ciphertext = substr($bytes, SODIUM_CRYPTO_SECRETBOX_NONCEBYTES);
 
-        $container = $this->serviceContainer->getContainerBuilder();
 
-        $secret = $this->getParam($container, self::ENCRYPT_PASSWORD);
+        $secret = $this->getParam(self::ENCRYPT_PASSWORD);
 
         $key = hash('sha256', $secret, true);
 

src/FileHashChecker.php

@@ -35,7 +35,7 @@ public function __construct(private readonly CsvFileHandler $csvFileHandler)
 
     public function verifyHash(string $filename, string $algo = self::ALGO_256): bool
     {
-        $storedHashesFile = $this->getParameter(self::STORED_HASH_FILE);
+        $storedHashesFile = $this->getParam(self::STORED_HASH_FILE);
         $file = $this->csvFileHandler->searchInCsvFile(
             filename: $storedHashesFile,
             keyword: $filename,
@@ -62,8 +62,10 @@ public function verifyHash(string $filename, string $algo = self::ALGO_256): boo
     /**
      * @param string $filename
      * @param string $algo
+     * @param string $env
      * @return string
-     * @throws HashException|FileHandlerException
+     * @throws FileHandlerException
+     * @throws HashException
      */
 
     public function hashFile(
@@ -80,7 +82,7 @@ public function hashFile(
             throw new HashException('could not hash file');
         }
 
-        $storedHashesFile = $this->getParameter($env);
+        $storedHashesFile = $this->getParam($env);
 
 
         $file = fopen($storedHashesFile, 'a+');
@@ -100,7 +102,7 @@ public function hashFile(
             if (!$filenameExists) {
                 fputcsv($file, [$filename, $hash]);
             }
-        } catch (FileHandlerException) {
+        } catch (FileHandlerException $e) {
             fputcsv($file, [$filename, $hash]);
         } finally {
             fclose($file);

src/Validator/FileValidatorTrait.php

@@ -55,7 +55,7 @@ public function sanitize(string $filename): string
      */
     private function isFileSafe(string $filename, string $envVariable): bool
     {
-        $safeFile = $this->getParameter($envVariable);
+        $safeFile = $this->getParam($envVariable);
 
 
         if ($safeFile !== $filename) {
@@ -69,31 +69,32 @@ private function isFileSafe(string $filename, string $envVariable): bool
      * @param string $filename
      * @param string $envVariable
      * @return bool
+     * @throws FileHandlerException
      */
     public function isFileRestricted(string $filename, string $envVariable): bool
     {
         return $this->isFileSafe($filename, $envVariable);
     }
 
     /**
-     * @param string $param
-     * @return string
-     * @throws FileHandlerException
+     * @return ContainerBuilder
      */
-    private function getParameter(string $param): string
+    private function getContainerBuilder(): ContainerBuilder
     {
-        $container = (new ServiceContainer())->getContainerBuilder();
-        return $this->getParam($container, $param);
+        return (new ServiceContainer())->getContainerBuilder();
     }
 
     /**
-     * @param ContainerBuilder $container
      * @param string $parameter
+     * @param ContainerBuilder|null $container
      * @return string
      * @throws FileHandlerException
      */
-    public function getParam(ContainerBuilder $container, string $parameter): string
+    public function getParam(string $parameter, ContainerBuilder $container = null): string
     {
+        if (null === $container) {
+            $container = $this->getContainerBuilder();
+        }
         $param = $container->getParameter($parameter);
         if (!is_string($param)) {
             throw new FileHandlerException("{$parameter} is not string type");

src/config/services.yaml

@@ -1,13 +1,10 @@
 services:
-  container:
-    class: 'Rcsofttech85\FileHandler\DependencyInjection\ServiceContainer'
-
   file_handler:
     class: 'Rcsofttech85\FileHandler\FileHandler'
 
   file_encryptor:
     class: 'Rcsofttech85\FileHandler\FileEncryptor'
-    arguments: [ '@container' ]
+
 
 
   temp_file_handler:

tests/unit/FileValidatorTest.php

@@ -52,7 +52,7 @@ public function getParamMethodValidateForStringType(): void
         $container->setParameter('arr', []);
         $this->expectException(FileHandlerException::class);
         $this->expectExceptionMessage("arr is not string type");
-        $this->getParam($container, 'arr');
+        $this->getParam('arr', $container);
     }
 
     #[Test]