relishable 0.41 → 0.44

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 29dda1bae467029b5b8fa1bf9e571c346369cb67
-  data.tar.gz: fc53164b682a045c484a7915da717971714f7acf
+SHA256:
+  metadata.gz: f86a33178d81efd6d22a01cda3f4e254251b8f153afd1e4bddb6581c56468972
+  data.tar.gz: ad2c949dad4dcd6e6bb51c9f9c8f71eab32990ccc6d7ac82104a2bd90225772e
 SHA512:
-  metadata.gz: 5b32c9440b0600e7b2d82cce500bbf8a691193348659a61d6dcccc2656e9da17f79a699c5f9750477f073c11f6656630e8355f4c10f1793fabc6e96f1a9a4f31
-  data.tar.gz: a2dc8f10b4297603ff3d74da4ac355ddba222962a7606dd2b498fa5a196668e374382ff43fee600173fa0f65750cc32bef81799e717bb44d68aa7e2481b2ef0b
+  metadata.gz: d8f999b98885c32e2b6c3382fe24dd5f1c2a35b792dc2698839d316a9a82dec9a8c8d03e7f633ac1967a7a1ed1547d1b48dee26ea65d6ac594859c5e16a3f9f6
+  data.tar.gz: 81c2ba2e9622151895c271f16927e46ac3a506c0cb568253ba50f7586f4b1661e06c5e059db3a4b6e5f10305fd2f48f4e76d491c6f0c792182ef77deb6fd31a0

data/Gemfile

@@ -1,3 +1,3 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 
 gemspec

data/Gemfile.lock

@@ -1,88 +1,92 @@
 PATH
   remote: .
   specs:
-    relishable (0.41)
+    relishable (0.44)
       fernet (~> 2.3)
-      fog-aws (~> 0.8.0)
-      legacy-fernet (~> 1.6.3)
-      net-ssh (~> 3.0.2)
+      fog-aws (~> 3.12.0)
+      net-ssh (~> 6.1.0)
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    addressable (2.3.8)
-    builder (3.2.3)
-    byebug (10.0.0)
-    coderay (1.1.2)
-    crack (0.4.2)
-      safe_yaml (~> 1.0.0)
-    diff-lcs (1.2.5)
-    excon (0.62.0)
+    addressable (2.8.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    builder (3.2.4)
+    coderay (1.1.3)
+    crack (0.4.5)
+      rexml
+    diff-lcs (1.5.0)
+    excon (0.92.3)
     fernet (2.3)
       valcro (~> 0.1)
-    fog-aws (0.8.1)
-      fog-core (~> 1.27)
-      fog-json (~> 1.0)
+    fog-aws (3.12.0)
+      fog-core (~> 2.1)
+      fog-json (~> 1.1)
       fog-xml (~> 0.1)
       ipaddress (~> 0.8)
-    fog-core (1.45.0)
+    fog-core (2.3.0)
       builder
-      excon (~> 0.58)
-      formatador (~> 0.2)
+      excon (~> 0.71)
+      formatador (>= 0.2, < 2.0)
+      mime-types
     fog-json (1.2.0)
       fog-core
       multi_json (~> 1.10)
-    fog-xml (0.1.3)
+    fog-xml (0.1.4)
       fog-core
       nokogiri (>= 1.5.11, < 2.0.0)
-    formatador (0.2.5)
+    formatador (1.1.0)
+    hashdiff (1.0.1)
     ipaddress (0.8.3)
-    legacy-fernet (1.6.4)
-      multi_json (~> 1.0)
-    method_source (0.9.1)
-    mini_portile2 (2.3.0)
-    multi_json (1.13.1)
-    net-ssh (3.0.2)
-    nokogiri (1.8.5)
-      mini_portile2 (~> 2.3.0)
-    power_assert (0.2.2)
-    pry (0.11.3)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    pry-byebug (3.6.0)
-      byebug (~> 10.0)
-      pry (~> 0.10)
-    rake (10.4.2)
-    rspec (3.1.0)
-      rspec-core (~> 3.1.0)
-      rspec-expectations (~> 3.1.0)
-      rspec-mocks (~> 3.1.0)
-    rspec-core (3.1.7)
-      rspec-support (~> 3.1.0)
-    rspec-expectations (3.1.2)
+    method_source (1.0.0)
+    mime-types (3.4.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2022.0105)
+    mini_portile2 (2.8.0)
+    multi_json (1.15.0)
+    net-ssh (6.1.0)
+    nokogiri (1.13.6)
+      mini_portile2 (~> 2.8.0)
+      racc (~> 1.4)
+    power_assert (2.0.1)
+    pry (0.14.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    public_suffix (4.0.7)
+    racc (1.6.0)
+    rake (13.0.6)
+    rexml (3.2.5)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.2)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.1.0)
-    rspec-mocks (3.1.3)
-      rspec-support (~> 3.1.0)
-    rspec-support (3.1.2)
-    safe_yaml (1.0.4)
-    test-unit (3.0.8)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.3)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.3)
+    test-unit (3.5.3)
       power_assert
     valcro (0.1.1)
-    webmock (1.19.0)
-      addressable (>= 2.3.6)
+    webmock (3.14.0)
+      addressable (>= 2.8.0)
       crack (>= 0.3.2)
+      hashdiff (>= 0.4.0, < 2.0.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  pry-byebug
+  pry
   rake (> 0)
   relishable!
-  rspec (~> 3.1.0)
+  rspec (~> 3.10.0)
   test-unit
-  webmock (~> 1.19.0)
+  webmock (~> 3.14.0)
 
 BUNDLED WITH
-   1.17.1
+   2.3.14

data/lib/relish/encryption_helper.rb

@@ -1,5 +1,4 @@
 require "relish/release"
-require "fernet/legacy"
 require "fernet"
 require "openssl"
 
@@ -8,27 +7,19 @@ class RelishDecryptionFailed < RuntimeError; end
 class Relish
   class EncryptionHelper
 
-    LEGACY_MATCHER = /.+?\|.+?\|.+?/.freeze
-
-    def initialize(static_secret, secrets)
-      @static_secret = static_secret
+    def initialize(static_secrets, secrets)
+      @static_secrets = static_secrets.is_a?(String) ? [static_secrets] : static_secrets
       @secrets = secrets
     end
 
-    def encrypt(_key = 'env', value)
-      current_encrypt(value)
-    end
-
-    def legacy_encrypt(key, value)
-      Fernet::Legacy.generate(hmac_secrets.first) do |gen|
-        gen.data = { key => value }
-      end
+    def encrypt(value)
+      Fernet.generate(hmac_secrets.first[0, 32], value)
     end
 
-    def decrypt(key = 'env', token)
+    def decrypt(token)
       plain = nil
       hmac_secrets.each do |secret|
-        plain = decrypt_with_secret(secret, token, key)
+        plain = decrypt_with_secret(secret, token)
         break if plain
       end
       raise RelishDecryptionFailed unless plain
@@ -43,46 +34,17 @@ class Relish
 
     protected
 
-    def current_encrypt(value)
-      Fernet.generate(hmac_secrets.first[0, 32], value)
-    end
-
-    def legacy?(token)
-      !!(token =~ LEGACY_MATCHER)
-    end
-
     def hmac_secrets
-      @hmac_secrets ||= @secrets.map do |secret|
-        OpenSSL::HMAC.hexdigest('sha256', @static_secret, secret)
-      end
-    end
-
-    def legacy_decrypt(secret, token, key)
-      verifier = Fernet::Legacy.verifier(secret, token)
-      verifier.enforce_ttl = false
-      verifier.verify_token(token)
-      return nil unless verifier.valid?
-      verifier.data[key]
-    rescue OpenSSL::Cipher::CipherError
-      # Certain combinations of keys and encrypted data cause decryption with an
-      # incorrect key to succeed (no CipherError) but produce garbage data which
-      # cannot be decoded into JSON, and thus fail with a ParseError instead.
-    rescue MultiJson::ParseError
+      @hmac_secrets ||= @static_secrets.product(@secrets).map {|static_secret, secret|
+        OpenSSL::HMAC.hexdigest('sha256', static_secret, secret)}
     end
 
-    def current_decrypt(secret, token)
+    def decrypt_with_secret(secret, token)
       verifier = Fernet.verifier(secret[0, 32], token)
       verifier.enforce_ttl = false
       return nil unless verifier.valid?
-      verifier.message
-    end
 
-    def decrypt_with_secret(secret, token, key)
-      if legacy?(token)
-        legacy_decrypt(secret, token, key)
-      else
-        current_decrypt(secret, token)
-      end
+      verifier.message
     end
   end
 end

data/lib/relish/version.rb

@@ -1,3 +1,3 @@
 class Relish
-  VERSION = "0.41"
+  VERSION = "0.44"
 end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: relishable
 version: !ruby/object:Gem::Version
-  version: '0.41'
+  version: '0.44'
 platform: ruby
 authors:
 - Mark Fine
 - Blake Gentry
 - Pedro Belo
 - Joshua Tobin
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-11-28 00:00:00.000000000 Z
+date: 2022-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-aws
@@ -19,28 +19,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 3.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
-- !ruby/object:Gem::Dependency
-  name: legacy-fernet
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.6.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.6.3
+        version: 3.12.0
 - !ruby/object:Gem::Dependency
   name: fernet
   requirement: !ruby/object:Gem::Requirement
@@ -61,14 +47,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.2
+        version: 6.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.2
+        version: 6.1.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -89,14 +75,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.10.0
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
@@ -117,16 +103,16 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.19.0
+        version: 3.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.19.0
+        version: 3.14.0
 - !ruby/object:Gem::Dependency
-  name: pry-byebug
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -160,7 +146,7 @@ files:
 homepage: http://github.com/heroku/relish
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -175,9 +161,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
-signing_key: 
+rubygems_version: 3.2.22
+signing_key:
 specification_version: 4
 summary: releases
 test_files: []