exoauth 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0417275861e8def76ab9f53cc0e62c74670dcb790c4dd8b695e7debbc3613fbe'
-  data.tar.gz: c1827f16b9a16293079ae609f2f451dd4f7957a4b4740777aacd5299df9b1c31
+  metadata.gz: 456dcc39fe3e7ec3fc82d5a1ffaeaf2e96b27c508cd31d7684b8d3c6483a262d
+  data.tar.gz: ede542d5edd11be158c01fba4f1a364f62cb9a47dfb19dfb79c68c719fa33f0b
 SHA512:
-  metadata.gz: 3c89974b8622adbab518a1b5a76c8a87f17a25b8da419347234433d1884cc866aa57f26ee1988913a29a5055c992b8cb06f07b1c390b83322b76652b047932e1
-  data.tar.gz: 2e8a34be42eb834f0ba76b42b9e5c5a19ffe41549576bdafac5a87366764263cbd7f989e0f90d9950410ba50f24f80dc9da81fcd52821c21dff87b892a5c0977
+  metadata.gz: 5c68fc8d512b173d8e6413202d1a75d67ba210dd83795768714b0037ad1a4e3575b0d341e07d6f3df4d1421948cc279c8594515938e78b0acf1d7ed3dd4cb9a8
+  data.tar.gz: 872a4d6381b68f4bd9e2b17f9a9f2c2f2716f575ae92931d53b2970f088b1b905b93ef8a5756917405187cc7ca17ebb2cf9ee144e5411c055769bd4220df25ca

data/README.md

@@ -11,7 +11,15 @@ AuthHelpers: This gem provides auth helpers for a Ruby project.
 
 ## Getting started
 
+`bundle`
+
+`rake build`
+
+`gem push [GEM.gem]`
+
+
 ### Requirements
 
 - Ruby 2.5+
 - JWT 2.3.0
+- ExoBasic 0.1.0

data/lib/exoauth/auth.rb

@@ -97,6 +97,26 @@ module ExoAuth
       pub_key
     end
 
+    def self.key_from_string(str, algorithm)
+      key = nil
+      case algorithm
+      when 'HS256'
+        key = str
+      when 'ES384', 'ES512', 'RS256'
+        key = OpenSSL::PKey.read(str)
+      end
+
+      key
+    end
+
+    def self.key_from_env(varname, algorithm)
+      Auth.key_from_string(ENV[varname], algorithm)
+    end
+
+    def self.key_from_settings(field, algorithm)
+      Auth.key_from_string(@@conf[field], algorithm)
+    end
+
     def self.key_from_file(fname, algorithm)
       key = nil
       File.open(fname) do |file|
@@ -175,60 +195,38 @@ module ExoAuth
           payload
         end
       rescue JWT::DecodeError => e
-        return false
+        false
       end
     end
 
-    @@app_signing_key = ExoBasic::Settings.try_get_key(@@conf,
-                                                       true,
-                                                       'signing_enabled') ?
-                        Auth.key_from_file(
-                          File.expand_path(
-                            ExoBasic::Settings.try_get_key(@@conf,
-                                                           Auth::DEFAULT_SIGNING_KEY_PATH,
-                                                           'signing_key_path'),
-                            __FILE__),
-                          Auth.app_algorithm) :
-                        nil
-
-    @@app_verify_key = ExoBasic::Settings.try_get_key(@@conf,
-                                                      true,
-                                                      'verify_enabled') ?
-                       Auth.key_from_file(
-                         File.expand_path(
-                           ExoBasic::Settings.try_get_key(@@conf,
-                                                          Auth::DEFAULT_VERIFY_KEY_PATH,
-                                                          'verify_key_path'),
-                           __FILE__),
-                         Auth.app_algorithm) :
-                       nil
+    def self.init_app_key(conf, prefix)
+      if conf.key?("#{prefix}_key_path")
+        fname = File.expand_path(conf["#{prefix}_key_path"], __FILE__)
+        Auth.key_from_file(fname, Auth.app_algorithm)
+      elsif conf.key?("#{prefix}_key_env_variable")
+        varname = conf["#{prefix}_key_env_variable"]
+        Auth.key_from_env(varname, Auth.app_algorithm)
+      elsif conf.key?("#{prefix}_key")
+        field = "#{prefix}_key"
+        Auth.key_from_settings(field, Auth.app_algorithm)
+      elsif conf.key?("#{prefix}_enabled")
+        fname = File.expand_path(Auth::DEFAULT_VERIFY_KEY_PATH, __FILE__)
+        Auth.key_from_file(fname, Auth.app_algorithm)
+      else
+        nil
+      end
+    end
+
+    @@app_signing_key = Auth.init_app_key(@@conf, 'signing')
+
+    @@app_verify_key = Auth.init_app_key(@@conf, 'verify')
 
     def self.settings_reloaded
       @@conf = ExoBasic::Settings.loaded['user_auth']
 
-      @@app_signing_key = ExoBasic::Settings.try_get_key(@@conf,
-                                                         true,
-                                                         'signing_enabled') ?
-                          Auth.key_from_file(
-                            File.expand_path(
-                              ExoBasic::Settings.try_get_key(@@conf,
-                                                             Auth::DEFAULT_SIGNING_KEY_PATH,
-                                                             'signing_key_path'),
-                              __FILE__),
-                            Auth.app_algorithm) :
-                          nil
-
-      @@app_verify_key = ExoBasic::Settings.try_get_key(@@conf,
-                                                        true,
-                                                        'verify_enabled') ?
-                         Auth.key_from_file(
-                           File.expand_path(
-                             ExoBasic::Settings.try_get_key(@@conf,
-                                                            Auth::DEFAULT_VERIFY_KEY_PATH,
-                                                            'verify_key_path'),
-                             __FILE__),
-                           Auth.app_algorithm) :
-                         nil
+      @@app_signing_key = Auth.init_app_key(@@conf, 'signing')
+
+      @@app_verify_key = Auth.init_app_key(@@conf, 'verify')
     end
 
     def self.get_app_signing_key

data/lib/exoauth/version.rb

@@ -1,3 +1,3 @@
 module ExoAuth
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: exoauth
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Dionysios Kakolyris
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-18 00:00:00.000000000 Z
+date: 2022-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jwt