foreman-tasks-core 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c036a816a81a10ce427600ce920c1aa98c59bb2c317dcba1662f906941d00e0
-  data.tar.gz: 3e74db375442e42f0ad7e7f5887d1cd5ab79b311d86c1389f24fb5d168146a70
+  metadata.gz: abcc4c01c4d9f9fb4a7e005541412aade04c1b81e748895f6df4f8f43773c4e7
+  data.tar.gz: f96d41808af6bd9d397d3de0373fd419dec70be99d511a3b79e5115c5d8788f5
 SHA512:
-  metadata.gz: 7c68ff530abb93733509feb1201d74c7588b1edc3e90c6caf2fd54fce11aedeb760595c2ce3fcf8f208fe5eafbc7bca00aecec08ee4b28d0b1e438c6b81938d1
-  data.tar.gz: f1e5baa029323687099e055874464d1710ddbcc8488207fcb64bdc5f5682ff90311c8db6fbf5ce6eb372a4d9eb821df51ac26a5e151bbc6d4551983a896e6f82
+  metadata.gz: 9b9a6cf299314a66b853709061ad0c5c8a19f09b2d873432ff0ceb585c830fa712ac2723324dfced9c6317ab4505dcb44ca1b0ca51f442a3813dc8c3aa618702
+  data.tar.gz: 8ba43deac4f52417c549aafda4ef9b82e38598bca121a3ae3d33609a6ce14594a676a409b4882f367a95f7226d72bc19655262e0b9cc4140cd5ba3d0c1ae27df

data/lib/foreman_tasks_core/otp_manager.rb

@@ -17,10 +17,15 @@ module ForemanTasksCore
         @password ||= {}
       end
 
-      def authenticate(hash)
+      def authenticate(hash, expected_user: nil, clear: true)
         plain = Base64.decode64(hash)
         username, otp = plain.split(':', 2)
-        drop_otp(username, otp)
+        if expected_user
+          return false unless expected_user == username
+        end
+        password_matches = passwords[username] == otp
+        passwords.delete(username) if clear && password_matches
+        password_matches
       end
 
       def tokenize(username, password)

data/lib/foreman_tasks_core/runner/base.rb

@@ -22,6 +22,13 @@ module ForemanTasksCore
         generate_updates
       end
 
+      # by default, external event just causes the refresh to be triggered: this allows the descendants
+      # of the Base to add custom logic to process the external events.
+      # Similarly as `run_refresh`, it's expected to return updates to be dispatched.
+      def external_event(_event)
+        run_refresh
+      end
+
       def start
         raise NotImplementedError
       end
@@ -69,10 +76,18 @@ module ForemanTasksCore
       end
 
       def generate_updates
-        return {} if @continuous_output.empty? && @exit_status.nil?
+        return no_update if @continuous_output.empty? && @exit_status.nil?
         new_data = @continuous_output
         @continuous_output = ForemanTasksCore::ContinuousOutput.new
-        { @suspended_action => Runner::Update.new(new_data, @exit_status) }
+        new_update(new_data, @exit_status)
+      end
+
+      def no_update
+        {}
+      end
+
+      def new_update(data, exit_status)
+        { @suspended_action => Runner::Update.new(data, exit_status) }
       end
 
       def initialize_continuous_outputs

data/lib/foreman_tasks_core/runner/dispatcher.rb

@@ -37,17 +37,19 @@ module ForemanTasksCore
 
         def refresh_runner
           @logger.debug("refresh runner #{@runner.id}")
-          updates = @runner.run_refresh
+          dispatch_updates(@runner.run_refresh)
+        ensure
+          @refresh_planned = false
+          plan_next_refresh
+        end
 
+        def dispatch_updates(updates)
           updates.each { |receiver, update| (receiver || @suspended_action) << update }
 
           # This is a workaround when the runner does not accept the suspended action
           main_key = updates.keys.any?(&:nil?) ? nil : @suspended_action
           main_process = updates[main_key]
           finish if main_process && main_process.exit_status
-        ensure
-          @refresh_planned = false
-          plan_next_refresh
         end
 
         def timeout_runner
@@ -77,8 +79,8 @@ module ForemanTasksCore
           finish_termination
         end
 
-        def external_event(_event)
-          refresh_runner
+        def external_event(event)
+          dispatch_updates(@runner.external_event(event))
         end
 
         private

data/lib/foreman_tasks_core/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman-tasks-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: 2019-04-09 00:00:00.000000000 Z
+date: 2019-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dynflow
@@ -77,8 +77,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Common code used both at Forman and Foreman proxy regarding tasks