waylon-core 0.1.4 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb29b523a0f093d01b8a9abdf5cd23d54b2815ae0430b81f8e670680959d02f6
-  data.tar.gz: 4c79ff418934e61e9063db9568d2397409117afd2a7519d9b4c9348233991667
+  metadata.gz: 4d396f88fe34083537cabbe245d1063ecd1b8c0d15e5391c80eb0a9f4902aa39
+  data.tar.gz: bc7d2a6b5da80e36508032d3bcfaa59f91395d016e0fb69e65a24c56366f26e3
 SHA512:
-  metadata.gz: 505ad2082ae04e37478e03637b13952d81d8c26c9e8107eeded3b4247ae25f776f7d1d7d4a4fd0739edd670ba74256e33adbd22c6f46957f528c820ef371bfce
-  data.tar.gz: a9c1b1de874c75d7d909a83904e46360236334f652dae8ad059d5adf8b405315030245420dba3a8e159b21d99d221a502d30cfe439f2b2b77411ff06261af695
+  metadata.gz: 229980e2a8c719c57baa00a26d137a10c6677fe1081adfc3aa73f4bfd13c83ee74c1f8b10933ba43688a9d40fa8e0c71c264cbbe7dec40ec202192ade05e4b1c
+  data.tar.gz: 82814e648a191b886619f8e15bf6b934b8c1cbc6112d77f39a1bbcf96f0b5def15267260609a45b46c3c8252a98d569e454c07f754c4baa39b1ee0aba8923c92

data/Gemfile.lock

@@ -1,13 +1,14 @@
 PATH
   remote: .
   specs:
-    waylon-core (0.1.4)
+    waylon-core (0.1.8)
       addressable (~> 2.8)
       faraday (~> 1.8)
       i18n (~> 1.8)
       json (~> 2.6)
       moneta (~> 1.4)
       puma (~> 5.5)
+      rbnacl (~> 7.1)
       resque (~> 2.2)
 
 GEM
@@ -35,20 +36,21 @@ GEM
     faraday-em_synchrony (1.0.0)
     faraday-excon (1.1.0)
     faraday-httpclient (1.0.1)
-    faraday-multipart (1.0.3)
-      multipart-post (>= 1.2, < 3)
+    faraday-multipart (1.0.4)
+      multipart-post (~> 2)
     faraday-net_http (1.0.1)
     faraday-net_http_persistent (1.2.0)
     faraday-patron (1.0.0)
     faraday-rack (1.0.0)
     faraday-retry (1.0.3)
+    ffi (1.15.5)
     i18n (1.10.0)
       concurrent-ruby (~> 1.0)
     json (2.6.2)
     moneta (1.5.1)
     mono_logger (1.1.1)
     multi_json (1.15.0)
-    multipart-post (2.1.1)
+    multipart-post (2.2.0)
     mustermann (1.1.1)
       ruby2_keywords (~> 0.0.1)
     nio4r (2.5.8)
@@ -58,15 +60,17 @@ GEM
     public_suffix (4.0.7)
     puma (5.6.4)
       nio4r (~> 2.0)
-    rack (2.2.3)
+    rack (2.2.3.1)
     rack-protection (2.2.0)
       rack
     rainbow (3.1.1)
     rake (13.0.6)
+    rbnacl (7.1.1)
+      ffi
     redis (4.6.0)
     redis-namespace (1.8.2)
       redis (>= 3.0.4)
-    regexp_parser (2.4.0)
+    regexp_parser (2.5.0)
     resque (2.2.1)
       mono_logger (~> 1.0)
       multi_json (~> 1.0)
@@ -86,13 +90,13 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
     rspec-support (3.11.0)
-    rubocop (1.29.1)
+    rubocop (1.30.1)
       parallel (~> 1.10)
       parser (>= 3.1.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.17.0, < 2.0)
+      rubocop-ast (>= 1.18.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
     rubocop-ast (1.18.0)
@@ -117,7 +121,7 @@ GEM
     tilt (2.0.10)
     unicode-display_width (2.1.0)
     webrick (1.7.0)
-    yard (0.9.27)
+    yard (0.9.28)
       webrick (~> 1.7.0)
 
 PLATFORMS

data/bin/console

@@ -2,7 +2,12 @@
 # frozen_string_literal: true
 
 require "bundler/setup"
-require "waylon"
+require "waylon/core"
+require "waylon/skills/default"
+require "waylon/skills/diagnostics"
+require "waylon/skills/fun"
+require "waylon/skills/groups"
+require "waylon/skills/help"
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.

data/lib/waylon/base_component.rb

@@ -46,7 +46,7 @@ module Waylon
         @namespace || name.to_s.split("::").last.downcase
       end
 
-      # Creates namespaced configuration keys for Webhook subclasses
+      # Creates namespaced configuration keys for BaseComponent subclasses
       # @param (see Config#add_schema)
       def config(key, default: nil, required: false, type: String)
         conf = Config.instance
@@ -127,7 +127,7 @@ module Waylon
       end
 
       # A wrapper for accessing the persistent storage
-      # @return [Waylon::Storage] The Storage wrapper class
+      # @return [Waylon::Storage] The Storage wrapper module
       def storage
         Waylon::Storage
       end

data/lib/waylon/core.rb

@@ -21,6 +21,7 @@ require "faraday"
 require "i18n"
 require "json"
 require "moneta"
+require "rbnacl"
 require "resque"
 require "sinatra"
 
@@ -32,6 +33,7 @@ require "waylon/exceptions/not_implemented_error"
 require "waylon/exceptions/validation_error"
 require "waylon/group"
 require "waylon/logger"
+require "waylon/storage"
 require "waylon/base_component"
 require "waylon/condition"
 require "waylon/message"

data/lib/waylon/rspec/test_server.rb

@@ -20,7 +20,7 @@ config = Waylon::Config.instance
 config.load_env
 
 Waylon::Cache = Moneta.new(:Cookie)
-Waylon::Storage = Moneta.new(:LRUHash)
+p Waylon::Storage
 Waylon::Logger.log("Found Global Admins: #{config.admins}")
 
 Waylon::RSpec::TestUser.find_or_create(

data/lib/waylon/rspec.rb

@@ -47,4 +47,4 @@ module Waylon
 end
 
 Waylon::Cache = Moneta.new(:Cookie)
-Waylon::Storage = Moneta.new(:Cookie)
+Waylon::Storage::Store = Moneta.new(:Cookie)

data/lib/waylon/storage.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+module Waylon
+  # Used for working with the Moneta store
+  module Storage
+    Store = Moneta.new(
+      :Redis,
+      url: "redis://#{ENV.fetch("REDIS", "localhost:6379")}/1"
+    )
+
+    def self.cipher
+      key_bytes = RbNaCl::Hash.sha256(ENV.fetch("ENCRYPTION_KEY", "thisisVeryUnsafe4U"))[0..31]
+      RbNaCl::SimpleBox.from_secret_key(key_bytes)
+    end
+
+    def self.clear
+      Store.clear
+    end
+
+    def self.key?(name)
+      Store.key?(name)
+    end
+
+    def self.load(key)
+      this_cipher = cipher
+      raw = Store.load(key)
+      return nil unless raw
+
+      decoded = Base64.decode64(raw)
+      plain = this_cipher.decrypt(decoded)
+      JSON.parse(plain)
+    end
+
+    def self.store(key, value)
+      this_cipher = cipher
+      encrypted = this_cipher.encrypt(value.to_json)
+      encoded = Base64.encode64(encrypted)
+      Store.store(key, encoded)
+    end
+  end
+end

data/lib/waylon/version.rb

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

data/scripts/release.sh

@@ -1,5 +1,7 @@
 #!/bin/sh
 
+apt-get update && apt-get install -y libsodium-dev
+
 gem install bundler -v '~> 2.3'
 bundle install
 rm -rf pkg/*.gem

data/scripts/test.sh

@@ -1,5 +1,7 @@
 #!/bin/sh
 
+apt-get update && apt-get install -y libsodium-dev
+
 gem install bundler -v '~> 2.3'
 bundle install
 bundle exec rake

data/waylon-core.gemspec

@@ -33,6 +33,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "json", "~> 2.6"
   spec.add_dependency "moneta", "~> 1.4"
   spec.add_dependency "puma", "~> 5.5"
+  spec.add_dependency "rbnacl", "~> 7.1"
   spec.add_dependency "resque", "~> 2.2"
 
   spec.add_development_dependency "bundler", "~> 2.3"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: waylon-core
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.8
 platform: ruby
 authors:
 - Jonathan Gnagy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-06-02 00:00:00.000000000 Z
+date: 2022-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -94,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.5'
+- !ruby/object:Gem::Dependency
+  name: rbnacl
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '7.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: resque
   requirement: !ruby/object:Gem::Requirement
@@ -246,7 +260,6 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
-- lib/waylon.rb
 - lib/waylon/base_component.rb
 - lib/waylon/condition.rb
 - lib/waylon/conditions/black_hole.rb
@@ -284,6 +297,7 @@ files:
 - lib/waylon/skills/fun.rb
 - lib/waylon/skills/groups.rb
 - lib/waylon/skills/help.rb
+- lib/waylon/storage.rb
 - lib/waylon/user.rb
 - lib/waylon/version.rb
 - lib/waylon/webhook.rb

data/lib/waylon.rb

@@ -1,8 +0,0 @@
-# frozen_string_literal: true
-
-require "waylon/core"
-require "waylon/skills/default"
-require "waylon/skills/diagnostics"
-require "waylon/skills/fun"
-require "waylon/skills/groups"
-require "waylon/skills/help"