smart_proxy_dynflow_core 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c2aa6a1c4c6ccf4382d03834690a695627f66d10
-  data.tar.gz: 6aedf16460fbc6924fac95e1dd4be0ead1b4fc37
+SHA256:
+  metadata.gz: c1f0c156feee597ac1651b3e2270a61487bc5a218689674c14a25d0dd50461bd
+  data.tar.gz: 9eb3130e3cdbad8cf272beb4b1888dad7e6d37701d7a09b071c8b5b3418319c4
 SHA512:
-  metadata.gz: 5aac4b464edb1a3171bb52a6599823e336f532d0dec0dff6a9ffda3343bfea7900ae23e45eba36070f16a34f8fbffd6be97fd53e7af1c81a360a3bcc50a23714
-  data.tar.gz: fcee792dcf9c2494a1437799f4c57bf67cbe5dd6de6debb41ce406edc48cff00948158fe74d70fb180f72c0ae2e08476512f82a38461d303cac1bea1b54a7c7b
+  metadata.gz: ac9892aaa66a79a9a91de820d00801c0cbae75a835a0af8d60b426a304d1d4c14c77e3847b6c832f0003c7e7cec90ba8981996853e1f6808f38555689a89c47f
+  data.tar.gz: c65919387feb38c36067ec8ebddc8578446062147162df7c1673fc0fb7df960e058ab444017bc19e8d63b25062fc867543935e3bab96167089fdd0e9f651d385

data/Gemfile

@@ -13,7 +13,6 @@ group :test do
   if RUBY_VERSION < '2.1'
     gem 'public_suffix', '< 3'
     gem 'rainbow', '< 3'
-    gem 'rubocop', '< 0.51.0'
   else
     gem 'public_suffix'
     gem 'rubocop', '~> 0.52.1'

data/lib/smart_proxy_dynflow_core.rb

@@ -1,3 +1,5 @@
+raise LoadError, 'Ruby >= 2.1 is required' unless RUBY_VERSION >= '2.1'
+
 require 'dynflow'
 require 'smart_proxy_dynflow_core/task_launcher_registry'
 require 'foreman_tasks_core'

data/lib/smart_proxy_dynflow_core/api.rb

@@ -3,10 +3,17 @@ require 'multi_json'
 
 module SmartProxyDynflowCore
   class Api < ::Sinatra::Base
+    TASK_UPDATE_REGEXP_PATH = %r{/tasks/(\S+)/(update|done)}
     helpers Helpers
 
     before do
-      authorize_with_token || authorize_with_ssl_client
+      if match = request.path_info.match(TASK_UPDATE_REGEXP_PATH)
+        task_id = match[1]
+        action = match[2]
+        authorize_with_token(task_id: task_id, clear: action == 'done')
+      else
+        authorize_with_ssl_client
+      end
       content_type :json
     end
 
@@ -45,9 +52,10 @@ module SmartProxyDynflowCore
       tasks_count(params['state']).to_json
     end
 
-    post "/tasks/:task_id/done" do |task_id|
+    # capturing post "/tasks/:task_id/(update|done)"
+    post TASK_UPDATE_REGEXP_PATH do |task_id, _action|
       data = MultiJson.load(request.body.read)
-      complete_task(task_id, data)
+      dispatch_external_event(task_id, data)
     end
 
     get "/tasks/operations" do

data/lib/smart_proxy_dynflow_core/helpers.rb

@@ -4,13 +4,14 @@ module SmartProxyDynflowCore
       SmartProxyDynflowCore::Core.world
     end
 
-    def authorize_with_token
+    def authorize_with_token(task_id:, clear: true)
       if request.env.key? 'HTTP_AUTHORIZATION'
         if defined?(::ForemanTasksCore)
           auth = request.env['HTTP_AUTHORIZATION']
           basic_prefix = /\ABasic /
           if !auth.to_s.empty? && auth =~ basic_prefix &&
-             ForemanTasksCore::OtpManager.authenticate(auth.gsub(basic_prefix, ''))
+             ForemanTasksCore::OtpManager.authenticate(auth.gsub(basic_prefix, ''),
+                                                       expected_user: task_id, clear: clear)
             Log.instance.debug('authorized with token')
             return true
           end
@@ -63,7 +64,7 @@ module SmartProxyDynflowCore
       { :count => tasks.count, :state => state }
     end
 
-    def complete_task(task_id, params)
+    def dispatch_external_event(task_id, params)
       world.event(task_id,
                   params['step_id'].to_i,
                   ::ForemanTasksCore::Runner::ExternalEvent.new(params))

data/lib/smart_proxy_dynflow_core/log.rb

@@ -55,7 +55,7 @@ module SmartProxyDynflowCore
 
     class ProxyStructuredFormater < ::Dynflow::LoggerAdapters::Formatters::Abstract
       def call(_severity, _datetime, _prog_name, message)
-        if ::Exception === message
+        if message.is_a?(::Exception)
           subject = "#{message.message} (#{message.class})"
           if @base.respond_to?(:exception)
             @base.exception("Error details", message)
@@ -74,7 +74,7 @@ module SmartProxyDynflowCore
     end
 
     class ProxyAdapter < ::Dynflow::LoggerAdapters::Simple
-      def initialize(logger, level = Logger::DEBUG, formatters = [])
+      def initialize(logger, level = Logger::DEBUG, _formatters = [])
         @logger           = logger
         @logger.level     = level
         @logger.formatter = ProxyStructuredFormater.new(@logger)

data/lib/smart_proxy_dynflow_core/task_launcher_registry.rb

@@ -1,7 +1,6 @@
 module SmartProxyDynflowCore
   class TaskLauncherRegistry
     class << self
-
       def register(name, launcher)
         registry[name] = launcher
       end

data/lib/smart_proxy_dynflow_core/version.rb

@@ -1,3 +1,3 @@
 module SmartProxyDynflowCore
-  VERSION = '0.2.2'.freeze
+  VERSION = '0.2.3'.freeze
 end

data/smart_proxy_dynflow_core.gemspec

@@ -27,11 +27,10 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency('mocha', '~> 1')
   gem.add_development_dependency('rack-test', '~> 0')
   gem.add_development_dependency "rake", "~> 10.0"
-  gem.add_development_dependency('rubocop', '~> 0.52.1')
   gem.add_development_dependency('webmock', '~> 1')
 
   gem.add_runtime_dependency('dynflow', "~> 1.1")
-  gem.add_runtime_dependency('foreman-tasks-core', '>= 0.1.7')
+  gem.add_runtime_dependency('foreman-tasks-core', '>= 0.3.3')
   gem.add_runtime_dependency('rack')
   gem.add_runtime_dependency('rest-client')
   gem.add_runtime_dependency('sequel')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_dynflow_core
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-08 00:00:00.000000000 Z
+date: 2019-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,20 +80,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.52.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.52.1
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +114,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.7
+        version: 0.3.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.7
+        version: 0.3.3
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -253,8 +239,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Dynflow runtime for Foreman smart proxy