Merge branch 'master' of github.com:ManageIQ/manageiq

app/mailers/generic_mailer.rb

@@ -184,7 +184,7 @@ def set_mailer_smtp(evm_settings = nil)
     else                  raise ArgumentError, "authentication value #{evm_settings[:authentication].inspect} must be one of: 'none', 'plain', 'login'"
     end
 
-    OPTIONAL_SMTP_KEYS.each { |key| am_settings[key] = evm_settings[key] if evm_settings[key] }
+    OPTIONAL_SMTP_KEYS.each { |key| am_settings[key] = evm_settings[key] if evm_settings.key?(key) }
 
     ActionMailer::Base.smtp_settings = am_settings
     log_smtp_settings = am_settings.dup

app/models/configuration_profile.rb

@@ -1,5 +1,7 @@
 class ConfigurationProfile < ApplicationRecord
   include NewWithTypeStiMixin
+  include SupportsFeatureMixin
+
   acts_as_miq_taggable
   belongs_to :manager, :class_name => 'ExtManagementSystem'
   belongs_to :parent, :class_name => 'ConfigurationProfile'

app/models/configured_system.rb

@@ -1,5 +1,7 @@
 class ConfiguredSystem < ApplicationRecord
   include NewWithTypeStiMixin
+  include SupportsFeatureMixin
+
   acts_as_miq_taggable
   belongs_to :configuration_location
   belongs_to :configuration_organization

app/models/manageiq/providers/cloud_manager/provision_workflow.rb

@@ -3,6 +3,10 @@ class ManageIQ::Providers::CloudManager::ProvisionWorkflow < ::MiqProvisionVirtW
   include CloudInitTemplateMixin
   include SysprepTemplateMixin
 
+  def volume_dialog_keys
+    %i[name size delete_on_terminate]
+  end
+
   def allowed_availability_zones(_options = {})
     source = load_ar_obj(get_source_vm)
     targets = get_targets_for_ems(source, :cloud_filter, AvailabilityZone, 'availability_zones.available')

app/models/manageiq/providers/embedded_ansible/automation_manager/configuration_script_source.rb

@@ -93,12 +93,12 @@ def sync
       configuration_script_payloads.reload
     end
     update!(:status            => "successful",
-                       :last_updated_on   => Time.zone.now,
-                       :last_update_error => nil)
+            :last_updated_on   => Time.zone.now,
+            :last_update_error => nil)
   rescue => error
     update!(:status            => "error",
-                       :last_updated_on   => Time.zone.now,
-                       :last_update_error => format_sync_error(error))
+            :last_updated_on   => Time.zone.now,
+            :last_update_error => format_sync_error(error))
     raise error
   end
 

lib/remote_console/client_adapter/web_mks.rb

@@ -21,8 +21,9 @@ def fetch(length)
         # This callback should be set just once, yielding with the parsed message
         @driver.on(:message) { |msg| yield(msg.data) } if @driver.listeners(:message).length.zero?
 
-        data = @ssl.sysread(length) # Read from the socket
-        @driver.parse(data) # Parse the incoming data, run the callback from above
+        data = @ssl.send(:sysread_nonblock, length, :exception => false)
+        # Parse the incoming data, run the callback from above
+        @driver.parse(data) if data != :wait_readable
       end
 
       def issue(data)

lib/remote_console/rack_server.rb

@@ -82,6 +82,9 @@ def init_proxy(env, secret)
         ws_sock = env['rack.hijack'].call # Hijack the socket from the incoming HTTP connection
         console_sock = TCPSocket.open(record.host_name, record.port) # Open a TCP connection to the remote endpoint
 
+        ws_sock.autoclose = false
+        console_sock.autoclose = false
+
         # These adapters will be used for reading/writing from/to the particular sockets
         @adapters[console_sock] = ClientAdapter.new(record, console_sock)
         @adapters[ws_sock] = ServerAdapter.new(record, env, ws_sock)
@@ -108,13 +111,13 @@ def cleanup(log_level, message, sock_a, sock_b, record = nil)
         @logger.send(log_level, message % {:vm_id => record.vm_id})
       end
 
+      @proxy.pop(sock_a, sock_b) unless sock_a.nil? || sock_b.nil?
+
       # Close the sockets if they aren't closed yet
       [sock_a, sock_b].each do |sock|
         sock.try(:close)
         @adapters.delete(sock)
       end
-
-      @proxy.pop(sock_a, sock_b) unless sock_a.nil? || sock_b.nil?
     end
 
     # Primitive same-origin policy checking in production

spec/mailers/generic_mailer_spec.rb

@@ -231,4 +231,12 @@
   it "returns an array of openssl verify modes" do
     expect(GenericMailer.openssl_verify_modes).to eq([["None", "none"], ["Peer", "peer"], ["Client Once", "client_once"], ["Fail If No Peer Cert", "fail_if_no_peer_cert"]])
   end
+
+  it "sets optional smtp keys as expected" do
+    mail = GenericMailer.new
+    options = {:enable_starttls_auto => false, :openssl_verify_mode => :none}
+    mail.send(:set_mailer_smtp, options)
+    options.delete(:authentication) # Deal with current pass by ref issue
+    expect(ActionMailer::Base.smtp_settings).to include(options)
+  end
 end