mybase 1.0.37 → 1.0.39

package/README.md

@@ -36,6 +36,10 @@ var { isLocal } = require('mybase')
 
 ### arrayRandomItem(array,defaultValue=false)
 ### maxmindOpen(geoipFile) : <Promise>
+
+## Encryption
+### decryptAES_CBC_NOIV(encryptedHex, encryptionKey)
+### encryptAES_CBC_NOIV(plainString, encryptionKey)
 ```
     var handle = await maxmindOpen(config.geoip.country)
 ```

package/mybase.js

@@ -1,3 +1,4 @@
+const aesjs = require("aes-js")
 const debug = require('debug')('mybase')
 const os = require('os')
 const fs = require('fs')
@@ -23,7 +24,9 @@ function validHPassword(hpassword) { return (hpassword && hpassword.length === 1
 function validEmail_old(email) { return (/^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{2,3})+$/.test(email)) }
 
 function validEmail(email) { 
-    return validator.isEmail(email)
+    if (typeof email==='string')
+        return validator.isEmail(email) // validator needs a string
+    return false
     // giving up old style, was not reliable
     // taken from https://www.w3resource.com/javascript/form/email-validation.php
     // strange looking emails might be indeed valid
@@ -498,8 +501,36 @@ function int2ip (ipInt) {
 function ip2int(ip) {
     return ip.split('.').reduce(function(ipInt, octet) { return (ipInt<<8) + parseInt(octet, 10)}, 0) >>> 0;
 }
+function encryptAES_CBC_NOIV(plainString, encryptionKey) {
+    try {
+        const key = aesjs.utils.utf8.toBytes(encryptionKey); // 16,32 Bytes = 128,256 bits = AES128,AES256
+        const textBytes = aesjs.utils.utf8.toBytes(plainString);
+        const aesCbc = new aesjs.ModeOfOperation.cbc(key);
+        const encryptedBytes = aesCbc.encrypt(aesjs.padding.pkcs7.pad(textBytes, 16));
+        return aesjs.utils.hex.fromBytes(encryptedBytes);
+    } catch (err) {
+        // console.log(err)
+        return false
+    }
+}
+
+function decryptAES_CBC_NOIV(encryptedHex, encryptionKey) {
+    try {
+        const key = aesjs.utils.utf8.toBytes(encryptionKey); // 16,32 Bytes = 128,256 bits = AES128,AES256
+        const encryptedBytes = aesjs.utils.hex.toBytes(encryptedHex);
+        const aesCbc = new aesjs.ModeOfOperation.cbc(key);
+        const decryptedBytes = aesjs.padding.pkcs7.strip(aesCbc.decrypt(encryptedBytes));
+        return aesjs.utils.utf8.fromBytes(decryptedBytes);
+
+    } catch (err) {
+        // console.log(err)
+        return false
+    }
+}
 
 module.exports = {
+    encryptAES_CBC_NOIV,
+    decryptAES_CBC_NOIV,
     ip2int,int2ip,
     canReadAndWrite,
     softexit,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mybase",
-  "version": "1.0.37",
+  "version": "1.0.39",
   "description": "",
   "main": "mybase.js",
   "scripts": {
@@ -10,6 +10,7 @@
   "license": "ISC",
   "dependencies": {
     "@7c/validurl": "0.0.3",
+    "aes-js": "^3.1.2",
     "chalk": "^3.0.0",
     "debug": "^4.3.1",
     "punycode": "^2.1.1",