foreman-tasks 0.9.4 → 0.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a742bb53eee4218bb416d13f27591864e779bc34
-  data.tar.gz: 3f229ddbcde5da4a71467ca6ae0c38fc8d54bab7
+  metadata.gz: 2fbc8738b9259442215b12e07307cb605dbdc299
+  data.tar.gz: e172529a5fd0c0950a163e403a8667dab0f8538c
 SHA512:
-  metadata.gz: 3c686088b57ac3eecbd7e7baeb7ef16d78fb7053eeebc98921747c60a547d3cfaf477aa30c48272385d9eadfa30256fa649d830e609eb18291b9f30e56adaf95
-  data.tar.gz: 699713e7bd48e5811d12cae6ff630ab77869cf0079f385defc106ba43851ebac14058f178c260ce5f81000ce4c1fe72132c2058c2af894f6cfd485ed3a2914f5
+  metadata.gz: 16557fbad3ca19db7cef81f6ee905ebcde440c5c397a85e2e5c77bdf1ed97a7984d8e9eb09610d257bb95202cd872241394cd1fcb45365e5bd2204648f8b434c
+  data.tar.gz: 898dba76fa6a6cb556555ea5fbc8403df8070ebe156b37410ada39a4bd58a853d1716f6eb1f4cfde4424e1ab6285086e75d519857db873b850cc4283ddd41586

data/app/controllers/foreman_tasks/tasks_controller.rb

@@ -36,6 +36,16 @@ module ForemanTasks
       redirect_to :back
     end
 
+    def abort
+      task = find_dynflow_task
+      if task.abort
+        flash[:notice] = _('Trying to abort the task')
+      else
+        flash[:warning] = _('The task cannot be aborted at the moment.')
+      end
+      redirect_to :back
+    end
+
     def resume
       task = find_dynflow_task
       if task.resumable?
@@ -86,7 +96,7 @@ module ForemanTasks
       case params[:action]
       when 'sub_tasks'
         :view
-      when 'resume', 'unlock', 'force_unlock', 'cancel_step', 'cancel'
+      when 'resume', 'unlock', 'force_unlock', 'cancel_step', 'cancel', 'abort'
         :edit
       else
         super

data/app/lib/actions/proxy_action.rb

@@ -31,6 +31,8 @@ module Actions
           # do nothing
         when ::Dynflow::Action::Cancellable::Cancel
           cancel_proxy_task
+        when ::Dynflow::Action::Cancellable::Abort
+          abort_proxy_task
         when CallbackData
           on_data(event.data)
         when ::Dynflow::Action::Timeouts::Timeout
@@ -78,6 +80,11 @@ module Actions
       end
     end
 
+    def abort_proxy_task
+      proxy.cancel_task(output[:proxy_task_id])
+      error! ForemanTasks::Task::TaskCancelledException.new(_('Task aborted: the task might be still running on the proxy'))
+    end
+
     def on_resume
       # TODO: add logic to load the data from the external action
       suspend

data/app/models/foreman_tasks/task/dynflow_task.rb

@@ -9,8 +9,8 @@ module ForemanTasks
       self.external_id    = data[:id]
       self.started_at     = utc_zone.parse(data[:started_at]) unless data[:started_at].nil?
       self.ended_at       = utc_zone.parse(data[:ended_at]) unless data[:ended_at].nil?
+      self.result         = map_result(data).to_s
       self.state          = data[:state].to_s
-      self.result         = map_result(data[:result])
       self.start_at       = utc_zone.parse(data[:start_at]) if data[:start_at]
       self.start_before   = utc_zone.parse(data[:start_before]) if data[:start_before]
       self.parent_task_id ||= begin
@@ -32,6 +32,10 @@ module ForemanTasks
       execution_plan!.cancel.any?
     end
 
+    def abort
+      execution_plan!.cancel(true).any?
+    end
+
     def resumable?
       execution_plan.try(:state) == :paused
     end
@@ -148,9 +152,20 @@ module ForemanTasks
 
     private
 
-    def map_result(result)
-      result = :cancelled if result == :error && cancelled?
-      result.to_s
+    def map_result(data)
+      if state_result_transitioned?(%w[planned pending], %w[stopped error], data) ||
+         (data[:result] == :error && cancelled?)
+        :cancelled
+      else
+        data[:result]
+      end
+    end
+
+    def state_result_transitioned?(from, to, data)
+      oldstate, oldresult = from
+      newstate, newresult = to
+      state == oldstate && data[:state].to_s == newstate &&
+        result == oldresult && data[:result].to_s == newresult
     end
 
     def cancelled?

data/config/routes.rb

@@ -12,6 +12,7 @@ Foreman::Application.routes.draw do
       end
       member do
         get :sub_tasks
+        post :abort
         post :cancel
         post :resume
         post :unlock

data/foreman-tasks.gemspec

@@ -29,7 +29,7 @@ same resource. It also optionally provides Dynflow infrastructure for using it f
   s.extra_rdoc_files = Dir['README*', 'LICENSE']
 
   s.add_dependency "foreman-tasks-core"
-  s.add_dependency "dynflow", '~> 0.8.24'
+  s.add_dependency "dynflow", '~> 0.8.26'
   s.add_dependency "sequel" # for Dynflow process persistence
   s.add_dependency "sinatra" # for Dynflow web console
   s.add_dependency "daemons" # for running remote executor

data/lib/foreman_tasks/engine.rb

@@ -58,7 +58,7 @@ module ForemanTasks
         security_block :foreman_tasks do |_map|
           permission :view_foreman_tasks, { :'foreman_tasks/tasks' => [:auto_complete_search, :sub_tasks, :index, :show],
                                             :'foreman_tasks/api/tasks' => [:bulk_search, :show, :index, :summary] }, :resource_type => ForemanTasks::Task.name
-          permission :edit_foreman_tasks, { :'foreman_tasks/tasks' => [:resume, :unlock, :force_unlock, :cancel_step, :cancel],
+          permission :edit_foreman_tasks, { :'foreman_tasks/tasks' => [:resume, :unlock, :force_unlock, :cancel_step, :cancel, :abort],
                                             :'foreman_tasks/api/tasks' => [:bulk_resume] }, :resource_type => ForemanTasks::Task.name
 
           permission :create_recurring_logics, {}, :resource_type => ForemanTasks::RecurringLogic.name

data/lib/foreman_tasks/version.rb

@@ -1,3 +1,3 @@
 module ForemanTasks
-  VERSION = '0.9.4'.freeze
+  VERSION = '0.9.5'.freeze
 end

data/test/unit/otp_manager_test.rb

@@ -0,0 +1,70 @@
+require 'foreman_tasks_test_helper'
+require 'foreman_tasks_core/otp_manager'
+
+module ForemanTasksCore
+  class OtpManagerTest < ActiveSupport::TestCase
+    class TestOtpManager < OtpManager
+      def self.reset!
+        @passwords = nil
+      end
+    end
+
+    before do
+      TestOtpManager.reset!
+    end
+
+    let(:username) { 'myuser' }
+    let(:password) { '123456789' }
+    let(:base64)   { 'bXl1c2VyOjEyMzQ1Njc4OQ==' }
+
+    it 'it doesn\'t raise when no passwords were generated yet' do
+      assert_nil TestOtpManager.drop_otp('missing', 'password')
+    end
+
+    it 'generates OTPs using SecureRandom.hex and converts them to strings' do
+      otp = 4
+      SecureRandom.stubs(:hex).returns(otp)
+      TestOtpManager.generate_otp(username).must_equal otp.to_s
+    end
+
+    it 'removes OTP only when correct username and password is provided' do
+      otp = TestOtpManager.generate_otp(username)
+      assert_nil TestOtpManager.drop_otp('wrong_username', 'wrong_password')
+      assert_nil TestOtpManager.drop_otp(username, 'wrong_password')
+      assert_nil TestOtpManager.drop_otp('wrong_username', otp)
+      TestOtpManager.drop_otp(username, otp).must_equal otp
+    end
+
+    it 'parses the hash correctly' do
+      SecureRandom.stubs(:hex).returns(password)
+      TestOtpManager.expects(:drop_otp).with(username, password.to_s)
+      TestOtpManager.authenticate(base64)
+    end
+
+    it 'authenticates correctly' do
+      SecureRandom.stubs(:hex).returns(password)
+      generated = TestOtpManager.generate_otp(username)
+
+      TestOtpManager.authenticate(base64).must_equal generated
+    end
+
+    it 'OTPs can be used only once' do
+      SecureRandom.stubs(:hex).returns(password)
+      generated = TestOtpManager.generate_otp(username)
+
+      TestOtpManager.authenticate(base64).must_equal generated
+      assert_nil TestOtpManager.authenticate(base64)
+    end
+
+    it 'creates token from username and password correctly' do
+      TestOtpManager.tokenize(username, password).must_equal base64
+    end
+
+    it 'overwrites old OTP when generating a new one for the same username' do
+      old = TestOtpManager.generate_otp(username)
+      new = TestOtpManager.generate_otp(username)
+      assert_nil TestOtpManager.drop_otp(username, old)
+      TestOtpManager.drop_otp(username, new).must_equal new
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman-tasks
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.5
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-11 00:00:00.000000000 Z
+date: 2017-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman-tasks-core
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.24
+        version: 0.8.26
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.24
+        version: 0.8.26
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
@@ -261,6 +261,7 @@ files:
 - test/unit/config/environment.rb
 - test/unit/daemon_test.rb
 - test/unit/dynflow_console_authorizer_test.rb
+- test/unit/otp_manager_test.rb
 - test/unit/proxy_selector_test.rb
 - test/unit/recurring_logic_test.rb
 - test/unit/task_groups_test.rb
@@ -305,6 +306,7 @@ test_files:
 - test/unit/config/environment.rb
 - test/unit/daemon_test.rb
 - test/unit/dynflow_console_authorizer_test.rb
+- test/unit/otp_manager_test.rb
 - test/unit/proxy_selector_test.rb
 - test/unit/recurring_logic_test.rb
 - test/unit/task_groups_test.rb