waylon-core 0.2.1 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b2b3afe461da0b2a61930ff43324ffc820bb596e88de8f36daed751a8ec68fa
-  data.tar.gz: 2901833fc47c1ab6f8778137de3b3c917cdaf464d09138caac82ec74e45edbe6
+  metadata.gz: 0d0e47ec62eadd0848b4538d1bb32238b7e769f09500d536925cbd7d4367be68
+  data.tar.gz: 0ecd0c0d42d07861138d8df7170cb49f9eab7bf9a142844bbca44c57d1222bff
 SHA512:
-  metadata.gz: 61e60d22426e107eba2b3b07ff3481c6be533cb658d6b8cff402af18c947b9d9e8cd933b1bb137922410741445f83331418552ce3d3e79e290b1f75588bb41d8
-  data.tar.gz: b98cc02351ac0092fbc138c139c8ef1a3c87a5067b4f4890a0937d6c24af60088c4db4b570158a0cd0f79089493443f29aea8fa37c1d3a5d0e64100702e43706
+  metadata.gz: a9dcad0d9c4ad06afa6579d0a38daa70733fc8a0c692fb9f12b52ddd49f4ab998768ffbd92bfe7fc3a54b5b6691f91f4719c882d730e824364ea5adb190119b3
+  data.tar.gz: 94867f2bb0fde6993ded3026d827c36dbc4af5e3979281a005feea6f202a2e59a700b72ad2bf368d16add33eee9e631451d9aba76b38eb38d04a9c422097e234

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    waylon-core (0.2.1)
+    waylon-core (0.2.4)
       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/rspec/test_server.rb

@@ -19,7 +19,7 @@ require "waylon/rspec/test_worker"
 config = Waylon::Config.instance
 config.load_env
 
-Waylon::Cache.store = Moneta.new(:Cookie)
+Waylon::Cache.storage = Moneta.new(:Cookie)
 Waylon::Logger.log("Found Global Admins: #{config.admins}")
 
 Waylon::RSpec::TestUser.find_or_create(
@@ -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

@@ -9,7 +9,7 @@ module Waylon
     )
 
     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 +21,15 @@ module Waylon
       storage.delete(key)
     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 +39,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 +60,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
-      1  # Patch
+      4  # 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.1
+  version: 0.2.4
 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