@nivinjoseph/n-sec 5.0.3 → 5.0.5

package/dist/bin.d.ts

@@ -0,0 +1,2 @@
+#!/usr/bin/env node
+export {};

package/dist/bin.js

@@ -0,0 +1,41 @@
+#!/usr/bin/env node
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+// import { given } from "@nivinjoseph/n-defensive";
+const n_util_1 = require("@nivinjoseph/n-util");
+const symmetric_encryption_1 = require("./crypto/symmetric-encryption");
+var SupportedCommands;
+(function (SupportedCommands) {
+    SupportedCommands["generateSymmetricKey"] = "generate-symmetric-key";
+})(SupportedCommands || (SupportedCommands = {}));
+const supportedCommandsString = JSON.stringify(n_util_1.TypeHelper.enumTypeToTuples(SupportedCommands).map(t => t[1]));
+function executeCommand(command) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        // given(command, "command").ensureHasValue().ensureIsString();
+        switch (command) {
+            case SupportedCommands.generateSymmetricKey:
+                {
+                    const key = yield symmetric_encryption_1.SymmetricEncryption.generateKey();
+                    console.log("SYMMETRIC KEY => ", key);
+                    break;
+                }
+            default:
+                console.error(`Unknown command '${command}'. Supported commands are ${supportedCommandsString}.`);
+        }
+    });
+}
+const args = process.argv.slice(2);
+if (args.length !== 1) {
+    console.error(`Please enter a single command. Supported commands are ${supportedCommandsString}.`);
+    process.exit(1); //an error occurred
+}
+const command = args[0];
+executeCommand(command)
+    .then(() => process.exit(0))
+    .catch(e => {
+    console.error("Error occurred");
+    console.error(e);
+    process.exit(1);
+});
+//# sourceMappingURL=bin.js.map

package/dist/bin.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"bin.js","sourceRoot":"","sources":["../src/bin.ts"],"names":[],"mappings":";;;;AAEA,oDAAoD;AACpD,gDAAiD;AACjD,wEAAoE;AAEpE,IAAK,iBAGJ;AAHD,WAAK,iBAAiB;IAElB,oEAA+C,CAAA;AACnD,CAAC,EAHI,iBAAiB,KAAjB,iBAAiB,QAGrB;AAED,MAAM,uBAAuB,GAAG,IAAI,CAAC,SAAS,CAAC,mBAAU,CAAC,gBAAgB,CAAC,iBAAiB,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAE9G,SAAe,cAAc,CAAC,OAA0B;;QAEpD,+DAA+D;QAE/D,QAAQ,OAAO,EACf;YACI,KAAK,iBAAiB,CAAC,oBAAoB;gBACvC;oBACI,MAAM,GAAG,GAAG,MAAM,0CAAmB,CAAC,WAAW,EAAE,CAAC;oBACpD,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE,GAAG,CAAC,CAAC;oBACtC,MAAM;iBACT;YACL;gBACI,OAAO,CAAC,KAAK,CAAC,oBAAoB,OAAO,6BAA6B,uBAAuB,GAAG,CAAC,CAAC;SACzG;IACL,CAAC;CAAA;AAED,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;AAEnC,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EACrB;IACI,OAAO,CAAC,KAAK,CAAC,yDAAyD,uBAAuB,GAAG,CAAC,CAAC;IACnG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,mBAAmB;CACvC;AAED,MAAM,OAAO,GAAG,IAAI,CAAC,CAAC,CAAsB,CAAC;AAE7C,cAAc,CAAC,OAAO,CAAC;KAClB,IAAI,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;KAC3B,KAAK,CAAC,CAAC,CAAC,EAAE;IAEP,OAAO,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;IAChC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IACjB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AACpB,CAAC,CAAC,CAAC"}

package/dist/crypto/hash.js

@@ -26,7 +26,8 @@ class Hash {
         };
         const valueReverse = reverse(value);
         const saltReverse = reverse(salt);
-        const saltedValue = "{1}{0}{2}{1}{3}{1}{2}".format(value, salt, valueReverse, saltReverse);
+        // const saltedValue = "{1}{0}{2}{1}{3}{1}{2}".format(value, salt, valueReverse, saltReverse);
+        const saltedValue = `${salt}${value}${valueReverse}${salt}${saltReverse}${salt}${valueReverse}`;
         return Hash.create(saltedValue);
     }
 }

package/dist/crypto/hash.js.map

@@ -1 +1 @@
-{"version":3,"file":"hash.js","sourceRoot":"","sources":["../../src/crypto/hash.ts"],"names":[],"mappings":";;;AAAA,0DAAiD;AACjD,iCAAiC;AAGjC,SAAS;AACT,MAAa,IAAI;IAEb,gBAAwB,CAAC;IAGlB,MAAM,CAAC,MAAM,CAAC,KAAa;QAE9B,IAAA,mBAAK,EAAC,KAAK,EAAE,OAAO,CAAC,CAAC,cAAc,EAAE,CAAC,cAAc,EAAE,CAAC;QACxD,KAAK,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;QAErB,MAAM,IAAI,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;QACzC,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAC3B,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE,CAAC;IAC5C,CAAC;IAEM,MAAM,CAAC,eAAe,CAAC,KAAa,EAAE,IAAY;QAErD,IAAA,mBAAK,EAAC,KAAK,EAAE,OAAO,CAAC,CAAC,cAAc,EAAE,CAAC,cAAc,EAAE,CAAC;QACxD,IAAA,mBAAK,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC,cAAc,EAAE,CAAC,cAAc,EAAE,CAAC;QAEtD,KAAK,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;QACrB,IAAI,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;QAEnB,MAAM,OAAO,GAAG,CAAC,GAAW,EAAU,EAAE;YAEpC,IAAI,GAAG,GAAG,EAAE,CAAC;YACb,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,CAAC,EAAE;gBAC/B,GAAG,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC;YACvB,OAAO,GAAG,CAAC;QACf,CAAC,CAAC;QAEF,MAAM,YAAY,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC;QACpC,MAAM,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;QAElC,MAAM,WAAW,GAAG,uBAAuB,CAAC,MAAM,CAAC,KAAK,EAAE,IAAI,EAAE,YAAY,EAAE,WAAW,CAAC,CAAC;QAE3F,OAAO,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IACpC,CAAC;CACJ;AAtCD,oBAsCC"}
+{"version":3,"file":"hash.js","sourceRoot":"","sources":["../../src/crypto/hash.ts"],"names":[],"mappings":";;;AAAA,0DAAiD;AACjD,iCAAiC;AAGjC,SAAS;AACT,MAAa,IAAI;IAEb,gBAAwB,CAAC;IAGlB,MAAM,CAAC,MAAM,CAAC,KAAa;QAE9B,IAAA,mBAAK,EAAC,KAAK,EAAE,OAAO,CAAC,CAAC,cAAc,EAAE,CAAC,cAAc,EAAE,CAAC;QACxD,KAAK,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;QAErB,MAAM,IAAI,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;QACzC,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAC3B,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE,CAAC;IAC5C,CAAC;IAEM,MAAM,CAAC,eAAe,CAAC,KAAa,EAAE,IAAY;QAErD,IAAA,mBAAK,EAAC,KAAK,EAAE,OAAO,CAAC,CAAC,cAAc,EAAE,CAAC,cAAc,EAAE,CAAC;QACxD,IAAA,mBAAK,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC,cAAc,EAAE,CAAC,cAAc,EAAE,CAAC;QAEtD,KAAK,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;QACrB,IAAI,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;QAEnB,MAAM,OAAO,GAAG,CAAC,GAAW,EAAU,EAAE;YAEpC,IAAI,GAAG,GAAG,EAAE,CAAC;YACb,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,CAAC,EAAE;gBAC/B,GAAG,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC;YACvB,OAAO,GAAG,CAAC;QACf,CAAC,CAAC;QAEF,MAAM,YAAY,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC;QACpC,MAAM,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;QAElC,8FAA8F;QAE9F,MAAM,WAAW,GAAG,GAAG,IAAI,GAAG,KAAK,GAAG,YAAY,GAAG,IAAI,GAAG,WAAW,GAAG,IAAI,GAAG,YAAY,EAAE,CAAC;QAEhG,OAAO,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IACpC,CAAC;CACJ;AAxCD,oBAwCC"}

package/dist/index.d.ts

@@ -1,3 +1,4 @@
+import "@nivinjoseph/n-ext";
 import { SymmetricEncryption } from "./crypto/symmetric-encryption";
 import { Hmac } from "./crypto/hmac";
 import { Hash } from "./crypto/hash";

package/dist/index.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SecurityToken = exports.JsonWebToken = exports.InvalidTokenException = exports.ExpiredTokenException = exports.ClaimsIdentity = exports.Claim = exports.AlgType = exports.CryptoException = exports.Hash = exports.Hmac = exports.SymmetricEncryption = void 0;
+require("@nivinjoseph/n-ext");
 const symmetric_encryption_1 = require("./crypto/symmetric-encryption");
 Object.defineProperty(exports, "SymmetricEncryption", { enumerable: true, get: function () { return symmetric_encryption_1.SymmetricEncryption; } });
 const hmac_1 = require("./crypto/hmac");

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,wEAAoE;AAkBhE,oGAlBK,0CAAmB,OAkBL;AAjBvB,wCAAqC;AAiBZ,qFAjBhB,WAAI,OAiBgB;AAhB7B,wCAAqC;AAgBN,qFAhBtB,WAAI,OAgBsB;AAfnC,iEAAiE;AACjE,yEAAyE;AACzE,gEAA4D;AAexD,gGAfK,kCAAe,OAeL;AAbnB,sDAAkD;AAe9C,wFAfK,kBAAO,OAeL;AAdX,gDAA6C;AAchC,sFAdJ,aAAK,OAcI;AAblB,oEAAgE;AAa5C,+FAbX,gCAAc,OAaW;AAZlC,oFAA+E;AAY3C,sGAZ3B,+CAAqB,OAY2B;AAXzD,oFAA+E;AAWpB,sGAXlD,+CAAqB,OAWkD;AAVhF,kEAA6D;AAUqB,6FAVzE,6BAAY,OAUyE;AAT9F,kEAA8D;AASkC,8FATvF,8BAAa,OASuF"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,8BAA4B;AAE5B,wEAAoE;AAkBhE,oGAlBK,0CAAmB,OAkBL;AAjBvB,wCAAqC;AAiBZ,qFAjBhB,WAAI,OAiBgB;AAhB7B,wCAAqC;AAgBN,qFAhBtB,WAAI,OAgBsB;AAfnC,iEAAiE;AACjE,yEAAyE;AACzE,gEAA4D;AAexD,gGAfK,kCAAe,OAeL;AAbnB,sDAAkD;AAe9C,wFAfK,kBAAO,OAeL;AAdX,gDAA6C;AAchC,sFAdJ,aAAK,OAcI;AAblB,oEAAgE;AAa5C,+FAbX,gCAAc,OAaW;AAZlC,oFAA+E;AAY3C,sGAZ3B,+CAAqB,OAY2B;AAXzD,oFAA+E;AAWpB,sGAXlD,+CAAqB,OAWkD;AAVhF,kEAA6D;AAUqB,6FAVzE,6BAAY,OAUyE;AAT9F,kEAA8D;AASkC,8FATvF,8BAAa,OASuF"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@nivinjoseph/n-sec",
-    "version": "5.0.3",
+    "version": "5.0.5",
     "description": "Security library",
     "main": "./dist/index.js",
     "types": "./dist/index.d.ts",
@@ -17,6 +17,7 @@
         "test-ci": "mocha --timeout 5000 --reporter spec --ui tdd --require ts-node/register './test/**/*.test.js'",
         "publish-package": "npm run ts-build-dist && git add . && git commit -m 'preparing to publish new version' && npm version patch && git push && npm publish --access=public"
     },
+    "bin": "./dist/bin.js",
     "repository": {
         "type": "git",
         "url": "git+https://github.com/nivinjoseph/n-sec.git"
@@ -44,6 +45,7 @@
     "dependencies": {
         "@nivinjoseph/n-defensive": "^1.0.41",
         "@nivinjoseph/n-exception": "^1.0.26",
-        "@nivinjoseph/n-ext": "^1.1.36"
+        "@nivinjoseph/n-ext": "^1.1.36",
+        "@nivinjoseph/n-util": "^1.0.81"
     }
 }

package/src/bin.ts

@@ -0,0 +1,49 @@
+#!/usr/bin/env node
+
+// import { given } from "@nivinjoseph/n-defensive";
+import { TypeHelper } from "@nivinjoseph/n-util";
+import { SymmetricEncryption } from "./crypto/symmetric-encryption";
+
+enum SupportedCommands
+{
+    generateSymmetricKey = "generate-symmetric-key"
+}
+
+const supportedCommandsString = JSON.stringify(TypeHelper.enumTypeToTuples(SupportedCommands).map(t => t[1]));
+
+async function executeCommand(command: SupportedCommands): Promise<void>
+{
+    // given(command, "command").ensureHasValue().ensureIsString();
+
+    switch (command)
+    {
+        case SupportedCommands.generateSymmetricKey:
+            {
+                const key = await SymmetricEncryption.generateKey();
+                console.log("SYMMETRIC KEY => ", key);
+                break;
+            }
+        default:
+            console.error(`Unknown command '${command}'. Supported commands are ${supportedCommandsString}.`);
+    }
+}
+
+const args = process.argv.slice(2);
+
+if (args.length !== 1)
+{   
+    console.error(`Please enter a single command. Supported commands are ${supportedCommandsString}.`);
+    process.exit(1); //an error occurred
+}
+
+const command = args[0] as SupportedCommands;
+
+executeCommand(command)
+    .then(() => process.exit(0))
+    .catch(e =>
+    {
+        console.error("Error occurred");
+        console.error(e);
+        process.exit(1);
+    });
+

package/src/crypto/hash.ts

@@ -37,7 +37,9 @@ export class Hash
         const valueReverse = reverse(value);
         const saltReverse = reverse(salt);
 
-        const saltedValue = "{1}{0}{2}{1}{3}{1}{2}".format(value, salt, valueReverse, saltReverse);
+        // const saltedValue = "{1}{0}{2}{1}{3}{1}{2}".format(value, salt, valueReverse, saltReverse);
+        
+        const saltedValue = `${salt}${value}${valueReverse}${salt}${saltReverse}${salt}${valueReverse}`;
         
         return Hash.create(saltedValue);
     }

package/src/index.ts

@@ -1,3 +1,5 @@
+import "@nivinjoseph/n-ext";
+
 import { SymmetricEncryption } from "./crypto/symmetric-encryption";
 import { Hmac } from "./crypto/hmac";
 import { Hash } from "./crypto/hash";

package/test/hash.test.ts

@@ -149,6 +149,21 @@ suite("Hash", () =>
             Assert.notStrictEqual(hash1, hash2);
         });
         
+        test("regex issue", () =>
+        {
+            let password = "YQAt3TPI7s1YXyClbQ2$&JdHOKZJ@z4!";
+            password = password.trim();
+
+            const createdAt = Date.now();
+            const username = "defaultUser";
+            
+            const salt = (createdAt % 2) === 0
+                ? `${username.base64Decode()}${createdAt}`
+                : `${createdAt}${username.base64Decode()}`;
+
+            return Hash.createUsingSalt(password, salt);
+        });
+