legion-crypt 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 94f0199322913d4badab5e1cd29ad29613d8590d1112a9ceffcfbffdfcf2604d
-  data.tar.gz: 0a901ac3efe8c894440a5888097311172c517a2f5519f08f8772976ce4b22dd5
+  metadata.gz: 2cee858be81735f0539ebb56696ad2e33e260f37ef0a7163e260838ca720771d
+  data.tar.gz: aace018115e35bff3ec332546063f88e32b82658916f43e3de356e4c1fc21cf6
 SHA512:
-  metadata.gz: 4356dcc6172a9615b9f5eef18b7f92eb4f6ba8faf51e03fbe043a90b4dbf8286037343a45c4e7738ce6d84e6cd3ade84c704743ded75389873c06247200bac6d
-  data.tar.gz: 81b04201cf2885f9558f3b349c5457b08fdb971041b7999cd5b139f456bbc24338f71561457d4267f92682c1b6ba31141ab09ffcd6ae755acd12a5f5117e8837
+  metadata.gz: ebab075482efdbd442b0b70f46a25427e6818226c4abf4a54a03abf334c56bf448c17f04b8562f9d5f2074baa3370c5ee83ae96978a63baf9fcf2bf0884fb37e
+  data.tar.gz: 5df29adbee2fb4108bf685affb47d1bfe63e4b1edfb695a7daf791c65e77ad807ab0a9129a827538875a6150014630c11d45b7413d7e7f8a1ccdf3b695d385ae

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    legion-crypt (0.2.1)
+    legion-crypt (0.2.2)
       vault
 
 GEM
@@ -12,20 +12,16 @@ GEM
     aws-eventstream (1.1.0)
     aws-sigv4 (1.2.2)
       aws-eventstream (~> 1, >= 1.0.2)
-    bunny (2.16.1)
+    bunny (2.17.0)
       amq-protocol (~> 2.3, >= 2.3.1)
     concurrent-ruby (1.1.7)
     concurrent-ruby-ext (1.1.7)
       concurrent-ruby (= 1.1.7)
     connection_pool (2.2.3)
     daemons (1.3.1)
-    dalli (2.7.10)
+    dalli (2.7.11)
     diff-lcs (1.4.4)
     docile (1.3.2)
-    faraday (1.0.1)
-      multipart-post (>= 1.2, < 3)
-    faraday_middleware (1.0.0)
-      faraday (~> 1.0)
     hashdiff (1.0.1)
     json (2.3.1)
     json (2.3.1-java)
@@ -34,25 +30,26 @@ GEM
       connection_pool
       dalli
       redis
-    legion-data (1.1.2)
+    legion-data (1.1.4)
       legion-logging
       legion-settings
       mysql2
       sequel
-    legion-exceptions (1.1.0)
+    legion-exceptions (1.1.2)
     legion-json (1.1.2)
       json_pure
       multi_json
-    legion-logging (1.1.1)
+    legion-logging (1.1.3)
       rainbow (~> 3)
-    legion-settings (1.1.1)
+    legion-settings (1.1.2)
       legion-json
       legion-logging
-    legion-transport (1.1.3)
+    legion-transport (1.1.5)
       bunny
       concurrent-ruby
       legion-json
-    legionio (0.2.0)
+    legionio (0.3.4)
+      bunny
       concurrent-ruby
       concurrent-ruby-ext
       daemons
@@ -65,58 +62,53 @@ GEM
       legion-logging
       legion-settings
       legion-transport
-      sleepiq
-      vault
+      lex-node
+      oj
+    lex-node (0.1.3)
     multi_json (1.15.0)
-    multipart-post (2.1.1)
     mysql2 (0.5.3)
+    oj (3.10.15)
     parallel (1.19.2)
-    parser (2.7.1.4)
+    parser (2.7.2.0)
       ast (~> 2.4.1)
     rainbow (3.0.0)
     rake (13.0.1)
-    redis (4.2.1)
-    regexp_parser (1.7.1)
+    redis (4.2.2)
+    regexp_parser (1.8.2)
     rexml (3.2.4)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
       rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.2)
+    rspec-core (3.9.3)
       rspec-support (~> 3.9.3)
-    rspec-expectations (3.9.2)
+    rspec-expectations (3.9.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
-    rspec-support (3.9.3)
+    rspec-support (3.9.4)
     rspec_junit_formatter (0.4.1)
       rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (0.89.1)
+    rubocop (1.0.0)
       parallel (~> 1.10)
-      parser (>= 2.7.1.1)
+      parser (>= 2.7.1.5)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.7)
+      regexp_parser (>= 1.8)
       rexml
-      rubocop-ast (>= 0.3.0, < 1.0)
+      rubocop-ast (>= 0.6.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (0.3.0)
-      parser (>= 2.7.1.4)
+    rubocop-ast (1.1.0)
+      parser (>= 2.7.1.5)
     ruby-progressbar (1.10.1)
-    sequel (5.35.0)
+    sequel (5.37.0)
     simplecov (0.17.1)
       docile (~> 1.1)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
-    sleepiq (0.2.2)
-      dalli
-      faraday
-      faraday_middleware
-      thor
-    thor (1.0.1)
     unicode-display_width (1.7.0)
     vault (0.15.0)
       aws-sigv4

data/lib/legion/crypt.rb

@@ -14,16 +14,24 @@ module Legion
 
       include Legion::Crypt::Cipher
 
-      if Legion::Settings[:crypt][:vault][:enabled]
+      unless Gem::Specification.find_by_name('vault').nil?
         require 'legion/crypt/vault'
         include Legion::Crypt::Vault
       end
 
       def start
         Legion::Logging.debug 'Legion::Crypt is running start'
-        # load_keys if Dir.exist?('./settings') && File.exist?('./settings/private.key') && File.exist?('./settings/public.key')
+        ::File.write('./legionio.key', private_key) if settings[:save_private_key]
 
-        # connect_vault unless Legion::Settings[:crypt][:vault][:token].nil?
+        connect_vault unless settings[:vault][:token].nil?
+      end
+
+      def settings
+        if Legion.const_defined?('Settings')
+          Legion::Settings[:crypt]
+        else
+          Legion::Crypt::Settings.default
+        end
       end
 
       def shutdown

data/lib/legion/crypt/cipher.rb

@@ -40,7 +40,11 @@ module Legion
       end
 
       def private_key
-        @private_key ||= OpenSSL::PKey::RSA.new 2048
+        @private_key ||= if Legion::Settings[:crypt][:read_private_key] && File.exist?('./legionio.key')
+                           OpenSSL::PKey::RSA.new File.read './legionio.key'
+                         else
+                           OpenSSL::PKey::RSA.new 2048
+                         end
       end
 
       def cs

data/lib/legion/crypt/settings.rb

@@ -6,7 +6,9 @@ module Legion
           vault:            vault,
           cs_encrypt_ready: false,
           dynamic_keys:     true,
-          cluster_secret:   nil
+          cluster_secret:   nil,
+          save_private_key: true,
+          read_private_key: true
         }
       end
 

data/lib/legion/crypt/vault.rb

@@ -22,6 +22,10 @@ module Legion
 
         require_relative 'vault_renewer'
         @renewer = Legion::Crypt::Vault::Renewer.new
+      rescue StandardError => e
+        Legion::Logging.error e.message
+        Legion::Settings[:crypt][:vault][:connected] = false
+        false
       end
 
       def read(path, type = 'legion')

data/lib/legion/crypt/version.rb

@@ -2,6 +2,6 @@
 
 module Legion
   module Crypt
-    VERSION = '0.2.1'
+    VERSION = '0.2.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: legion-crypt
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Esity
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-25 00:00:00.000000000 Z
+date: 2020-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: vault