rocketjob_mission_control 3.1.0 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1c601ebf6d78762b41133227dedad5cf2279137fcfbd3dbbfbf68c551309101a
-  data.tar.gz: d9631a241d9d50aaa95dc701406549133f25657368aa40b002955e63037350d8
+  metadata.gz: 04c47815b195983663c44887317137d965b99c5a9e30d40f3b8969585dc7465a
+  data.tar.gz: 789ee3b6b5d9e006f8fa20d310fed0c30ed23dc89353a507cb7a544cfdaf46e8
 SHA512:
-  metadata.gz: 1e5aeb332d6983bb3290ceb0566a1edf07565423665a52e1db8cfd2b28445052bab50c4ac0a48d9dc0bc20acf19425179f96771f69b619b75b994be379d8cf95
-  data.tar.gz: d7d7ee95bd05c7a5901ead43d8bfb10018750ed85b8fcc6bc72a66aef81dfa79a165975a88d6cad237b467f8a806f5f04f568fe8890678b284add102e5c62358
+  metadata.gz: 39413801aeb5be085f2f6ef7f7b9e44641efa786322126f34b9d05e5299ea149e92f5d6ef2d988521717d035d1a76bb300c5479ebf59a58441bb67212efd2621
+  data.tar.gz: 3f9e7b8308596809f4eeb73ed67da1f2fc0e65d879d7199f6f9d506acc2e33bfd7277a24cff3fb9b3a0706c940cfa7a0222acf4a22ecc13f8690c5ea3dea3672

data/Rakefile

@@ -2,7 +2,9 @@
 require 'rubygems'
 require 'bundler/setup'
 
-APP_RAKEFILE = File.expand_path('../rjmc/Rakefile', __FILE__)
+require 'rails/version'
+rakefile     = Rails.version.to_f >= 5.2 ? '../rjmc/Rakefile' : '../rjmc4/Rakefile'
+APP_RAKEFILE = File.expand_path(rakefile, __FILE__)
 load 'rails/tasks/engine.rake'
 
 require 'rake/testtask'

data/app/controllers/rocket_job_mission_control/active_workers_controller.rb

@@ -1,6 +1,7 @@
 module RocketJobMissionControl
   class ActiveWorkersController < RocketJobMissionControl::ApplicationController
     def index
+      authorize! :read, RocketJob::Worker
       @server_name = params[:server_name]
       if job_id = params[:job_id]
         @job = RocketJob::Job.find(job_id)

data/app/controllers/rocket_job_mission_control/application_controller.rb

@@ -6,10 +6,23 @@ module RocketJobMissionControl
 
     private
 
-    def with_time_zone
+    def with_time_zone(&block)
       if time_zone = session['time_zone'] || 'UTC'
-        Time.use_zone(time_zone) { yield }
+        Time.use_zone(time_zone, &block)
       end
     end
+
+    def current_policy
+      @current_policy ||= begin
+        args =
+          if Config.authorization_callback
+            instance_exec(&Config.authorization_callback)
+          else
+            {roles: %i[admin]}
+          end
+        AccessPolicy.new(Authorization.new(args))
+      end
+    end
+
   end
 end

data/app/controllers/rocket_job_mission_control/dirmon_entries_controller.rb

@@ -1,13 +1,20 @@
 module RocketJobMissionControl
   class DirmonEntriesController < RocketJobMissionControl::ApplicationController
     if Rails.version.to_i < 5
-      before_filter :find_entry_or_redirect, except: [:index, :disabled, :enabled, :failed, :pending, :new, :create]
+      before_filter :find_entry_or_redirect, except: %i[index disabled enabled failed pending new create]
+      before_filter :authorize_read, only: %i[index disabled enabled failed pending]
       before_filter :show_sidebar
     else
-      before_action :find_entry_or_redirect, except: [:index, :disabled, :enabled, :failed, :pending, :new, :create]
+      before_action :find_entry_or_redirect, except: %i[index disabled enabled failed pending new create]
+      before_action :authorize_read, only: %i[index disabled enabled failed pending]
       before_action :show_sidebar
     end
 
+    rescue_from AccessGranted::AccessDenied do |exception|
+      raise exception if Rails.env.development? || Rails.env.test?
+      redirect_to :back, alert: 'Access not authorized.'
+    end
+
     def index
       @data_table_url = dirmon_entries_url(format: 'json')
       render_datatable(RocketJob::DirmonEntry.all, 'All')
@@ -46,6 +53,7 @@ module RocketJobMissionControl
     end
 
     def create
+      authorize! :create, RocketJob::DirmonEntry
       @dirmon_entry = RocketJob::DirmonEntry.new(dirmon_params)
       if properties = params[:rocket_job_dirmon_entry][:properties]
         @dirmon_entry.properties = JobSanitizer.sanitize(properties, @dirmon_entry.job_class, @dirmon_entry, false)
@@ -59,14 +67,17 @@ module RocketJobMissionControl
     end
 
     def destroy
+      authorize! :destroy, @dirmon_entry
       @dirmon_entry.destroy
       redirect_to(dirmon_entries_path)
     end
 
     def edit
+      authorize! :edit, @dirmon_entry
     end
 
     def update
+      authorize! :update, @dirmon_entry
       if properties = params[:rocket_job_dirmon_entry][:properties]
         @dirmon_entry.properties = JobSanitizer.sanitize(properties, @dirmon_entry.job_class, @dirmon_entry, false)
       end
@@ -78,6 +89,7 @@ module RocketJobMissionControl
     end
 
     def enable
+      authorize! :enable, @dirmon_entry
       if @dirmon_entry.may_enable?
         @dirmon_entry.enable!
         redirect_to(rocket_job_mission_control.dirmon_entry_path(@dirmon_entry))
@@ -88,6 +100,7 @@ module RocketJobMissionControl
     end
 
     def disable
+      authorize! :disable, @dirmon_entry
       if @dirmon_entry.may_disable?
         @dirmon_entry.disable!
         redirect_to(rocket_job_mission_control.dirmon_entry_path(@dirmon_entry))
@@ -104,6 +117,10 @@ module RocketJobMissionControl
 
     private
 
+    def authorize_read
+      authorize! :read, RocketJob::DirmonEntry
+    end
+
     def show_sidebar
       @dirmon_sidebar = true
     end

data/app/controllers/rocket_job_mission_control/jobs_controller.rb

@@ -1,12 +1,15 @@
 module RocketJobMissionControl
   class JobsController < RocketJobMissionControl::ApplicationController
     if Rails.version.to_i < 5
-      before_filter :find_job_or_redirect, except: [:index, :aborted, :completed, :failed, :paused, :queued, :running, :scheduled]
+      before_filter :find_job_or_redirect, except: %i[index aborted completed failed paused queued running scheduled]
+      before_filter :authorize_read, only: %i[index running paused completed aborted failed queued scheduled]
       before_filter :show_sidebar
     else
-      before_action :find_job_or_redirect, except: [:index, :aborted, :completed, :failed, :paused, :queued, :running, :scheduled]
+      before_action :find_job_or_redirect, except: %i[index aborted completed failed paused queued running scheduled]
+      before_action :authorize_read, only: %i[index running paused completed aborted failed queued scheduled]
       before_action :show_sidebar
     end
+
     rescue_from StandardError, with: :error_occurred
 
     def index
@@ -17,10 +20,14 @@ module RocketJobMissionControl
     end
 
     def running
-      jobs            = RocketJob::Job.running.only(JobsDatatable::RUNNING_FIELDS)
+      # Prevent throttled jobs from displaying.
+      jobs            = RocketJob::Job.
+        running.
+        where(:started_at.lte => (Time.now - 0.1)).
+        only(JobsDatatable::RUNNING_FIELDS)
       @data_table_url = running_jobs_url(format: 'json')
 
-      render_datatable(jobs, 'Running', JobsDatatable::RUNNING_COLUMNS, started_at: :desc)
+      render_datatable(jobs, 'Running', JobsDatatable::RUNNING_COLUMNS, priority: :asc, created_at: :asc)
     end
 
     def paused
@@ -55,7 +62,7 @@ module RocketJobMissionControl
       jobs            = RocketJob::Job.queued_now.only(JobsDatatable::QUEUED_FIELDS)
       @data_table_url = queued_jobs_url(format: 'json')
 
-      render_datatable(jobs, 'Queued', JobsDatatable::QUEUED_COLUMNS, completed_at: :desc)
+      render_datatable(jobs, 'Queued', JobsDatatable::QUEUED_COLUMNS, priority: :asc, created_at: :asc)
     end
 
     def scheduled
@@ -66,6 +73,7 @@ module RocketJobMissionControl
     end
 
     def update
+      authorize! :update, @job
       permitted_params = JobSanitizer.sanitize(params[:job], @job.class, @job)
       if @job.errors.empty? && @job.valid? && @job.update_attributes(permitted_params)
         redirect_to job_path(@job)
@@ -75,64 +83,75 @@ module RocketJobMissionControl
     end
 
     def abort
+      authorize! :abort, @job
       @job.abort!
       redirect_to(job_path(@job))
     end
 
     def destroy
+      authorize! :destroy, @job
       @job.destroy
       redirect_to(jobs_path)
     end
 
     def retry
+      authorize! :retry, @job
       @job.retry!
       redirect_to(job_path(@job))
     end
 
     def pause
+      authorize! :pause, @job
       @job.pause!
       redirect_to(job_path(@job))
     end
 
     def resume
+      authorize! :resume, @job
       @job.resume!
       redirect_to(job_path(@job))
     end
 
     def run_now
+      authorize! :run_now, @job
       @job.unset(:run_at) if @job.scheduled?
       redirect_to(job_path(@job))
     end
 
     def fail
+      authorize! :fail, @job
       @job.fail!
 
       redirect_to(job_path(@job))
     end
 
     def show
+      authorize! :read, @job
     end
 
     def edit
+      authorize! :edit, @job
     end
 
     def exceptions
+      authorize! :read, @job
       @exceptions = @job.input.group_exceptions
     end
 
     def exception
+      authorize! :read, @job
       error_type = params[:error_type]
       offset     = params.fetch(:offset, 0).to_i
 
       unless error_type.present?
-        flash[:notice] = t(:no_errors, scope: [:job, :failures])
+        flash[:notice] = t(:no_errors, scope: %i[job failures])
         redirect_to(job_path(@job))
       end
 
       scope = @job.input.failed.where('exception.class_name' => error_type)
       count = scope.count
       unless count > 0
-        flash[:notice] = t(:no_errors, scope: [:job, :failures])
+        flash[:notice] = t(:no_errors, scope: %i[job failures])
         redirect_to(job_path(@job))
       end
 
@@ -141,19 +160,23 @@ module RocketJobMissionControl
 
       @pagination = {
         offset: offset,
-        total:  (count - 1),
+        total:  (count - 1)
       }
     end
 
     private
 
+    def authorize_read
+      authorize! :read, RocketJob::Job
+    end
+
     def show_sidebar
       @jobs_sidebar = true
     end
 
     def find_job_or_redirect
       unless @job = RocketJob::Job.where(id: params[:id]).first
-        flash[:alert] = t(:failure, scope: [:job, :find], id: params[:id])
+        flash[:alert] = t(:failure, scope: %i[job find], id: params[:id])
 
         redirect_to(jobs_path)
       end
@@ -169,8 +192,14 @@ module RocketJobMissionControl
       else
         logger.error "Error loading a job. #{exception.class}: #{exception.message}\n#{(exception.backtrace || []).join("\n")}"
       end
-      flash[:danger] = 'Error loading jobs.'
-      raise exception if Rails.env.development? || Rails.env.test?
+
+      flash[:danger] = if exception.is_a?(AccessGranted::AccessDenied)
+                         'Access not authorized.'
+                       else
+                         'Error loading jobs.'
+                       end
+
+       raise exception if Rails.env.development? || Rails.env.test?
       redirect_to :back
     end
 
@@ -184,7 +213,7 @@ module RocketJobMissionControl
         end
         format.json do
           query                 = RocketJobMissionControl::Query.new(jobs, sort_order)
-          query.search_columns  = [:_type, :description]
+          query.search_columns  = %i[_type description]
           query.display_columns = columns.collect { |c| c[:field] }.compact
           render(json: JobsDatatable.new(view_context, query, columns))
         end
@@ -194,13 +223,12 @@ module RocketJobMissionControl
     def build_table_layout(columns)
       index = 0
       columns.collect do |column|
-        h             = {data: index.to_s}
-        h[:width]     = column[:width] if column.has_key?(:width)
-        h[:orderable] = column[:orderable] if column.has_key?(:orderable)
-        index         += 1
+        h             = { data: index.to_s }
+        h[:width]     = column[:width] if column.key?(:width)
+        h[:orderable] = column[:orderable] if column.key?(:orderable)
+        index += 1
         h
       end
     end
-
   end
 end

data/app/controllers/rocket_job_mission_control/servers_controller.rb

@@ -1,13 +1,20 @@
 module RocketJobMissionControl
   class ServersController < RocketJobMissionControl::ApplicationController
     if Rails.version.to_i < 5
-      before_filter :find_server_or_redirect, only: [:stop, :pause, :resume, :destroy]
+      before_filter :find_server_or_redirect, only: %i[stop pause resume destroy]
+      before_filter :authorize_read, only: %i[index starting running paused stopping zombie]
       before_filter :show_sidebar
     else
-      before_action :find_server_or_redirect, only: [:stop, :pause, :resume, :destroy]
+      before_action :find_server_or_redirect, only: %i[stop pause resume destroy]
+      before_action :authorize_read, only: %i[index starting running paused stopping zombie]
       before_action :show_sidebar
     end
 
+    rescue_from AccessGranted::AccessDenied do |exception|
+      raise exception if Rails.env.development? || Rails.env.test?
+      redirect_to :back, alert: 'Access not authorized.'
+    end
+
     def index
       @data_table_url = servers_url(format: 'json')
       @actions        = [:pause_all, :resume_all, :stop_all, :destroy_zombies]
@@ -47,6 +54,7 @@ module RocketJobMissionControl
     VALID_ACTIONS = [:stop_all, :pause_all, :resume_all, :destroy_zombies]
 
     def update_all
+      authorize! :destroy, RocketJob::Server
       server_action = params[:server_action].to_sym
       if VALID_ACTIONS.include?(server_action)
         RocketJob::Server.public_send(server_action.to_sym)
@@ -61,6 +69,7 @@ module RocketJobMissionControl
     end
 
     def stop
+      authorize! :stop, @server
       if @server.may_stop?
         @server.stop!
       else
@@ -73,6 +82,7 @@ module RocketJobMissionControl
     end
 
     def destroy
+      authorize! :destroy, @server
       @server.destroy
       flash[:notice] = t(:success, scope: [:server, :destroy])
 
@@ -82,6 +92,7 @@ module RocketJobMissionControl
     end
 
     def pause
+      authorize! :pause, @server
       if @server.may_pause?
         @server.pause!
       else
@@ -94,6 +105,7 @@ module RocketJobMissionControl
     end
 
     def resume
+      authorize! :resume, @server
       if @server.may_resume?
         @server.resume!
       else
@@ -107,6 +119,10 @@ module RocketJobMissionControl
 
     private
 
+    def authorize_read
+      authorize! :read, RocketJob::Server
+    end
+
     def render_datatable(servers, description)
       respond_to do |format|
         format.html do

data/app/datatables/rocket_job_mission_control/abstract_datatable.rb

@@ -48,7 +48,6 @@ module RocketJobMissionControl
     def extract_sort(order)
       return nil unless order.present?
 
-      ap order
       sort_by = {}
       order.each_pair do |key, value|
         name = query.display_columns[value[:column].to_i]

data/app/datatables/rocket_job_mission_control/jobs_datatable.rb

@@ -4,7 +4,7 @@ module RocketJobMissionControl
              :abort_job_path, :job_path, :fail_job_path, :run_now_job_path, :pause_job_path,
              :resume_job_path, :retry_job_path, :exception_job_path, :job_action_link, :exceptions_job_path, to: :@view
 
-    COMMON_FIELDS = [:id, :_type, :description, :completed_at, :created_at, :started_at, :state, :worker_name].freeze
+    COMMON_FIELDS = [:id, :_type, :description, :completed_at, :created_at, :started_at, :state, :worker_name, :login].freeze
 
     ABORTED_COLUMNS = [
       {display: 'Class', value: :class_with_link, field: '_type', width: '30%'},
@@ -156,19 +156,21 @@ module RocketJobMissionControl
     def action_buttons(job)
       events  = valid_events(job)
       buttons = "<div class='inline-job-actions'>"
-      if job.scheduled?
+      if job.scheduled? && view.can?(:run_now, job)
         buttons += "#{ job_action_link('Run', run_now_job_path(job), :patch) }"
       end
-      if events.include?(:pause)
+      if events.include?(:pause) && view.can?(:pause, job)
         buttons += "#{ job_action_link('Pause', pause_job_path(job), :patch) }"
       end
-      if events.include?(:resume)
+      if events.include?(:resume) && view.can?(:resume, job)
         buttons += "#{ job_action_link('Resume', resume_job_path(job), :patch) }"
       end
-      if events.include?(:retry)
+      if events.include?(:retry) && view.can?(:retry, job)
         buttons += "#{ job_action_link('Retry', retry_job_path(job), :patch) }"
       end
-      buttons += "#{ job_action_link('Destroy', job_path(job), :delete) }"
+      if view.can?(:destroy, job)
+        buttons += "#{ job_action_link('Destroy', job_path(job), :delete) }"
+      end
       buttons += "</div>"
     end