waylon-core 0.1.5 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 443bc0d5a5a87010e8c006d2882631ef323ed5c06ed343e6ca1f5cb080042c33
-  data.tar.gz: 10812a5cd59babb662a9ef73f0c68146c2e736605f383047e08150375057c78a
+  metadata.gz: 628f00817729895a327ec3adff832ba15fdb071da3762a061eb637b0492b2953
+  data.tar.gz: 17276d8b5acbdaf2b5c90766329d53ec8fe42d0afae64f7aa062ad0a4cb1a381
 SHA512:
-  metadata.gz: a2a5f869c3bec9cac04882f15b6d5241468d88bdc2c6d3c205f6db920041f6837c719dbf21812fb450d4a1024819391cbbf184aece064a3eeebea2ef2d8dde22
-  data.tar.gz: de895fbc4f2718a3c5f016f3f76fbe6d2abcfa22885a2a0bfc84968c937a60403e7b8b2394e6e911bf170c05d6d075daa97588420eced57978b7dad157570991
+  metadata.gz: 6724d7e8ee142b43534ca17fd53d729272d83ab0f6e5f3ef0cf1b07ac63a552bc8393a167b1d6f324cf809fd27bb88f6379375929f130481a16b1ef69f24068e
+  data.tar.gz: 800fa36240abe3b85afc58951efa01c519fa6802d74d9fe92a67eb5719e3d25dfc2348f6d38dc347be7ccf9d6c7c1a6e4f4ca92d3117c04775a67ed151295a3e

data/Gemfile.lock

@@ -1,13 +1,14 @@
 PATH
   remote: .
   specs:
-    waylon-core (0.1.5)
+    waylon-core (0.1.9)
       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
@@ -42,13 +43,14 @@ GEM
     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.2.0)
+    multipart-post (2.2.3)
     mustermann (1.1.1)
       ruby2_keywords (~> 0.0.1)
     nio4r (2.5.8)
@@ -63,6 +65,8 @@ GEM
       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)

data/lib/waylon/base_component.rb

@@ -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/config.rb

@@ -32,11 +32,10 @@ module Waylon
 
     # Load in the config from env variables
     # @return [Boolean] Was the configuration loaded?
-    def load_env # rubocop:disable Metrics/AbcSize
+    def load_env
       @schema ||= {}
       self["global.log.level"] = ENV.fetch("LOG_LEVEL", "info")
-      self["global.redis.host"] = ENV.fetch("REDIS_HOST", "redis")
-      self["global.redis.port"] = ENV.fetch("REDIS_PORT", "6379")
+      self["global.redis"] = ENV.fetch("REDIS", "localhost:6379")
       self["global.admins"] = ENV.fetch("GLOBAL_ADMINS", "")
       ENV.keys.grep(/CONF_/).each do |env_key|
         conf_key = env_key.downcase.split("_")[1..].join(".")
@@ -49,13 +48,13 @@ module Waylon
     # Provides the redis host used for most of Waylon's brain
     # @return [String] The redis host
     def redis_host
-      self["global.redis.host"]
+      self["global.redis"].split(":").first
     end
 
     # Provides the redis port used for most of Waylon's brain
     # @return [String] The redis host
     def redis_port
-      self["global.redis.port"]
+      self["global.redis"].split(":").last
     end
 
     # Clear the configuration

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,46 @@
+# frozen_string_literal: true
+
+Waylon::Cache = Moneta.new(
+  :Redis,
+  url: "redis://#{ENV.fetch("REDIS", "localhost:6379")}/1"
+)
+
+module Waylon
+  # Used for working with the Moneta store
+  module Storage
+    Store = Moneta.new(
+      :Redis,
+      url: "redis://#{ENV.fetch("REDIS", "localhost:6379")}/2"
+    )
+
+    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
-      5  # Patch
+      9  # 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.5
+  version: 0.1.9
 platform: ruby
 authors:
 - Jonathan Gnagy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-06-07 00:00:00.000000000 Z
+date: 2022-06-19 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
@@ -283,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