waylon-core 0.2.3 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44b2586a3ba29a3b2da02d66f880a826b445d2658ea6f83fa3e8a0a9935d0898
-  data.tar.gz: b1d602e2f41f06c37752c31eb2d9a0a983f699f3bcd7c73372305719c6a68874
+  metadata.gz: f127e3f8c3b91cd3d00f5d394ed63e1280d4e84c05f27e6f1526f44edc7b546a
+  data.tar.gz: 44efb8ef9ee90fb8480d873a1a87faad240936085ac379dc634eb81e255792c2
 SHA512:
-  metadata.gz: 6d40939e62fa6c4a58c7bf31ec716fdde3d0d878e36aa6331dcfdabd73b67b02b441973243a3baefd9c96ad01681a1ab382146d26ffa4de83db3ea41355a060f
-  data.tar.gz: 581ba5ccbececbb637a09efab4bd202c3e8112edca8999e57e5fe3bda3b1cb40097f92c73d5e959c76c454039f9d7581fd13955580d5d72d0b3ba773b3991ca0
+  metadata.gz: 53170a69a5676f06c4ec93eda0766728a4c2ee94e1333f82f22b551862af84d6b6407fa3521579c9b8f27681fe575c6073dbf0cd4c5008d9cf3613149e69fef0
+  data.tar.gz: 52b0a7aa10408bef47cbcf0a12e6d517e5e2c9d8012f0ee2fbd83139826cea53f727c6bb4698820bfbe95040103376284dda9c1f4103f5407f74d5944a871a98

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    waylon-core (0.2.3)
+    waylon-core (0.2.6)
       addressable (~> 2.8)
       faraday (~> 1.8)
       i18n (~> 1.8)
@@ -73,7 +73,7 @@ GEM
     rake (13.0.6)
     rbnacl (7.1.1)
       ffi
-    redis (5.0.1)
+    redis (5.0.2)
       redis-client (~> 0.7)
     redis-client (0.7.1)
       connection_pool

data/lib/waylon/cache.rb

@@ -8,6 +8,10 @@ module Waylon
       url: "redis://#{ENV.fetch("REDIS", "localhost:6379")}/1"
     )
 
+    def self.adapter
+      storage.adapter
+    end
+
     def self.clear
       storage.clear
     end

data/lib/waylon/storage.rb

@@ -8,8 +8,12 @@ module Waylon
       url: "redis://#{ENV.fetch("REDIS", "localhost:6379")}/2"
     )
 
+    def self.adapter
+      storage.adapter
+    end
+
     def self.cipher
-      key_bytes = RbNaCl::Hash.sha256(ENV.fetch("ENCRYPTION_KEY", "thisisVeryUnsafe4U"))[0..31]
+      key_bytes = RbNaCl::Hash.sha256(encryption_key)[0..31]
       RbNaCl::SimpleBox.from_secret_key(key_bytes)
     end
 
@@ -21,6 +25,19 @@ module Waylon
       storage.delete(key)
     end
 
+    def self.each_key(&block)
+      storage.each_key(&block)
+    end
+
+    def self.encryption_key
+      ENV.fetch("ENCRYPTION_KEY", "thisisVeryUnsafe4U")
+    end
+
+    def self.encryption_key_fingerprint
+      base = RbNaCl::Hash.sha256(encryption_key)[0..15]
+      Base64.urlsafe_encode64(RbNaCl::Hash.sha256(base)[0..7])
+    end
+
     def self.key?(name)
       storage.key?(name)
     end
@@ -30,7 +47,11 @@ module Waylon
       raw = storage.load(key)
       return nil unless raw
 
-      decoded = Base64.decode64(raw)
+      wrapper = JSON.parse(raw)
+      value = wrapper["data"]
+      return nil unless value
+
+      decoded = Base64.decode64(value)
       plain = this_cipher.decrypt(decoded)
       JSON.parse(plain)
     end
@@ -47,7 +68,8 @@ module Waylon
       this_cipher = cipher
       encrypted = this_cipher.encrypt(value.to_json)
       encoded = Base64.encode64(encrypted)
-      storage.store(key, encoded)
+      wrapper = { cipher: cipher.class.name, data: encoded, key: encryption_key_fingerprint }
+      storage.store(key, wrapper.to_json)
     end
   end
 end

data/lib/waylon/version.rb

@@ -6,7 +6,7 @@ module Waylon
     VERSION = [
       0, # Major
       2, # Minor
-      3  # Patch
+      6  # Patch
     ].join(".")
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: waylon-core
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.6
 platform: ruby
 authors:
 - Jonathan Gnagy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-08-30 00:00:00.000000000 Z
+date: 2022-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable