smart_proxy_dynflow_core 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c84339e46cc155734611a210fb6322994a1f81c7
-  data.tar.gz: be3d332a59589edaa862a08241e04a24910dc823
+  metadata.gz: d9fe367597def9db9fbd344fb30b4dd9c5d19435
+  data.tar.gz: 9db49d78b52c33ae93481ffa39ba66cd8bacb1c7
 SHA512:
-  metadata.gz: 10fd1a252607ae0a5f45e29a01336f84d75776e92ff4300fb4981e6b1f78d72e8ae2c32a57d76763f81f19389a0352dca62599af92e631639903fed17dfc85f1
-  data.tar.gz: 9e176bfa52d6f2ba282ada99839d04eaf03b5dc84285c3dd26136022efcc48775b1ba5a6a0748cf3efcad3d1b510f5a26719ac2c0792fb17ae4c56b3d735b86d
+  metadata.gz: fa39c7be9ff794204f60c6ace3a8e307d67316bd65c0f8a5da88423a4632b6358d9a8f405c3b94bf53c4448b415b6682e68de73330a435518448bf5f722920e9
+  data.tar.gz: 80e21a265765399083b5636fb1231471c67306ad6a0006af59caa50d80b1312c3c9ee650bcc07bc0337f86cb36c8609fb6d9f9a05561861a76db3a0cbe779cdc

data/config/settings.yml.example

@@ -39,3 +39,7 @@
 
 # Log level, one of UNKNOWN, FATAL, ERROR, WARN, INFO, DEBUG
 # :log_level: ERROR
+
+# Maximum age of execution plans to keep before having them cleaned
+# by the execution plan cleaner (in seconds), defaults to 24 hours
+# :execution_plan_cleaner_age: 86400

data/lib/smart_proxy_dynflow_core.rb

@@ -10,3 +10,4 @@ require 'smart_proxy_dynflow_core/api'
 SmartProxyDynflowCore::Core.after_initialize do |dynflow_core|
   ForemanTasksCore.dynflow_setup(dynflow_core.world)
 end
+SmartProxyDynflowCore::Core.register_silencer_matchers ForemanTasksCore.silent_dead_letter_matchers

data/lib/smart_proxy_dynflow_core/api.rb

@@ -7,13 +7,14 @@ module SmartProxyDynflowCore
 
     before do
       logger = Log.instance
-      authorize_with_ssl_client
+      authorize_with_token || authorize_with_ssl_client
       content_type :json
     end
 
     post "/tasks/?" do
       params = MultiJson.load(request.body.read)
-      trigger_task(::Dynflow::Utils.constantize(params['action_name']), params['action_input']).to_json
+      trigger_task(::Dynflow::Utils.constantize(params['action_name']),
+                   params['action_input'].merge(:callback_host => callback_host(params, request))).to_json
     end
 
     post "/tasks/:task_id/cancel" do |task_id|
@@ -27,5 +28,16 @@ module SmartProxyDynflowCore
     get "/tasks/count" do
       tasks_count(params['state']).to_json
     end
+
+    post "/tasks/:task_id/done" do |task_id|
+      data = MultiJson.load(request.body.read)
+      complete_task(task_id, data)
+    end
+
+    private
+
+    def callback_host(params, request)
+      params.fetch('action_input', {})['proxy_url'] || request.env.values_at('HTTP_X_FORWARDED_FOR', 'HTTP_HOST').compact.first
+    end
   end
 end

data/lib/smart_proxy_dynflow_core/core.rb

@@ -42,6 +42,10 @@ module SmartProxyDynflowCore
         config.auto_rescue = true
         config.logger_adapter = logger_adapter
         config.persistence_adapter = persistence_adapter
+        config.execution_plan_cleaner = execution_plan_cleaner
+        # TODO: There has to be a better way
+        matchers = config.silent_dead_letter_matchers.call().concat(self.class.silencer_matchers)
+        config.silent_dead_letter_matchers = matchers
         yield config if block_given?
       end
     end
@@ -54,6 +58,14 @@ module SmartProxyDynflowCore
       end
     end
 
+    def execution_plan_cleaner
+      proc do |world|
+        age = Settings.instance.execution_plan_cleaner_age
+        options = { :poll_interval => age, :max_age => age }
+        ::Dynflow::Actors::ExecutionPlanCleaner.new(world, options)
+      end
+    end
+
     class << self
       attr_reader :instance
 
@@ -64,6 +76,14 @@ module SmartProxyDynflowCore
         @instance
       end
 
+      def silencer_matchers
+        @matchers ||= []
+      end
+
+      def register_silencer_matchers(matchers)
+        silencer_matchers.concat matchers
+      end
+
       def web_console
         require 'dynflow/web'
         dynflow_console = ::Dynflow::Web.setup do

data/lib/smart_proxy_dynflow_core/helpers.rb

@@ -4,6 +4,22 @@ module SmartProxyDynflowCore
       SmartProxyDynflowCore::Core.world
     end
 
+    def authorize_with_token
+      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, ''))
+            Log.instance.debug('authorized with token')
+            return true
+          end
+        end
+        halt 403, MultiJson.dump(:error => 'Invalid username or password supplied')
+      end
+      false
+    end
+
     def authorize_with_ssl_client
       if %w(yes on 1).include? request.env['HTTPS'].to_s
         if request.env['SSL_CLIENT_CERT'].to_s.empty?
@@ -46,5 +62,11 @@ module SmartProxyDynflowCore
       tasks = world.persistence.find_execution_plans(filter)
       { :count => tasks.count, :state => state }
     end
+
+    def complete_task(task_id, params)
+      world.event(task_id,
+                  params['step_id'].to_i,
+                  ::ForemanTasksCore::Runner::ExternalEvent.new(params))
+    end
   end
 end

data/lib/smart_proxy_dynflow_core/settings.rb

@@ -40,13 +40,15 @@ module SmartProxyDynflowCore
         :plugins => {},
         :pid_file => '/var/run/foreman-proxy/smart_proxy_dynflow_core.pid',
         :daemonize => false,
+        :execution_plan_cleaner_age => 60 * 60 * 24,
         :loaded => false
     }
 
     PROXY_SETTINGS = [:ssl_ca_file, :ssl_certificate, :ssl_private_key, :foreman_url,
                       :foreman_ssl_ca, :foreman_ssl_cert, :foreman_ssl_key,
                       :log_file, :log_level, :ssl_disabled_ciphers]
-    PLUGIN_SETTINGS = [:database, :core_url, :console_auth]
+    PLUGIN_SETTINGS = [:database, :core_url, :console_auth,
+                       :execution_plan_cleaner_age]
 
     def initialize(settings = {})
       super(DEFAULT_SETTINGS.merge(settings))

data/lib/smart_proxy_dynflow_core/testing.rb

@@ -16,6 +16,7 @@ module SmartProxyDynflowCore
             config.exit_on_terminate = false
             config.auto_terminate    = false
             config.logger_adapter    = ::Dynflow::LoggerAdapters::Simple.new $stderr, DYNFLOW_TESTING_LOG_LEVEL
+            config.execution_plan_cleaner = nil
             block.call(config) if block
           end
         end

data/lib/smart_proxy_dynflow_core/version.rb

@@ -1,3 +1,3 @@
 module SmartProxyDynflowCore
-  VERSION = '0.1.7'
+  VERSION = '0.1.8'
 end

data/smart_proxy_dynflow_core.gemspec

@@ -30,8 +30,8 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency('rack-test', '~> 0')
   gem.add_development_dependency('rubocop', '0.32.1')
 
-  gem.add_runtime_dependency('foreman-tasks-core', '>= 0.1')
-  gem.add_runtime_dependency('dynflow', "~> 0.8.4")
+  gem.add_runtime_dependency('dynflow', "~> 0.8.29")
+  gem.add_runtime_dependency('foreman-tasks-core', '>= 0.1.7')
   gem.add_runtime_dependency('sequel')
   gem.add_runtime_dependency('sqlite3')
   gem.add_runtime_dependency('sinatra', '~> 1.4')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_dynflow_core
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-15 00:00:00.000000000 Z
+date: 2017-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -109,33 +109,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.32.1
 - !ruby/object:Gem::Dependency
-  name: foreman-tasks-core
+  name: dynflow
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.8.29
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.8.29
 - !ruby/object:Gem::Dependency
-  name: dynflow
+  name: foreman-tasks-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.4
+        version: 0.1.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.4
+        version: 0.1.7
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
@@ -254,7 +254,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Dynflow runtime for Foreman smart proxy