Use laravel default logging

VisualAppeal · Dec 11, 2018 · 5261014 · 5261014
1 parent b999079
commit 5261014
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 64 deletions.
diff --git a/composer.json b/composer.json
@@ -21,6 +21,7 @@
         "php": ">= 7.2",
         "ext-sodium": "*",
         "illuminate/database": ">= 5.7",
+        "illuminate/encryption" : ">= 5.7",
         "illuminate/support": ">= 5.7",
         "monolog/monolog": ">= 1"
     },

diff --git a/src/DatabaseHandler.php b/src/DatabaseHandler.php
@@ -2,6 +2,7 @@
 
 namespace VisualAppeal\DatabaseLogger;
 
+use Illuminate\Container\Container;
 use Illuminate\Support\Facades\DB;
 
 use Monolog\Handler\AbstractProcessingHandler;
@@ -88,69 +89,6 @@ public function setEncryptionKey(string $encryptionKey): DatabaseHandler
         return $this;
     }
 
-    /**
-     * Encrypt the context.
-     *
-     * @param mixed $data
-     * @return string
-     * @throws \Exception
-     */
-    public function encrypt($data): string
-    {
-        $nonce = random_bytes(
-            SODIUM_CRYPTO_SECRETBOX_NONCEBYTES
-        );
-
-        $cipher = base64_encode(
-            $nonce.
-            sodium_crypto_secretbox(
-                $data,
-                $nonce,
-                $this->encryptionKey
-            )
-        );
-        sodium_memzero($data);
-        sodium_memzero($this->encryptionKey);
-
-        return $cipher;
-    }
-
-    /**
-     * Decrypt the context.
-     *
-     * @param $data
-     * @return bool|string
-     * @throws \Exception
-     */
-    public function decrypt($data)
-    {
-        $decoded = base64_decode($data);
-
-        if ($decoded === false) {
-            throw new \Exception('The encoding failed');
-        }
-        if (mb_strlen($decoded, '8bit') < (SODIUM_CRYPTO_SECRETBOX_NONCEBYTES + SODIUM_CRYPTO_SECRETBOX_MACBYTES)) {
-            throw new \Exception('The message was truncated');
-        }
-        $nonce = mb_substr($decoded, 0, SODIUM_CRYPTO_SECRETBOX_NONCEBYTES, '8bit');
-        $ciphertext = mb_substr($decoded, SODIUM_CRYPTO_SECRETBOX_NONCEBYTES, null, '8bit');
-
-        $plain = sodium_crypto_secretbox_open(
-            $ciphertext,
-            $nonce,
-            $this->encryptionKey
-        );
-
-        if ($plain === false) {
-            throw new \Exception('The message was tampered with in transit');
-        }
-
-        sodium_memzero($ciphertext);
-        sodium_memzero($this->encryptionKey);
-
-        return $plain;
-    }
-
     /**
      * {@inheritdoc}
      */
@@ -161,7 +99,7 @@ protected function write(array $record)
         } else {
             try {
                 if ($this->encryption) {
-                    $context = $this->encrypt($record['context']);
+                    $context = Container::getInstance()->make('encrypter')->encrypt($record['context']);
                 } else {
                     $context = serialize($record['context']);
                 }