dotenv-vault-rails 0.4.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1fbe2894bb806ed6b3432129b513069b2cc2eccb7d98954c67f4209367a487ff
-  data.tar.gz: 0ac1f1ae5494c877c93b96253e106c25712d4eb6c3a2a3a5cc1343519f8d44fa
+  metadata.gz: 40bf354479d33c010a5f1899482b90f9ee6094702c6c99ae730a115ac53227a8
+  data.tar.gz: 5afb9b56bfbceb85e78f1252420569316496f4f229b336d912ba854aa763f6fb
 SHA512:
-  metadata.gz: 42a29549edaa5d82d55f6b50abc52357dc65721f8e75d906ad914c550ddf9a0c3d3edd0ab0cd3a5d6cc6fc12ebedfd91ae63eceb911e428d2d99d6355f1791da
-  data.tar.gz: 49906a5a6be060a454a7e37c8527bfd32c4c7689e0e7a04ad95b06ad7f1237d372cdba74a4417bd64d0654a30ff7e6b412348c7b618ceee30e29494928b18f95
+  metadata.gz: 32fb077fb0c97c19522cff72e8d4721b90ab106d6d2606ad3cb684c4290d9f75c3b4b6fd73a839094dbb439518231ae37983254b20c2f8ebc155e07e4abf5fb9
+  data.tar.gz: a14615e72623fef08ffccc662dd86d2950e2b34b65f613032382b9e16bff1ee5592b81ec7be8e40f7602f0a89e3cebdff440373f1adb99ab9520f1296bb14787

data/Gemfile.lock

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

data/lib/dotenv-vault/version.rb

@@ -1,3 +1,3 @@
 module DotenvVault
-  VERSION = "0.4.1"
+  VERSION = "0.6.0"
 end

data/lib/dotenv-vault.rb

@@ -1,3 +1,4 @@
+require "uri"
 require "dotenv"
 require "lockbox"
 require "dotenv-vault/version"
@@ -105,43 +106,54 @@ 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"])
 
-    # Locate .env.vault
-    vault_path = ".env.vault"
-    raise NotFoundDotenvVault, "NotFoundDotenvVault: Cannot find .env.vault at ${vaultPath}" unless File.file?(vault_path)
+    # Parse DOTENV_KEY. Format is a URI
+    uri = URI.parse(ENV["DOTENV_KEY"]) # dotenv://:key_1234@dotenv.org/vault/.env.vault?environment=production
+
+    # Get decrypt key
+    key = uri.password
+    raise InvalidDotenvKey, "INVALID_DOTENV_KEY: Missing key part" unless present?(key)
+
+    # Get environment
+    params = Hash[URI::decode_www_form(uri.query.to_s)]
+    environment = params["environment"]
+    raise InvalidDotenvKey, "INVALID_DOTENV_KEY: Missing environment part" unless present?(environment)
+
+    # Get vault path
+    vault_path = uri.path.gsub("/vault/", "") # /vault/.env.vault => .env.vault
+    raise NotFoundDotenvVault, "NotFoundDotenvVault: Cannot find .env.vault at #{vaultPath}" unless File.file?(vault_path)
 
     # Parse .env.vault
     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.1
+  version: 0.6.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.1
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: spring
   requirement: !ruby/object:Gem::Requirement