waylon-core 0.2.2 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1aebd152f6a966ba3af1d42c2538ee64aa63f23b369defa8cb14b5b76028156b
-  data.tar.gz: ed1ca477399d53439683414a943e99ba727dd07ebb7f4a7229db7bd106e74b5c
+  metadata.gz: 932e166cc8b43333b52643aa789415cc88d59441464e7eb0108ca1443f6ef48a
+  data.tar.gz: 517dc8256389a54b3f745a6db0da5f9a957f993dc96cbca8fe93bde0ed2e22a9
 SHA512:
-  metadata.gz: e211f819f4d54ad740f422902c98ea9086c1b02e738aa4907a7fcd79841a42ad3478f37c72d6399208be06bac0567c61c08652a50b492e9bcfc774600f056a88
-  data.tar.gz: 286a48bb42872720a371e48fc5f872456af7c1a0d655bfe677554a3eef459cbe8309bc974e0ef4f38fd8b434026f078828b99a5efb86e9b197dd9d7b68d42bad
+  metadata.gz: 9a8132248f4128a44e0a1133846fe2afa134665f8e7df48feb5b1dba550cbffb68abf4778930d0e7d0dc657cd386a82fc32d0e9f4201fd1e28063efbd90d4719
+  data.tar.gz: 2ff90e41205b721a08d862100e7beefd1375450a61fc35af28c221d04580b6534a8104e0923ddf21a362332477834cece2d3a3a793d631c374860b6718184df5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    waylon-core (0.2.2)
+    waylon-core (0.2.5)
       addressable (~> 2.8)
       faraday (~> 1.8)
       i18n (~> 1.8)
@@ -17,6 +17,7 @@ GEM
     addressable (2.8.1)
       public_suffix (>= 2.0.2, < 6.0)
     ast (2.4.2)
+    coderay (1.1.3)
     concurrent-ruby (1.1.10)
     connection_pool (2.2.5)
     diff-lcs (1.5.0)
@@ -48,6 +49,7 @@ GEM
     i18n (1.12.0)
       concurrent-ruby (~> 1.0)
     json (2.6.2)
+    method_source (1.0.0)
     moneta (1.5.1)
     mono_logger (1.1.1)
     multi_json (1.15.0)
@@ -58,6 +60,9 @@ GEM
     parallel (1.22.1)
     parser (3.1.2.1)
       ast (~> 2.4.1)
+    pry (0.14.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
     public_suffix (5.0.0)
     puma (5.6.5)
       nio4r (~> 2.0)
@@ -135,6 +140,7 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 2.3)
+  pry (~> 0.14)
   rake (~> 13.0)
   rspec (~> 3.10)
   rubocop (~> 1.23)

data/Rakefile

@@ -19,5 +19,9 @@ end
 task default: %i[spec rubocop yard]
 
 task :demo do
+  require "pry"
+  Waylon::Logger.logger = ::Logger.new("/dev/null")
+  Waylon::Cache.storage = Moneta.new(:Cookie)
+  Waylon::Storage.storage = Moneta.new(:Cookie)
   require "waylon/rspec/test_server"
 end

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/rspec/test_server.rb

@@ -100,6 +100,8 @@ def handle_input(body, from: this_user, privately: true)
   elsif ["su", "su -", "su admin", "su - admin"].include?(body)
     puts 'Admin enabled! Use "exit" to go back to a normal user.'
     @admin_enabled = true
+  elsif @admin_enabled && %w[irb pry].include?(body)
+    pry
   else
     message_count = Waylon::RSpec::TestSense.sent_messages.size
 

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
-      2  # Patch
+      5  # Patch
     ].join(".")
   end
 end

data/waylon-core.gemspec

@@ -37,6 +37,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "resque", "~> 2.2"
 
   spec.add_development_dependency "bundler", "~> 2.3"
+  spec.add_development_dependency "pry", "~> 0.14"
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.10"
   spec.add_development_dependency "rubocop", "~> 1.23"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: waylon-core
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.5
 platform: ruby
 authors:
 - Jonathan Gnagy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-08-30 00:00:00.000000000 Z
+date: 2022-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -136,6 +136,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.3'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.14'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.14'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement