foreman-tasks 0.6.7 → 0.6.8

data/app/lib/actions/foreman/host/import_facts.rb

@@ -17,7 +17,7 @@ module Actions
         def run
           ::User.as :admin do
             host           = ::Host.find(input[:host][:id])
-            state          = host.importFacts(input[:facts])
+            state          = host.import_facts(input[:facts])
             output[:state] = state
           end
         rescue ::Foreman::Exception => e

data/app/models/foreman_tasks/task.rb

@@ -73,6 +73,7 @@ module ForemanTasks
     end
 
     def self.search_by_generic_resource(key, operator, value)
+      key =  "resource_type" if key.blank?
       key_name = self.connection.quote_column_name(key.sub(/^.*\./,''))
       condition = sanitize_sql_for_conditions(["foreman_tasks_locks.#{key_name} #{operator} ?", value])
 
@@ -89,7 +90,12 @@ module ForemanTasks
       INNER JOIN users
                  ON (users.id = foreman_tasks_locks_owner.resource_id)
       JOINS
-      condition = sanitize_sql_for_conditions(["users.#{key_name} #{operator} ?", value])
+
+      condition = if key.blank?
+                    sanitize_sql_for_conditions(["users.login #{operator} ? or users.firstname #{operator} ? ", value, value])
+                  else
+                    sanitize_sql_for_conditions(["users.#{key_name} #{operator} ?", value])
+                  end
       return {:conditions => condition, :joins => joins }
     end
 

data/app/models/setting/foreman_tasks.rb

@@ -6,7 +6,8 @@ class Setting::ForemanTasks < Setting
 
     self.transaction do
       [
-          self.set('dynflow_enable_console', N_("Enable the dynflow console (/foreman_tasks/dynflow) for debugging"), false),
+          self.set('dynflow_enable_console', N_("Enable the dynflow console (/foreman_tasks/dynflow) for debugging"), true),
+          self.set('dynflow_console_require_auth', N_("Require user to be authenticated as user with admin rights when accessing dynflow console"), true)
       ].each { |s| self.create! s.update(:category => "Setting::ForemanTasks")}
     end
 

data/lib/foreman_tasks/dynflow.rb

@@ -82,7 +82,13 @@ module ForemanTasks
     def web_console
       ::Dynflow::WebConsole.setup do
         before do
-          if !Setting[:dynflow_enable_console]
+          rack_request = Rack::Request.new(env)
+          user_id, expires_at = rack_request.session.
+            values_at('user', 'expires_at')
+          if Setting[:dynflow_console_require_auth] &&
+              (!Setting[:dynflow_enable_console] ||
+               (user_id.nil? || !User.find(user_id).admin) ||
+               Time.now.to_i > expires_at)
             redirect('dashboard')
           end
         end

data/lib/foreman_tasks/version.rb

@@ -1,3 +1,3 @@
 module ForemanTasks
-  VERSION = "0.6.7"
+  VERSION = "0.6.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman-tasks
 version: !ruby/object:Gem::Version
-  version: 0.6.7
+  version: 0.6.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-06 00:00:00.000000000 Z
+date: 2014-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails