dotenv-vault-rails 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52add50daa3bd323beb1d314caebf3a7b289a61a7948053f40756407d5c47385
-  data.tar.gz: f11b2b4e205d23804130afe2d57b9c0f110ee84a003df2557c6e3560fb6d19f3
+  metadata.gz: ca7df12c2227ad12516a6f7372854f0fc7b31db5d34ab6aca23845a316adb06e
+  data.tar.gz: 2602498218cc915c9d39f60d12e2542994e63a592cd0d440ea1f070e01881e59
 SHA512:
-  metadata.gz: 5fe76da20b724172f3b714f614be72092372634b3e496d2838efa02742ec9843cdf05adc7063193c87688834ed62eae25e5c835a72b7663620b3b5a339b2f691
-  data.tar.gz: 25a8c6491705632524b232769223eada1d793a7ae4c432fbde1c3db4bd6fa6c8bed6f4943cd48ecd7aa22d84d15abcfd5f18050082797016322d5cec3a9c6c19
+  metadata.gz: '09f0097149ae52f3a0271384fee27e6843d0fe92989889d3662911ea96d214be3ea53088a096497b6e1f61da4e1977deb30592d034d80fc6dc4b5f9b3ec477fe'
+  data.tar.gz: 6d6baf8ec4d6be0dd8344856a12e02e5a720836bd35a22dee144d68a25a617947fe198d39d36909c590504c784ee5f2f245e4827e1c74b43880870fd9159a383

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-rails
 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-rails
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: spring
   requirement: !ruby/object:Gem::Requirement