@1auth/crypto 0.0.0-alpha.3 → 0.0.0-alpha.31

package/index.js

@@ -16,7 +16,7 @@ const options = {
   encryptionSharedKey: '',
   encryptionMethod: 'chacha20-poly1305', // AES-256 GCM (aes-256-gcm) or ChaCha20-Poly1305 (chacha20-poly1305)
 
-  digestAlgorithm: 'sha3-256',
+  digestAlgorithm: 'sha3-384',
   digestSalt: ''
 }
 
@@ -46,7 +46,7 @@ const generateKeyPair = promisify(generateKeyPairCallback)
 export const characterPoolSize = {
   keyboard: 94, // (26 + 10 + 11) * 2
   alphaNumeric: 62, // (26 + 10) * 2
-  base64: 64, // (26 + 10) * 2 + 2
+  base64: 64, // (26 * 2 + 10 + 2
   hex: 16,
   numeric: 10
 }
@@ -96,14 +96,17 @@ export const randomId = {
   type: 'id',
   entropy: 64,
   charPool: characterPoolSize.alphaNumeric,
-  create: async () => randomAlphaNumeric(randomId.entropy)
+  // TODO update to use https://github.com/jetpack-io/typeid
+  create: async (prefix) =>
+    (prefix ? prefix + '_' : '') + randomAlphaNumeric(randomId.entropy)
 }
 
 export const subject = {
   type: 'id',
   entropy: 64,
   charPool: characterPoolSize.alphaNumeric,
-  create: async () => randomAlphaNumeric(subject.entropy)
+  create: async (prefix) =>
+    (prefix ? prefix + '_' : '') + randomAlphaNumeric(subject.entropy)
 }
 
 export const session = {
@@ -111,7 +114,8 @@ export const session = {
   entropy: 128, // ASVS 3.2.2
   charPool: characterPoolSize.alphaNumeric,
   expire: 15 * 60,
-  create: async () => randomAlphaNumeric(session.entropy)
+  create: async (prefix) =>
+    (prefix ? prefix + '_' : '') + randomAlphaNumeric(session.entropy)
 }
 
 export const passwordSecret = {
@@ -259,16 +263,19 @@ export const makeSymetricKey = (assocData) => {
   return { encryptionKey, encryptedKey }
 }
 
+// assocData = sub or id
+export const encryptFields = (values, encryptedKey, assocData, fields = []) => {
+  // TODO optimize: don't decrypt encryptedKey more than once
+  for (const key of fields) {
+    values[key] &&= encrypt(values[key], encryptedKey, assocData)
+  }
+  return values
+}
+
 export const encrypt = (data, encryptedKey, assocData) => {
   if (!encryptedKey) return data
 
-  const encryptionKey = __decrypt(
-    encryptedKey,
-    Buffer.from(options.encryptionSharedKey, 'hex'),
-    assocData,
-    'hex',
-    'hex'
-  )
+  const encryptionKey = __decryptKey(encryptedKey, assocData)
   return __encrypt(
     data,
     Buffer.from(encryptionKey, 'hex'),
@@ -300,15 +307,17 @@ const __encrypt = (
   )
 }
 
+export const decryptFields = (values, encryptedKey, assocData, fields = []) => {
+  // TODO optimize: don't decrypt encryptedKey more than once
+  for (const key of fields) {
+    values[key] &&= decrypt(values[key], encryptedKey, assocData)
+  }
+  return values
+}
+
 export const decrypt = (encryptedData, encryptedKey, assocData) => {
   if (!options.encryptionSharedKey || !encryptedKey) return encryptedData
-  const encryptionKey = __decrypt(
-    encryptedKey,
-    Buffer.from(options.encryptionSharedKey, 'hex'),
-    assocData,
-    'hex',
-    'hex'
-  )
+  const encryptionKey = __decryptKey(encryptedKey, assocData)
   const data = __decrypt(
     encryptedData,
     Buffer.from(encryptionKey, 'hex'),
@@ -319,6 +328,15 @@ export const decrypt = (encryptedData, encryptedKey, assocData) => {
   return data
 }
 
+const __decryptKey = (encryptedKey, assocData) =>
+  __decrypt(
+    encryptedKey,
+    Buffer.from(options.encryptionSharedKey, 'hex'),
+    assocData,
+    'hex',
+    'hex'
+  )
+
 const __decrypt = (
   data,
   encryptionKey,
@@ -366,14 +384,14 @@ export const makeAsymmetricKeys = async (encryptionKey) => {
   return { publicKey, privateKey }
 }
 
-export const makeSignature = (data, privateKey, algorithm = 'SHA3-256') => {
+export const makeSignature = (data, privateKey, algorithm = 'SHA3-384') => {
   return sign(algorithm, Buffer.from(data), privateKey).toString('base64')
 }
 export const verifySignature = (
   data,
   publicKey,
   signature,
-  algorithm = 'SHA3-256'
+  algorithm = 'SHA3-384'
 ) => {
   return verify(
     algorithm,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@1auth/crypto",
-  "version": "0.0.0-alpha.3",
+  "version": "0.0.0-alpha.31",
   "description": "",
   "type": "module",
   "engines": {
@@ -25,10 +25,6 @@
     "index.js",
     "index.d.ts"
   ],
-  "scripts": {
-    "test": "npm run test:unit",
-    "test:unit": "ava"
-  },
   "license": "MIT",
   "funding": {
     "type": "github",
@@ -48,8 +44,8 @@
     "url": "https://github.com/willfarrell/1auth/issues"
   },
   "homepage": "https://github.com/willfarrell/1auth",
-  "gitHead": "a02b1e01f039718f213d79b91d04ed660a955c73",
+  "gitHead": "246b0b521e6d136d8f37ee7d9781ffc8ccc987bd",
   "dependencies": {
-    "@node-rs/argon2": "1.4.0"
+    "@node-rs/argon2": "1.8.3"
   }
 }