foreman-tasks 0.10.0 → 0.10.1

data/lib/foreman_tasks/dynflow/persistence.rb

@@ -1,5 +1,5 @@
 module ForemanTasks
-  # wrap the dynflow persistence to reflect the changes to execution plan
+  # Wrap the Dynflow persistence to reflect the changes to execution plan
   # in the Task model. This is probably a temporary solution and
   # Dynflow will probably get more events-based API but it should be enought
   # for start, until the requiements on the API are clear enough.
@@ -11,7 +11,8 @@ module ForemanTasks
         begin
           on_execution_plan_save(execution_plan_id, value)
         rescue => e
-          Foreman::Logging.exception('Error on on_execution_plan_save event', e, :logger => 'foreman-tasks/dynflow')
+          Foreman::Logging.exception('Error on on_execution_plan_save event', e,
+                                     :logger => 'dynflow')
         end
       end
     ensure

data/lib/foreman_tasks/engine.rb

@@ -20,7 +20,7 @@ module ForemanTasks
     assets_to_precompile =
       Dir.chdir(root) do
         Dir['app/assets/javascripts/**/*', 'app/assets/stylesheets/**/*'].map do |f|
-          f.split(File::SEPARATOR, 4).last.gsub(/\.scss\Z/, '')
+          f.split(File::SEPARATOR, 4).last
         end
       end
 
@@ -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.10.0'.freeze
+  VERSION = '0.10.1'.freeze
 end

data/test/controllers/recurring_logics_controller_test.rb

@@ -0,0 +1,14 @@
+require 'foreman_tasks_test_helper'
+
+module ForemanTasks
+  class RecurringLogicsControllerTest < ActionController::TestCase
+    basic_index_test('recurring_logics')
+    basic_pagination_per_page_test
+
+    # rubocop:disable Style/AccessorMethodName
+    def get_factory_name
+      :recurring_logic
+    end
+    # rubocop:enable Style/AccessorMethodName
+  end
+end

data/test/controllers/tasks_controller_test.rb

@@ -0,0 +1,17 @@
+require 'foreman_tasks_test_helper'
+
+module ForemanTasks
+  class TasksControllerTest < ActionController::TestCase
+    describe ForemanTasks::TasksController do
+      basic_index_test('tasks')
+      basic_pagination_per_page_test
+      basic_pagination_rendered_test
+
+      # rubocop:disable Style/AccessorMethodName
+      def get_factory_name
+        :dynflow_task
+      end
+      # rubocop:enable Style/AccessorMethodName
+    end
+  end
+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.10.0
+  version: 0.10.1
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-19 00:00:00.000000000 Z
+date: 2017-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman-tasks-core
@@ -30,28 +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
-- !ruby/object:Gem::Dependency
-  name: sequel
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.26
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -66,20 +52,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: daemons
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: parse-cron
   requirement: !ruby/object:Gem::Requirement
@@ -128,7 +100,7 @@ files:
 - Gemfile
 - LICENSE
 - README.md
-- app/assets/javascripts/trigger_form.js
+- app/assets/javascripts/foreman_tasks/trigger_form.js
 - app/assets/stylesheets/foreman_tasks/application.css.scss
 - app/assets/stylesheets/foreman_tasks/tasks.css.scss
 - app/assets/stylesheets/foreman_tasks/trigger_form.css
@@ -195,8 +167,6 @@ files:
 - app/views/foreman_tasks/tasks/dashboard/_tasks_status.html.erb
 - app/views/foreman_tasks/tasks/index.html.erb
 - app/views/foreman_tasks/tasks/show.html.erb
-- bin/dynflow-executor
-- bin/foreman-tasks
 - config/foreman-tasks.yaml.example
 - config/routes.rb
 - db/migrate/20131205204140_create_foreman_tasks.rb
@@ -215,9 +185,6 @@ files:
 - db/seeds.d/20-foreman_tasks_permissions.rb
 - db/seeds.d/60-dynflow_proxy_feature.rb
 - db/seeds.d/61-foreman_tasks_bookmarks.rb
-- deploy/foreman-tasks.init
-- deploy/foreman-tasks.service
-- deploy/foreman-tasks.sysconfig
 - extra/dynflow-debug.sh
 - extra/dynflow-executor.example
 - foreman-tasks.gemspec
@@ -228,12 +195,10 @@ files:
 - lib/foreman_tasks/dynflow.rb
 - lib/foreman_tasks/dynflow/configuration.rb
 - lib/foreman_tasks/dynflow/console_authorizer.rb
-- lib/foreman_tasks/dynflow/daemon.rb
 - lib/foreman_tasks/dynflow/persistence.rb
 - lib/foreman_tasks/engine.rb
 - lib/foreman_tasks/task_error.rb
 - lib/foreman_tasks/tasks/cleanup.rake
-- lib/foreman_tasks/tasks/dynflow.rake
 - lib/foreman_tasks/tasks/export_tasks.rake
 - lib/foreman_tasks/test_extensions.rb
 - lib/foreman_tasks/test_helpers.rb
@@ -248,6 +213,8 @@ files:
 - script/rails
 - test/controllers/api/recurring_logics_controller_test.rb
 - test/controllers/api/tasks_controller_test.rb
+- test/controllers/recurring_logics_controller_test.rb
+- test/controllers/tasks_controller_test.rb
 - test/factories/recurring_logic_factory.rb
 - test/factories/task_factory.rb
 - test/factories/triggering_factory.rb
@@ -259,8 +226,8 @@ files:
 - test/unit/actions/proxy_action_test.rb
 - test/unit/cleaner_test.rb
 - 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
@@ -285,13 +252,15 @@ 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: Foreman plugin for showing tasks information for resoruces and users
 test_files:
 - test/controllers/api/recurring_logics_controller_test.rb
 - test/controllers/api/tasks_controller_test.rb
+- test/controllers/recurring_logics_controller_test.rb
+- test/controllers/tasks_controller_test.rb
 - test/factories/recurring_logic_factory.rb
 - test/factories/task_factory.rb
 - test/factories/triggering_factory.rb
@@ -303,8 +272,8 @@ test_files:
 - test/unit/actions/proxy_action_test.rb
 - test/unit/cleaner_test.rb
 - 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

data/bin/dynflow-executor

@@ -1,71 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'optparse'
-
-class ArgvParser
-  attr_reader :options, :command
-
-  def initialize(argv, file)
-    @options = { foreman_root: Dir.pwd }
-
-    opts = OptionParser.new do |opts|
-      opts.banner = banner(file)
-
-      opts.on('-h', '--help', 'Show this message') do
-        puts opts
-        exit 1
-      end
-      opts.on('-f', '--foreman-root=PATH', "Path to Foreman Rails root path. By default '#{@options[:foreman_root]}'") do |path|
-        @options[:foreman_root] = path
-      end
-      opts.on('-c', '--executors-count=COUNT', 'Number of parallel executors to spawn. Overrides EXECUTORS_COUNT environment varaible.') do |count|
-        @options[:executors_count] = count.to_i
-      end
-      opts.on('-m', '--memory-limit=SIZE', 'Limits the amount of memory an executor can consume. Overrides EXECUTOR_MEMORY_LIMIT environment varaible. You can use kb, mb, gb') do |size|
-        @options[:memory_limit] = size
-      end
-      opts.on('--executor-memory-init-delay=SECONDS', 'Start memory polling after SECONDS. Overrides EXECUTOR_MEMORY_MONITOR_DELAY environment varaible.') do |seconds|
-        @options[:memory_init_delay] = seconds.to_i
-      end
-      opts.on('--executor-memory-polling-interval=SECONDS', 'Check for memory useage every SECONDS sec. Overrides EXECUTOR_MEMORY_MONITOR_INTERVAL environment varaible.') do |seconds|
-        @options[:memory_polling_interval] = seconds.to_i
-      end
-    end
-
-    args = opts.parse!(argv)
-    @command = args.first || 'run'
-  end
-
-  def banner(file)
-    banner = <<BANNER
-Run Dynflow executor for Foreman tasks.
-
-Usage: #{File.basename(file)} [options] ACTION"
-
-ACTION can be one of:
-
-* start   - start the executor on background. It creates these files
-          in tmp/pid directory:
-
-            * dynflow_executor_monitor.pid - pid of monitor ensuring
-                                             the executor keeps running
-            * dynflow_executor.pid         - pid of the executor itself
-            * dynflow_executor.output      - stdout of the executor
-* stop    - stops the running executor
-* restart - restarts the running executor
-* run     - run the executor in foreground
-
-BANNER
-    banner
-  end
-end
-
-# run the script if it's executed explicitly
-if $PROGRAM_NAME == __FILE__
-  parser = ArgvParser.new(ARGV, $PROGRAM_NAME)
-
-  app_file = File.expand_path('./config/application', parser.options[:foreman_root])
-  require app_file
-
-  ForemanTasks::Dynflow::Daemon.new.run_background(parser.command, parser.options)
-end

data/bin/foreman-tasks

@@ -1,5 +0,0 @@
-#!/usr/bin/env ruby
-
-foreman_root = '/usr/share/foreman'
-require File.expand_path('./config/application', foreman_root)
-ForemanTasks::Dynflow::Daemon.new.run_background(ARGV.last, :foreman_root => foreman_root)

data/deploy/foreman-tasks.init

@@ -1,231 +0,0 @@
-#!/bin/bash
-#
-# Init script for foreman-tasks
-#
-# chkconfig: - 88 12
-# description: Init script for foreman-tasks
-#
-
-# Source function library.
-. /etc/rc.d/init.d/functions
-
-if [ -f /etc/sysconfig/foreman-tasks ]; then
-    . /etc/sysconfig/foreman-tasks
-fi
-
-prog=foreman-tasks
-RETVAL=0
-FOREMAN_USER=${FOREMAN_USER:-foreman}
-FOREMAN_HOME=${FOREMAN_HOME:-/usr/share/foreman}
-FOREMAN_DATA_DIR=${FOREMAN_DATA_DIR:-/var/lib/foreman}
-FOREMAN_ENV=${FOREMAN_ENV:-production}
-FOREMAN_TASK_PARAMS=${FOREMAN_TASK_PARAMS:--p foreman}
-FOREMAN_PID_DIR=$FOREMAN_HOME/tmp/pids
-FOREMAN_LOG_DIR=${FOREMAN_LOG_DIR:-/var/log/foreman}
-TASK_SCRIPT="/usr/bin/foreman-tasks"
-export RAILS_ENV=$FOREMAN_ENV
-export FOREMAN_LOGGING=${FOREMAN_LOGGING:-warn}
-export FOREMAN_LOGGING_SQL=${FOREMAN_LOGGING_SQL:-warn}
-export RAILS_RELATIVE_URL_ROOT=$FOREMAN_PREFIX
-export BUNDLER_EXT_GROUPS
-export BUNDLER_EXT_NOSTRICT
-export BUNDLER_EXT_HOME=$FOREMAN_HOME
-
-print_higher() {
-    if [ 0$1 -gt 0$2 ]; then
-        echo $1
-    else
-        echo $2
-    fi
-}
-
-print_lower() {
-    if [ 0$1 -gt 0$2 ]; then
-        echo $2
-    else
-        echo $1
-    fi
-}
-
-status_of_one() {
-    PID_FILE="$1"
-    local RC
-    local RETVAL
-    if [ -f "$PID_FILE" ]; then
-        # set $pid
-        __pids_var_run NOT_USED $PID_FILE
-        RC=$?
-        if [ -n "$pid" -o 0$RC -gt 0 ]; then
-            RETVAL=2 # Program is dead and pid file exists
-        fi
-        #check if proces with pid from the file is running
-        if checkpid $pid; then
-            echo "running."
-            RETVAL=0
-        else
-            echo "not running."
-            RETVAL=1
-        fi
-    else
-        echo "not running."
-        RETVAL=3
-    fi
-    return $RETVAL
-}
-
-kstatus() {
-    RETVAL=0
-    SECONDVAL=256
-    echo -n "dynflow_executor is "
-    status_of_one $FOREMAN_PID_DIR/dynflow_executor.pid
-    RC=$?
-    RETVAL=$( print_higher $RC $RETVAL )
-    SECONDVAL=$( print_lower $RC $SECONDVAL )
-    echo -n "dynflow_executor_monitor is "
-    status_of_one $FOREMAN_PID_DIR/dynflow_executor_monitor.pid
-    RC=$?
-    RETVAL=$( print_higher $RC $RETVAL )
-    SECONDVAL=$( print_lower $RC $SECONDVAL )
-    if [  0$SECONDVAL -eq 0  -a  0$RETVAL -gt 0 ]; then
-       # some is running, some not
-       return 10
-    else
-       return $RETVAL
-    fi
-}
-
-status_q() {
-    kstatus &> /dev/null
-    return $?
-}
-
-start() {
-
-    echo -n $"Starting $prog: "
-    status_q
-    STATUS=$?
-    if [ 0$STATUS -eq 0 ]; then
-        echo -n $"$prog is already running. "
-        RETVAL=0
-        echo_success
-    elif [ 0$STATUS -eq 10 ]; then
-        echo -n $"Some processes of $prog is already running. Some not. Please stop $prog first."
-        RETVAL=10
-        echo_failure
-    else
-        # rails expects you to run from the root of the app
-        pushd ${FOREMAN_HOME} >/dev/null
-        # start jobs
-        runuser -s /bin/bash - ${FOREMAN_USER} -c "\
-            BUNDLER_EXT_NOSTRICT='$BUNDLER_EXT_NOSTRICT' \
-            BUNDLER_EXT_HOME='$BUNDLER_EXT_HOME' \
-            RAILS_RELATIVE_URL_ROOT='$RAILS_RELATIVE_URL_ROOT' \
-            RAILS_ENV='$RAILS_ENV' \
-            FOREMAN_LOGGING='$FOREMAN_LOGGING' \
-            FOREMAN_LOGGING_SQL='$FOREMAN_LOGGING_SQL' \
-            $TASK_SCRIPT $FOREMAN_TASK_PARAMS -m -n $FOREMAN_TASK_WORKERS start &>>${FOREMAN_LOG_DIR}/jobs-startup.log"
-        RETVAL=$?
-        if [ $RETVAL = 0 ]; then
-            echo_success
-        else
-            echo_failure
-        fi
-        popd >/dev/null
-    fi
-
-    echo
-    return $RETVAL
-}
-
-stop() {
-
-    status_q
-    STATUS=$?
-    if [ 0$STATUS -eq 0 -o 0$STATUS -eq 10 ]; then
-        # rails expects you to run from the root of the app
-        pushd ${FOREMAN_HOME} >/dev/null
-        runuser -s /bin/bash - ${FOREMAN_USER} -c "\
-            BUNDLER_EXT_NOSTRICT='$BUNDLER_EXT_NOSTRICT' \
-            BUNDLER_EXT_HOME='$BUNDLER_EXT_HOME' \
-            RAILS_RELATIVE_URL_ROOT='$RAILS_RELATIVE_URL_ROOT' \
-            RAILS_ENV='$RAILS_ENV' \
-            FOREMAN_LOGGING='$FOREMAN_LOGGING' \
-            FOREMAN_LOGGING_SQL='$FOREMAN_LOGGING_SQL' \
-            $TASK_SCRIPT $FOREMAN_TASK_PARAMS -m -n $FOREMAN_TASK_WORKERS stop &>>${FOREMAN_LOG_DIR}/jobs-startup.log"
-        if [ -f $FOREMAN_PID_DIR/dynflow_executor_monitor.pid ]; then
-            echo -n $"Stopping dynflow_executor_monitor: "
-            killproc -p $FOREMAN_PID_DIR/dynflow_executor_monitor.pid
-            echo
-        fi
-        if [ -f $FOREMAN_PID_DIR/dynflow_executor.pid ]; then
-            echo -n $"Stopping dynflow_executor: "
-            killproc -p $FOREMAN_PID_DIR/dynflow_executor.pid
-            echo
-        fi
-       popd >/dev/null
-        RETVAL=0
-    else
-        RETVAL=0
-        echo -n "Stopping $prog: "
-        echo_failure
-        echo
-    fi
-
-    return $RETVAL
-}
-
-restart() {
-    stop
-    start
-}
-
-condstop() {
-    status_q
-    STATUS=$?
-    if [ 0$STATUS -eq 0 -o 0$STATUS -eq 10 ]; then
-        stop
-    else
-        RETVAL=0
-    fi
-}
-
-condrestart() {
-    status_q
-    STATUS=$?
-    if [ 0$STATUS -eq 0 -o 0$STATUS -eq 10 ]; then
-        restart
-    else
-        RETVAL=0
-    fi
-}
-
-case "$1" in
-    start)
-        start
-        ;;
-    stop)
-        stop
-        ;;
-    restart)
-        restart
-        ;;
-    condrestart|try-restart)
-        condrestart
-        ;;
-    condstop)
-        condstop
-        ;;
-    status)
-        kstatus
-        RETVAL=$?
-        ;;
-    *)
-        echo "Usage: {start|stop|restart|condrestart|condstop|status}"
-        exit 1
-        ;;
-esac
-
-exit $RETVAL
-
-# vim:set sw=4 ts=4 et:
-