dotenv-vault 0.4.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e49a9658a64cd656eee7128b70ef2f501e84f5101aafb3aaf54f7de400f0013f
-  data.tar.gz: de8dd440fdaf111b979706f62c27298f9ab7dc5c2f7ec3e875bde992c87c789d
+  metadata.gz: 84e1fef6b134d93f790a2fea8c723ab7a824035ce634abf4b28b59d4926c429b
+  data.tar.gz: 0be721f78ed10b1a1fadaf76bb2ba39f37179e7f22dc91005f6ae99ffa0d98b9
 SHA512:
-  metadata.gz: 6f3529e9e8db857b8c6d439c81ccdde7baeb56852b3e5e5edf0f0e7e1c58e7b8589375022d755d239cc73fb6a5d2146fa468304ce7c2155827a02d956fcd1f9f
-  data.tar.gz: 6b081b51531f776a1136701cb840665959dea167a753a7943cd54679c7693a5b52372a91492ca7ea27aaf6710d95b2c2e9cc485882c41fb6803d7fb33dce0581
+  metadata.gz: e269b0db8d1657b41d1913d092ae08e6ce3b717e2fcd3cde12ffe8c49fae30bafb3f1b63c610909f44e659815dae24ba119a5e1a9e4bf85f0c4b49450895f487
+  data.tar.gz: 707dac136468912d26dfca5e9b2ac0f3b29488dee6e27f0be9aac43b98d289b2fd4a251909b261fb2ab0d98324dbb585339b2c8a2773df3d922472b46b6bfa08

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
 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