dotenv-vault 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43532f3eb3ddc9a9b407131c2961446cf58664e34e5bcc763efc516d9b0143cb
-  data.tar.gz: b0a76f6e83ddd50fd3525976fffe0c09c759a91286120266ca7396e3b636095c
+  metadata.gz: f07ef0e741df42c7269f9d949e3b279bc2e244f030b8d2abd3b1cfd49d707d4f
+  data.tar.gz: c5ebb287fbd0de6d76ba888aea9fab96763329bcb9db19c86444d2b1e9b6d4ed
 SHA512:
-  metadata.gz: e01b952fbf0d9de42f8cb35a7ab622ba95bfb85bb53685712340500524c472895d01c42d3c22ff16796526b29b7c6584777b2170629b0f093fd3188ee907da25
-  data.tar.gz: cdabb9c5af4aa7ecfdc3797fa91cc15452497b85184c25709fa3e853adcadc826c2a1aaf01526a8ff0c86a93d3576179e7f5fc7c37d4913647f7aef0e95c4fcb
+  metadata.gz: 62a9f140d67de2990e183616d6075dbcabddbef118a3a7b91e85e237d6673b02b0136af95661b0f239d62a3cf217956184c8b4532f04b1aeef60e02878860552
+  data.tar.gz: d904872c3b6c27e5dd71a8ed31703fbbe8765e8cf212ebdadba04932b5addf10672284d0d15a816cacdce1607c45d9048b7bdac1ee8e83a1402d7e03b8f3d26d

data/Gemfile.lock

@@ -1,12 +1,12 @@
 PATH
   remote: .
   specs:
-    dotenv-vault (0.4.0)
+    dotenv-vault (0.5.0)
       dotenv
       lockbox
-    dotenv-vault-rails (0.4.0)
+    dotenv-vault-rails (0.5.0)
       dotenv-rails
-      dotenv-vault (= 0.4.0)
+      dotenv-vault (= 0.5.0)
 
 GEM
   remote: https://rubygems.org/

data/lib/dotenv-vault/rails.rb

@@ -1,3 +1,4 @@
+require "dotenv-rails"
 require "dotenv-vault"
 
 # Fix for rake tasks loading in development

data/lib/dotenv-vault/version.rb

@@ -1,3 +1,3 @@
 module DotenvVault
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

data/lib/dotenv-vault.rb

@@ -105,9 +105,15 @@ module DotenvVault
   end
 
   def parse_vault(*filenames)
-    # Warn the developer unless both are set
+    # DOTENV_KEY=development/key_1234
+    #
+    # Warn the developer unless formatted correctly
     raise NotFoundDotenvKey, "NOT_FOUND_DOTENV_KEY: Cannot find ENV['DOTENV_KEY']" unless present?(ENV["DOTENV_KEY"])
-    raise NotFoundDotenvEnvironment, "NOT_FOUND_DOTENV_ENVIRONMENT: Cannot find ENV['DOTENV_ENVIRONMENT']" unless present?(ENV["DOTENV_ENVIRONMENT"])
+    split_dotenv_key = ENV["DOTENV_KEY"].split("/")
+    environment = split_dotenv_key[0]
+    raise InvalidDotenvKey, "INVALID_DOTENV_KEY: Missing environment part" unless present?(environment)
+    key = split_dotenv_key[1]
+    raise InvalidDotenvKey, "INVALID_DOTENV_KEY: Missing key part" unless present?(key)
 
     # Locate .env.vault
     vault_path = ".env.vault"
@@ -117,31 +123,29 @@ module DotenvVault
     parsed = Dotenv.parse(vault_path)
 
     # Get ciphertext
-    environment_key = "DOTENV_VAULT_#{ENV["DOTENV_ENVIRONMENT"].upcase}"
+    environment_key = "DOTENV_VAULT_#{environment.upcase}"
     ciphertext = parsed[environment_key] # DOTENV_VAULT_PRODUCTION
     raise NotFoundDotenvEnvironment, "NOT_FOUND_DOTENV_ENVIRONMENT: Cannot locate #{environment_key} in .env.vault" unless ciphertext
 
     # Decrypt ciphertext
-    decrypted = decrypt(ciphertext)
+    decrypted = decrypt(ciphertext, key)
 
     # Parse decrypted .env string
     Dotenv::Parser.call(decrypted, true)
   end
 
   def using_vault?
-    present?(ENV["DOTENV_ENVIRONMENT"]) && present?(ENV["DOTENV_KEY"])
+    present?(ENV["DOTENV_KEY"])
   end
 
   def present?(str)
     !(str.nil? || str.empty?)
   end
 
-  def decrypt(ciphertext)
-    raise NotFoundDotenvKey, "NOT_FOUND_DOTENV_KEY: Cannot find ENV['DOTENV_KEY']" unless present?(ENV["DOTENV_KEY"])
-
-    key = ENV["DOTENV_KEY"][-64..-1] # last 64 characters. allows for passing keys with preface like key_*****
+  def decrypt(ciphertext, key)
+    key = key[-64..-1] # last 64 characters. allows for passing keys with preface like key_*****
 
-    raise InvalidDotenvKey, "INVALID_DOTENV_KEY: It must be 64 characters long (or more)" unless key.to_s.length == 64
+    raise InvalidDotenvKey, "INVALID_DOTENV_KEY: Key part must be 64 characters long (or more)" unless key.bytesize == 64
 
     lockbox = Lockbox.new(key: key, encode: true)
     begin

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dotenv-vault
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - motdotla
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-09-16 00:00:00.000000000 Z
+date: 2022-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dotenv