foreman_remote_execution 2.0.4 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d591db6ed8d68889930cc5159f943f5512e4f1cc9803aa4d55e6462789dbaeec
-  data.tar.gz: 9738453478cc9f29a39eb4a48dae434e55111ed0ef393201ba495dbabbca724d
+  metadata.gz: 4aba9a7fccd6e4e3833bd7b102ea464e7266947d2b661ed23665588b969ce848
+  data.tar.gz: 037e1902f40fa780a090aca7f0141be58e0a10805afef0ca0ae5ebc3f7675e2a
 SHA512:
-  metadata.gz: 9abd0b27d9ad9a13597b28b205bf49d97320f45d1a8851a4d09ae01b9419542b1c4a2dc98370409de37ce777ef2e6fc212e9b048e914f7c49522d32d90d1f25c
-  data.tar.gz: 6549291f03f9b1a00865c0ec0d1b0dba18dc3b0912a1488d8f600c41c5eadb42658392b162f7666c16c4a522b4120d6d74178d1ec682ad6db5ee51b278663c0b
+  metadata.gz: a79d209933c9b81a4f0276e20602241147e442f4060d62afd0eab6ccc1d22a65c5b8e95025abfcb0be013ac5d7857f4ccc3cddbea2abf7b67bc2174d6a572406
+  data.tar.gz: 19e249a6a63c909a36fb89e7f614d0db5224d4c14b6dbff92fc078a5259eba9f9cf8d6d9e852f81bb73e32cd9a773dff5b95c48b21223406a6040e4474639802

data/.rubocop.yml

@@ -3,22 +3,25 @@ inherit_from:
 
 AllCops:
   Exclude:
+    - 'config/routes.rb'
+    - 'node_modules/**'
+    - 'test/**/*'
     - 'doc/plugins/**'
 
 Rails:
   Enabled: true
   Exclude:
     - 'lib/foreman_remote_execution_core/**'
+    - 'node_modules/**'
 
 Rails/Date:
   Enabled: false
 
-# Don't enforce documentation
-Style/Documentation:
+Metrics:
   Enabled: false
 
-Metrics/MethodLength:
-  Max: 40
+Style/Documentation:
+  Enabled: false
 
 Style/TrailingCommaInArrayLiteral:
   Enabled: false
@@ -35,14 +38,10 @@ Naming/AccessorMethodName:
 Style/RedundantSelf:
   Enabled: false
 
-Metrics/ClassLength:
-  Max: 500
-  Exclude:
-       - 'test/**/*'
-
 Naming/FileName:
   Exclude:
       - 'db/seeds.d/*'
+      - 'node_modules/font-awesome-sass/lib/font-awesome-sass.rb'
 
 Style/WordArray:
   Enabled: false
@@ -62,15 +61,6 @@ Style/EachWithObject:
 Style/GuardClause:
   Enabled: false
 
-Metrics/BlockLength:
-  Exclude:
-       - 'config/routes.rb'
-       - 'lib/foreman_remote_execution/engine.rb'
-       - 'test/**/*'
-
-Metrics/ParameterLists:
-  Enabled: false
-
 Naming/VariableNumber:
   Enabled: false
 
@@ -102,12 +92,6 @@ Style/SafeNavigation:
 Lint/BooleanSymbol:
   Enabled: false
 
-Metrics/PerceivedComplexity:
-  Max: 8
-
-Metrics/AbcSize:
-  Max: 45
-
 Style/FrozenStringLiteralComment:
   Enabled: false
 

data/README.md

@@ -44,6 +44,14 @@ Because it doesn't really open the outgoing connections, it doesn't need hosts w
 
 Fork and send a Pull Request. Thanks!
 
+To run Rubocop use the rake task in foreman dir:
+
+    bundle exec rake foreman_remote_execution:rubocop
+
+Auto correct can be executed directly too:
+
+    bundle exec rubocop ~/work/foreman_remote_execution -a
+
 ## Release Process
 
 ### Pull Translations from Transifex

data/app/views/job_invocations/_form.html.erb

@@ -33,7 +33,7 @@
       <% end %>
     </span>
     <%= selectable_f targeting_fields, :bookmark_id, @composer.available_bookmarks.map { |b| [b.name, b.id] }, :selected => @composer.targeting.bookmark_id, :include_blank => true %>
-    <%= textarea_f targeting_fields, :search_query, :value => @composer.displayed_search_query, :rows => 5, :class => 'autocomplete-input form-control', :'data-url' => auto_complete_search_hosts_path %>
+    <%= autocomplete_f targeting_fields, :search_query, :search_query => @composer.displayed_search_query, :full_path => auto_complete_search_hosts_path %>
 
     <div class="form-group ">
       <label class="col-md-2 control-label"><%= _('Resolves to') %></label>

data/extra/cockpit/foreman-cockpit-session

@@ -8,7 +8,7 @@ require "yaml"
 # Logging
 
 LOG = Logger.new($stderr)
-LOG.formatter = proc { | severity, datetime, progname, msg | "#{severity}: #{msg}\n" }
+LOG.formatter = proc { |severity, datetime, progname, msg| "#{severity}: #{msg}\n" }
 
 def safe_log(format_string, data = nil)
   if data.is_a? Hash
@@ -26,7 +26,7 @@ end
 
 def read_settings
   settings_path = ENV["FOREMAN_COCKPIT_SETTINGS"] || "/etc/foreman-cockpit/settings.yml"
-  settings = YAML.load(File.read(settings_path))
+  settings = YAML.safe_load(File.read(settings_path))
   LOG.level = Logger.const_get(settings.fetch(:log_level, "INFO"))
   LOG.info("Running foreman-cockpit-session with settings from #{settings_path}:\n#{settings.inspect}")
   settings
@@ -46,7 +46,7 @@ def read_control
   raise ArgumentError, "Invalid frame: invalid size" if size.zero?
   data = $stdin.read(size)
   LOG.debug("Received control message #{data.lstrip}")
-  raise ArgumentError, "Invalid frame: too short" if data == nil || data.length < size
+  raise ArgumentError, "Invalid frame: too short" if data.nil? || data.length < size
   JSON.parse(data)
 end
 
@@ -55,18 +55,16 @@ end
 def send_auth_challenge(challenge)
   send_control({ "command" => "authorize",
                  "cookie" => "1234", # must be present, but value doesn't matter
-                 "challenge" => challenge
-               })
+                 "challenge" => challenge})
 end
 
 def send_auth_response(response)
   send_control({ "command" => "authorize",
-                 "response" => response
-               })
+                 "response" => response})
 end
 
 def read_auth_reply
-  cmd = read_control()
+  cmd = read_control
   response = cmd["response"]
   raise ArgumentError, "Did not receive a valid authorize command" if cmd["command"] != "authorize" || !response
   response
@@ -77,8 +75,7 @@ def exit_with_problem(problem, message, auth_methods)
   send_control({ "command" => "init",
                  "problem" => problem,
                  "message" => message,
-                 "auth-method-results" => auth_methods
-               })
+                 "auth-method-results" => auth_methods})
   exit 1
 end
 
@@ -137,7 +134,7 @@ def ssh_read_and_handle_response_header(sock, url, params)
   header = ""
   loop do
     line = sock.readline
-    break unless line and line != "\r\n"
+    break unless line && (line != "\r\n")
     header += line
   end
 
@@ -145,11 +142,11 @@ def ssh_read_and_handle_response_header(sock, url, params)
   status = status_line.split(" ")[1]
   if status != "101"
     m = /^Content-Length:[ \t]*([0-9]+)\r?$/i.match(headers_text)
-    if m
-      expected_len = m[1].to_i
-    else
-      expected_len = -1
-    end
+    expected_len = if m
+      m[1].to_i
+                   else
+      -1
+                   end
     response = ""
     while expected_len < 0 || response.length < expected_len
       begin
@@ -162,7 +159,7 @@ def ssh_read_and_handle_response_header(sock, url, params)
       exit_with_problem("access-denied", "The proxy #{url.hostname} does not support web console sessions", nil)
     elsif status[0] == "4"
       if response.include? "cockpit-bridge: command not found"
-        exit_with_problem("access-denied", "#{params["hostname"]} has no web console", nil)
+        exit_with_problem("access-denied", "#{params['hostname']} has no web console", nil)
       else
         exit_with_problem("access-denied", response, nil)
       end
@@ -191,16 +188,14 @@ def ssh_read_sock(sock)
 end
 
 def ssh_write_sock(sock, data)
-  begin
     sock.write_nonblock(data)
-  rescue IO::WaitWritable
+rescue IO::WaitWritable
     0
-  rescue IO::WaitReadable
+rescue IO::WaitReadable
     # This might happen with SSL during a renegotiation.  Block a
     # bit to get it over with.
     IO.select([sock])
     retry
-  end
 end
 
 def ssh_with_proxy(proxy, params)
@@ -208,7 +203,7 @@ def ssh_with_proxy(proxy, params)
   LOG.debug("Connecting to proxy at #{url}")
   raw_sock = TCPSocket.open(url.hostname, url.port)
   if url.scheme == 'https'
-    ssl_context = OpenSSL::SSL::SSLContext.new()
+    ssl_context = OpenSSL::SSL::SSLContext.new
     ssl_context.cert = OpenSSL::X509::Certificate.new(File.read(SETTINGS[:ssl_certificate]))
     ssl_context.key = OpenSSL::PKey.read(File.read(SETTINGS[:ssl_private_key]))
     sock = OpenSSL::SSL::SSLSocket.new(raw_sock, ssl_context)
@@ -253,7 +248,7 @@ def ssh_with_proxy(proxy, params)
       begin
         n = ssh_write_sock(sock, inp_buf)
         inp_buf = inp_buf[n..-1]
-        raw_sock.close_write() if inp_buf == "" and ws_eof
+        raw_sock.close_write if (inp_buf == "") && ws_eof
       end
     end
 
@@ -262,16 +257,15 @@ def ssh_with_proxy(proxy, params)
         inp_buf += $stdin.readpartial(4096)
       rescue EOFError
         ws_eof = true
-        raw_sock.close_write() if inp_buf == ""
+        raw_sock.close_write if inp_buf == ""
       end
     end
 
-    if w.include?($stdout)
-      n = $stdout.write(out_buf)
-      $stdout.flush()
-      out_buf = out_buf[n..-1]
-      break if out_buf == "" and bridge_eof
-    end
+    next unless w.include?($stdout)
+    n = $stdout.write(out_buf)
+    $stdout.flush
+    out_buf = out_buf[n..-1]
+    break if (out_buf == "") && bridge_eof
 
   end
 end
@@ -283,7 +277,7 @@ SETTINGS = read_settings
 host = ARGV[0]
 
 send_auth_challenge("*")
-token = get_token_from_auth_data(read_auth_reply())
+token = get_token_from_auth_data(read_auth_reply)
 
 params = foreman_call("cockpit/host_ssh_params/#{host}", token)
 exit_with_problem("access-denied", "Host #{host} is not known", nil) unless params

data/lib/foreman_remote_execution/engine.rb

@@ -157,32 +157,32 @@ module ForemanRemoteExecution
       #   ProvisioningTemplate.reflect_on_association :template_inputs # => nil
       require_dependency 'job_template'
       (Template.descendants + [Template]).each { |klass| klass.send(:include, ForemanRemoteExecution::TemplateExtensions) }
-      Template.send(:prepend, ForemanRemoteExecution::TemplateOverrides)
+      Template.prepend ForemanRemoteExecution::TemplateOverrides
 
       (Taxonomy.descendants + [Taxonomy]).each { |klass| klass.send(:include, ForemanRemoteExecution::TaxonomyExtensions) }
 
-      User.send(:include, ForemanRemoteExecution::UserExtensions)
+      User.include ForemanRemoteExecution::UserExtensions
 
-      Host::Managed.send(:prepend, ForemanRemoteExecution::HostExtensions)
-      Host::Managed.send(:include, ForemanTasks::Concerns::HostActionSubject)
+      Host::Managed.prepend ForemanRemoteExecution::HostExtensions
+      Host::Managed.include ForemanTasks::Concerns::HostActionSubject
 
       (Nic::Base.descendants + [Nic::Base]).each do |klass|
         klass.send(:include, ForemanRemoteExecution::NicExtensions)
       end
 
-      Bookmark.send(:include, ForemanRemoteExecution::BookmarkExtensions)
-      HostsHelper.send(:prepend, ForemanRemoteExecution::HostsHelperExtensions)
-      ProvisioningTemplatesHelper.send(:prepend, ForemanRemoteExecution::JobTemplatesExtensions)
-      TemplateInput.send(:include, ForemanRemoteExecution::TemplateInputExtensions)
+      Bookmark.include ForemanRemoteExecution::BookmarkExtensions
+      HostsHelper.prepend ForemanRemoteExecution::HostsHelperExtensions
+      ProvisioningTemplatesHelper.prepend ForemanRemoteExecution::JobTemplatesExtensions
+      TemplateInput.include ForemanRemoteExecution::TemplateInputExtensions
 
-      SmartProxy.send(:prepend, ForemanRemoteExecution::SmartProxyExtensions)
-      Subnet.send(:include, ForemanRemoteExecution::SubnetExtensions)
+      SmartProxy.prepend ForemanRemoteExecution::SmartProxyExtensions
+      Subnet.include ForemanRemoteExecution::SubnetExtensions
 
       # We need to explicitly force to load the Task model due to Rails loader
       # having issues with resolving it to Rake::Task otherwise
       require_dependency 'foreman_tasks/task'
-      ForemanTasks::Task.send(:include, ForemanRemoteExecution::ForemanTasksTaskExtensions)
-      ForemanTasks::Cleaner.send(:include, ForemanRemoteExecution::ForemanTasksCleanerExtensions)
+      ForemanTasks::Task.include ForemanRemoteExecution::ForemanTasksTaskExtensions
+      ForemanTasks::Cleaner.include ForemanRemoteExecution::ForemanTasksCleanerExtensions
       RemoteExecutionProvider.register(:SSH, SSHExecutionProvider)
 
       ForemanRemoteExecution.register_rex_feature

data/lib/foreman_remote_execution/version.rb

@@ -1,3 +1,3 @@
 module ForemanRemoteExecution
-  VERSION = '2.0.4'.freeze
+  VERSION = '2.0.5'.freeze
 end

data/locale/action_names.rb

@@ -2,4 +2,4 @@
 _("Remote action:")
 _("Import Puppet classes")
 _("Import facts")
-_("Action with sub plans")
+_("Action with sub plans")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_remote_execution
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.5
 platform: ruby
 authors:
 - Foreman Remote Execution team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-29 00:00:00.000000000 Z
+date: 2019-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface