relishable 0.41 → 0.42

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 29dda1bae467029b5b8fa1bf9e571c346369cb67
-  data.tar.gz: fc53164b682a045c484a7915da717971714f7acf
+SHA256:
+  metadata.gz: a7ece5b74f66230cf5ef4fd68c652dbeebf3bc894d09bf004765945d733b3f27
+  data.tar.gz: a3028612eac4152e34c1b994a3e77d135c275e85fb046125d59f789a0a582fa5
 SHA512:
-  metadata.gz: 5b32c9440b0600e7b2d82cce500bbf8a691193348659a61d6dcccc2656e9da17f79a699c5f9750477f073c11f6656630e8355f4c10f1793fabc6e96f1a9a4f31
-  data.tar.gz: a2dc8f10b4297603ff3d74da4ac355ddba222962a7606dd2b498fa5a196668e374382ff43fee600173fa0f65750cc32bef81799e717bb44d68aa7e2481b2ef0b
+  metadata.gz: ec1455df37960ac4291fd79d9a7f2aedd9e8f9f5cb12678fb59482a2428b5816fbd8eaa4b679b4ed43811418a63d20434631458957a52e806e6320c3e7297144
+  data.tar.gz: 110ec2a41c0341a95ed4e61cebb8f3e31f0c984fd40c0bff35b0a8f6b5041d7a4fa18ca94bc04540d59edda35ad67bf185cf54b11b1ea2acbe5c0c46a377ba64

data/Gemfile.lock

@@ -1,10 +1,9 @@
 PATH
   remote: .
   specs:
-    relishable (0.41)
+    relishable (0.42)
       fernet (~> 2.3)
       fog-aws (~> 0.8.0)
-      legacy-fernet (~> 1.6.3)
       net-ssh (~> 3.0.2)
 
 GEM
@@ -37,8 +36,6 @@ GEM
       nokogiri (>= 1.5.11, < 2.0.0)
     formatador (0.2.5)
     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)

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
       @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,18 @@ 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
-    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.42"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: relishable
 version: !ruby/object:Gem::Version
-  version: '0.41'
+  version: '0.42'
 platform: ruby
 authors:
 - Mark Fine
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-28 00:00:00.000000000 Z
+date: 2019-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-aws
@@ -27,20 +27,6 @@ dependencies:
     - - "~>"
       - !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
 - !ruby/object:Gem::Dependency
   name: fernet
   requirement: !ruby/object:Gem::Requirement
@@ -176,7 +162,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: releases