smart_proxy_dynflow_core 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae61c912ffbb4027b1445e41995bbe66a97089c6f498c612b180da1ac91b248b
-  data.tar.gz: 7ce93f5bde709fab044af950c9b6b8664e60f2d173b3147a1beabd3da694fa32
+  metadata.gz: 8c8d92f97c019f9624f042ba66a48f3121b341b1c5f9cfdb3fe5a35a4f83f074
+  data.tar.gz: 9707da718ef1d2d042dd4bade34e2b6d869236058bd9bf0bfcea07011862cf16
 SHA512:
-  metadata.gz: 40f546771cd25e48148fe50041544f663799f757d2aedf0635cc41de0a8b540228d8e116fa81b1d5cfe24913d2e75ac5a9912e9bac2813b8b2506ff894458d54
-  data.tar.gz: 00167adcc5eb1f24f65efa798fa00875bf0db221ba8aa1515d512a168e2c67c407391237f0a6770a1747b3519c5e632cbbb746d0eb1e797e65b967642e4a19d5
+  metadata.gz: 45ced7ab76fefbdbea72fceee20b9b7c77c9394464045d7bff56cccb2882a9fa89f2d01a858e9b2aecd6a29c09f20388b3775873b8bcd65bfdb836a540b0a848
+  data.tar.gz: 4a08ac7bf67111e7644071d2627d341d741496282b13ae134014a8b74956ac1310f397124ea49a9468fc00bf051fd524cba244feae7fc17b050b91cfa14e3048

data/lib/smart_proxy_dynflow_core/api.rb

@@ -1,11 +1,22 @@
 require 'sinatra/base'
 require 'multi_json'
 
+# rubocop:disable Lint/HandleExceptions
+begin
+  require 'proxy/log'
+  require 'proxy/helpers'
+  require 'sinatra/authorization'
+rescue LoadError
+end
+# rubocop:enable Lint/HandleExceptions
+
 module SmartProxyDynflowCore
   class Api < ::Sinatra::Base
     TASK_UPDATE_REGEXP_PATH = %r{/tasks/(\S+)/(update|done)}
     helpers Helpers
 
+    include ::Sinatra::Authorization::Helpers if defined?(::Sinatra::Authorization::Helpers)
+
     configure do
       if Settings.instance.standalone
         ::Sinatra::Base.set :logging, false
@@ -19,8 +30,10 @@ module SmartProxyDynflowCore
         task_id = match[1]
         action = match[2]
         authorize_with_token(task_id: task_id, clear: action == 'done')
-      else
+      elsif Settings.instance.standalone
         authorize_with_ssl_client
+      else
+        do_authorize_any
       end
       content_type :json
     end

data/lib/smart_proxy_dynflow_core/settings.rb

@@ -76,7 +76,7 @@ module SmartProxyDynflowCore
       settings = YAML.load_file(path)
       name = File.basename(path).gsub(/\.yml$/, '')
       if SETTINGS.plugins.key? name
-        settings = SETTINGS.plugins[name].to_h.merge(settings)
+        settings = SETTINGS.plugins[name].to_h.merge(settings || {})
       end
       SETTINGS.plugins[name] = OpenStruct.new settings
     end

data/lib/smart_proxy_dynflow_core/version.rb

@@ -1,3 +1,3 @@
 module SmartProxyDynflowCore
-  VERSION = '0.3.2'.freeze
+  VERSION = '0.3.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_dynflow_core
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire:
 bindir: bin
 cert_chain: []
-date: 1980-01-01 00:00:00.000000000 Z
+date: 2021-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler