mdkcontroller 1.3.0 → 1.3.1

package/dk_modules/authorization.js

@@ -1,20 +1,7 @@
-import child_process from "child_process";
-
-function isCalledFromNodeModules() {
-    const error = new Error();
-    const stackLines = error.stack.split('\n');
-    // Bỏ qua dòng đầu tiên vì đó là thông tin của Error
-    for (let i = 1; i < stackLines.length; i++) {
-        if (stackLines[i].includes('node_modules')) {
-            return true;
-        }
-    }
-    return false;
-}
+import { decrypt, encrypt } from "./dkEncrypC.js";
 
 export default function () {
 
-    const isModule = isCalledFromNodeModules();
     const validateBase = function name(req, res) {
         const db = global.db;
         db.data.loginTokens = db.data.loginTokens || [];
@@ -43,16 +30,15 @@ export default function () {
         }
     }
     console.log(
-        "Module dk_modules/authorization.js: ()=>{ validate:fn, validateBool:fn }"
+        "Module dk_modules/authorization.js: ()=>{ validate:fn, validateBool:fn, encrypt:fn, decrypt:fn }"
     );
     return {
         validate: (req, res, next) => {
             const resultValidate = validateBase(req, res);
             switch (resultValidate) {
                 case 0:
-                    return res.status(401).json({ message: 'Token không được cung cấp' });
+                    return res.status(401).json({ message: 'Bạn cần đăng nhập trước khi thực hiện các yêu cầu đến endpoint này.' });
                 case 1:
-
                     next();
                     break;
                 case -1:
@@ -62,31 +48,11 @@ export default function () {
         validateBool: (req, res) => {
             return validateBase(req, res);
         },
-        encrypt: async function (data = "", pw = "mdkpaswoEcrHidDefat") {
-            const cdtoCmd = isModule ? "node_modules\\mdkcontroller\\" : "";
-            const cmd = data + " " + pw;
-            return new Promise((resolve, reject) => {
-                child_process.exec(`${cdtoCmd}dk_modules\\EncryptC\\DKEncryptCMD e ${cmd}`, (error, stdout, stderr) => {
-                    if (error) {
-                        reject(error);
-                        return;
-                    }
-                    resolve(stdout.trimEnd());
-                });
-            });
+        encrypt: function (data = "", pw = "mdkpaswoEcrHidDefat") {
+            return encrypt(data, pw);
         },
         decrypt: function (data = "", pw = "mdkpaswoEcrHidDefat") {
-            const cdtoCmd = isModule ? "node_modules\\mdkcontroller\\" : "";
-            const cmd = data + " " + pw;
-            return new Promise((resolve, reject) => {
-                child_process.exec(`${cdtoCmd}dk_modules\\EncryptC\\DKEncryptCMD d ${cmd}`, (error, stdout, stderr) => {
-                    if (error) {
-                        reject(error);
-                        return;
-                    }
-                    resolve(stdout);
-                });
-            });
+            return decrypt(data, pw);
         }
     }
 };

package/dk_modules/dkEncrypC.js

@@ -0,0 +1,33 @@
+import crypto from 'crypto';
+
+function normalizeKey32(inputKey) {
+    const length = 32;
+    if (inputKey.length > length) {
+        return inputKey.slice(0, length); // Cắt bớt nếu quá dài
+    }
+    return inputKey.padEnd(length, '0'); // Thêm '0' vào cuối nếu quá ngắn
+}
+
+export const encrypt = (text, keyTextMAX32) => {
+    const key = Buffer.from(normalizeKey32(keyTextMAX32), 'utf8');
+    const iv = crypto.randomBytes(16); // Vector khởi tạo
+    const cipher = crypto.createCipheriv('aes-256-cbc', Buffer.from(key, 'hex'), iv);
+    let encrypted = cipher.update(text, 'utf8', 'hex');
+    encrypted += cipher.final('hex');
+    return iv.toString('hex') + encrypted;
+}
+
+export const decrypt = (encryptedText, keyTextMAX32) => {
+    const key = Buffer.from(normalizeKey32(keyTextMAX32), 'utf8');
+    const iv = Buffer.from(encryptedText.slice(0, 32), 'hex');
+    const encryptedData = encryptedText.slice(32);
+    const decipher = crypto.createDecipheriv('aes-256-cbc', Buffer.from(key, 'hex'), iv);
+    let decrypted = decipher.update(encryptedData, 'hex', 'utf8');
+    decrypted += decipher.final('utf8');
+    return decrypted;
+}
+
+
+console.log(
+    "Module dk_modules/authorization.js: {  encrypt:fn, decrypt:fn }"
+);

package/dk_modules/users.js

@@ -1,3 +1,4 @@
+import { console } from "inspector";
 import authInstant from "./authorization.js";
 import { getNumber } from "./autoSequence.js";
 
@@ -35,10 +36,11 @@ export default (router, db) => {
     router.post("/users/login", async (req, res) => {
         const bodyParser = req.body;
         if (bodyParser.userName && bodyParser.password) {
-            let userLoging = tbUser.find(f => f.userName == bodyParser.userName.toLowerCase() && f.password == bodyParser.password);
+
+            let userLoging = tbUser.find(f => f.userName == bodyParser.userName.toLowerCase().trim() && auth.decrypt(f.password) == bodyParser.password);
             if (userLoging) {
-                const userIdCode = await auth.encrypt(userLoging.userName);
-                const accessToken = userIdCode + global.generateRandomToken(100);
+                const userIdCode = auth.encrypt(userLoging.userName);
+                const accessToken = userIdCode + global.generateRandomString(100);
 
                 const expiredValue = new Date();
                 expiredValue.setMonth(expiredValue.getMonth() + 1);
@@ -89,7 +91,7 @@ export default (router, db) => {
                         id: getNumber('users'),
                         userName: bodyParser.userName.toLowerCase(),
                         email: bodyParser.email.toLowerCase(),
-                        password: bodyParser.password,
+                        password: auth.encrypt(bodyParser.password),
                         active: true,
                         amount: 0
                     });

package/package.json

@@ -1,15 +1,12 @@
 {
   "dependencies": {
-    "child_process": "^1.0.2",
     "cookie-parser": "^1.4.6",
     "express": "^4.18.2",
-    "fluent-ffmpeg": "^2.1.2",
-    "handlebars": "^4.7.8",
     "lowdb": "^7.0.1",
     "socket.io": "^4.7.2"
   },
   "name": "mdkcontroller",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "keywords": [],
   "author": "KHANHNBD <khanh272421@gmail.com>",
   "license": "ISC",

package/dk_modules/EncryptC/DKEncryptCMD.deps.json

@@ -1,23 +0,0 @@
-{
-  "runtimeTarget": {
-    "name": ".NETCoreApp,Version=v7.0",
-    "signature": ""
-  },
-  "compilationOptions": {},
-  "targets": {
-    ".NETCoreApp,Version=v7.0": {
-      "DKEncryptCMD/1.0.0": {
-        "runtime": {
-          "DKEncryptCMD.dll": {}
-        }
-      }
-    }
-  },
-  "libraries": {
-    "DKEncryptCMD/1.0.0": {
-      "type": "project",
-      "serviceable": false,
-      "sha512": ""
-    }
-  }
-}

package/dk_modules/EncryptC/DKEncryptCMD.runtimeconfig.json

@@ -1,9 +0,0 @@
-{
-  "runtimeOptions": {
-    "tfm": "net7.0",
-    "framework": {
-      "name": "Microsoft.NETCore.App",
-      "version": "7.0.0"
-    }
-  }
-}