5htp-core 0.2.7-2 → 0.2.7-4

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "5htp-core",
 	"description": "Convenient TypeScript framework designed for Performance and Productivity.",
-	"version": "0.2.7-2",
+	"version": "0.2.7-4",
 	"author": "Gaetan Le Gac (https://github.com/gaetanlegac)",
 	"repository": "git://github.com/gaetanlegac/5htp-core.git",
 	"license": "MIT",

package/src/server/services/console/index.ts

@@ -213,6 +213,8 @@ export default class Console extends Service<Config, Hooks, Application> {
             console.error(`Error caused by this query:`, printedQuery);
         }
         console.error(LogPrefix, `Sending bug report for the following error:`, error);
+        if (error.dataForDebugging !== undefined)
+            console.error(LogPrefix, `More data about the error:`, error.dataForDebugging);
 
         // Prevent spamming the mailbox if infinite loop 
         const bugId = ['server', request?.user?.name, undefined, error.message].filter(e => !!e).join('::');

package/src/server/services/security/encrypt/aes.ts

@@ -3,7 +3,7 @@
 ----------------------------------*/
 
 // Nodejs
-import crypto from 'crypto';
+import crypto, { Encoding } from 'crypto';
 
 // Core
 import Application, { Service } from '@server/app';
@@ -20,7 +20,11 @@ import { Forbidden } from '@common/errors';
 
 export type Config = {
     debug?: boolean,
+    // Initialisation vector
+    // Generate one here: https://www.allkeysgenerator.com/Random/Security-Encryption-Key-Generator.aspx
     iv: string,
+    // Define usage-specific keys
+    // You can also generate one via the link upper
     keys: {[keyName: string]: string}
 }
 
@@ -28,6 +32,14 @@ export type Hooks = {
 
 }
 
+type TEncryptOptions = {
+    encoding: Encoding
+}
+
+type TDecryptOptions = {
+    encoding: Encoding
+}
+
 /*----------------------------------
 - SERVICE
 ----------------------------------*/
@@ -41,27 +53,31 @@ export default class AES<TConfig extends Config = Config> extends Service<TConfi
 
     }
 
-    public encrypt( keyName: keyof TConfig["keys"], data: any ) {
+    public encrypt( keyName: keyof TConfig["keys"], data: any, options: TEncryptOptions = {
+        encoding: 'base64url'
+    }) {
 
         const encKey = this.config.keys[ keyName as keyof typeof this.config.keys ];
 
         data = JSON.stringify(data);
 
         let cipher = crypto.createCipheriv('aes-256-cbc', encKey, this.config.iv);
-        let encrypted = cipher.update(data, 'utf8', 'base64');
-        encrypted += cipher.final('base64');
+        let encrypted = cipher.update(data, 'utf8', options.encoding);
+        encrypted += cipher.final(options.encoding);
         return encrypted;
         
     }
 
-    public decrypt( keyName: keyof TConfig["keys"], data: string ) {
+    public decrypt( keyName: keyof TConfig["keys"], data: string, options: TDecryptOptions = {
+        encoding: 'base64url'
+    }) {
 
         const encKey = this.config.keys[ keyName as keyof typeof this.config.keys ];
 
         try {
 
             let decipher = crypto.createDecipheriv('aes-256-cbc', encKey, this.config.iv);
-            let decrypted = decipher.update(data, 'base64', 'utf8');
+            let decrypted = decipher.update(data, options.encoding, 'utf8');
             return JSON.parse(decrypted + decipher.final('utf8'));
 
         } catch (error) {