@dotenvx/dotenvx 1.9.0 → 1.9.1

package/CHANGELOG.md

@@ -2,7 +2,13 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
-## [Unreleased](https://github.com/dotenvx/dotenvx/compare/v1.9.0...main)
+## [Unreleased](https://github.com/dotenvx/dotenvx/compare/v1.9.1...main)
+
+## 1.9.1
+
+### Added
+
+* warn if private key is missing or blank ([#349](https://github.com/dotenvx/dotenvx/pull/349))
 
 ## 1.9.0
 

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.9.0",
+  "version": "1.9.1",
   "name": "@dotenvx/dotenvx",
   "description": "a better dotenv–from the creator of `dotenv`",
   "author": "@motdotla",

package/src/lib/helpers/decryptValue.js

@@ -3,35 +3,41 @@ const { decrypt } = require('eciesjs')
 const PREFIX = 'encrypted:'
 
 function decryptValue (value, privateKey) {
+  let decryptedValue
+  let decryptionError
+
   if (!value.startsWith(PREFIX)) {
     return value
   }
 
-  const privateKeys = privateKey.split(',')
-
-  let decryptedValue
-  let decryptionError
-  for (const key of privateKeys) {
-    const secret = Buffer.from(key, 'hex')
-    const encoded = value.substring(PREFIX.length)
-    const ciphertext = Buffer.from(encoded, 'base64')
-
-    try {
-      decryptedValue = decrypt(secret, ciphertext).toString()
-      decryptionError = null // reset to null error (scenario for multiple private keys)
-      break
-    } catch (e) {
-      if (e.message === 'Invalid private key') {
-        decryptionError = new Error('private key looks invalid')
-      } else if (e.message === 'Unsupported state or unable to authenticate data') {
-        decryptionError = new Error('private key looks wrong')
-      } else if (e.message === 'Point of length 65 was invalid. Expected 33 compressed bytes or 65 uncompressed bytes') {
-        decryptionError = new Error('encrypted data looks malformed')
-      } else {
-        decryptionError = new Error(`${e.message}`)
+  privateKey = privateKey || ''
+  if (privateKey.length <= 0) {
+    decryptionError = new Error('private key missing or blank')
+    decryptionError.code = 'DECRYPTION_FAILED'
+  } else {
+    const privateKeys = privateKey.split(',')
+    for (const key of privateKeys) {
+      const secret = Buffer.from(key, 'hex')
+      const encoded = value.substring(PREFIX.length)
+      const ciphertext = Buffer.from(encoded, 'base64')
+
+      try {
+        decryptedValue = decrypt(secret, ciphertext).toString()
+        decryptionError = null // reset to null error (scenario for multiple private keys)
+        break
+      } catch (e) {
+        if (e.message === 'Invalid private key') {
+          decryptionError = new Error('private key looks invalid')
+        } else if (e.message === 'Unsupported state or unable to authenticate data') {
+          decryptionError = new Error('private key looks wrong')
+        } else if (e.message === 'Point of length 65 was invalid. Expected 33 compressed bytes or 65 uncompressed bytes') {
+          decryptionError = new Error('encrypted data looks malformed')
+        } else {
+          decryptionError = new Error(`${e.message}`)
+        }
+
+        decryptionError.code = 'DECRYPTION_FAILED'
       }
-
-      decryptionError.code = 'DECRYPTION_FAILED'
     }
   }
 

package/src/lib/helpers/parseDecryptEvalExpand.js

@@ -4,8 +4,8 @@ const dotenvExpand = require('./dotenvExpand')
 const decryptValue = require('./decryptValue')
 const truncate = require('./truncate')
 
-function warning (e, key, privateKey) {
-  const warning = new Error(`[${e.code}] could not decrypt ${key} using private key ${truncate(privateKey)}`)
+function warning (e, key, privateKey = null) {
+  const warning = new Error(`[${e.code}] could not decrypt ${key} using private key '${truncate(privateKey)}'`)
   warning.code = e.code
   warning.help = `[${e.code}] ? ${e.message}`
 
@@ -17,14 +17,12 @@ function parseDecryptEvalExpand (src, privateKey = null, processEnv = process.en
 
   // parse
   const parsed = dotenv.parse(src)
-  if (privateKey && privateKey.length > 0) {
-    for (const key in parsed) {
-      try {
-        const decryptedValue = decryptValue(parsed[key], privateKey)
-        parsed[key] = decryptedValue
-      } catch (_e) {
-        // do nothing. warnings tracked further below.
-      }
+  for (const key in parsed) {
+    try {
+      const decryptedValue = decryptValue(parsed[key], privateKey)
+      parsed[key] = decryptedValue
+    } catch (_e) {
+      // do nothing. warnings tracked further below.
     }
   }
 
@@ -41,22 +39,20 @@ function parseDecryptEvalExpand (src, privateKey = null, processEnv = process.en
     parsed: evaled
   }
   const expanded = dotenvExpand.expand(inputEvaled)
-  if (privateKey && privateKey.length > 0) {
-    for (const key in expanded.parsed) {
-      try {
-        const decryptedValue = decryptValue(expanded.parsed[key], privateKey)
-        expanded.parsed[key] = decryptedValue
-      } catch (e) {
-        warnings.push(warning(e, key, privateKey))
-      }
+  for (const key in expanded.parsed) {
+    try {
+      const decryptedValue = decryptValue(expanded.parsed[key], privateKey)
+      expanded.parsed[key] = decryptedValue
+    } catch (e) {
+      warnings.push(warning(e, key, privateKey))
     }
-    for (const key in processEnv) {
-      try {
-        const decryptedValue = decryptValue(processEnv[key], privateKey)
-        processEnv[key] = decryptedValue
-      } catch (e) {
-        warnings.push(warning(e, key, privateKey))
-      }
+  }
+  for (const key in processEnv) {
+    try {
+      const decryptedValue = decryptValue(processEnv[key], privateKey)
+      processEnv[key] = decryptedValue
+    } catch (e) {
+      warnings.push(warning(e, key, privateKey))
     }
   }
 

package/src/lib/helpers/truncate.js

@@ -1,6 +1,10 @@
 function truncate (str, showChar = 7) {
-  const visiblePart = str.slice(0, showChar)
-  return visiblePart + '…'
+  if (str && str.length > 0) {
+    const visiblePart = str.slice(0, showChar)
+    return visiblePart + '…'
+  } else {
+    return ''
+  }
 }
 
 module.exports = truncate