foreman_rh_cloud 5.0.38 → 6.0.42

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7bb7932e40d6ef999b5266897539d444e9ab7a38606e6f66dff58fb568d70fdc
-  data.tar.gz: f6e6a8ae8ddfb3544fbe31c807f9917fe7aa2d5d1d05014055528bb193290109
+  metadata.gz: c3c56d7e23a70203868099896bbdcf3bb1b6ec31dc5a703a5da9bd147f849a10
+  data.tar.gz: d6ea56a9abbc11fad5d4d77347d829a0eb3062af500b8773c9d617235ce0b0fc
 SHA512:
-  metadata.gz: dcc37dffd7f108e1687b671ea0f5b157644c6a9576310d917daafefd4011ad01ccced6d48941823873a3da076ab20da2db33fe2c463cc0e962f69a79ea565400
-  data.tar.gz: 72f7a08cc3f30d0bddaaf63e0198df2761a40153c7185d1e30328a1c00b9496e7ce33b34ceec44ecf69989ab570001173524cfc49e5a9e127a540bf4684f9d02
+  metadata.gz: 523354ddf7e4511663d53833823b0e5ffa3128ea9513eeab23b458e23d6f5a76254017ffc52b8f513245f8404e991154123585bc93269f1b72c06ec7512e595a
+  data.tar.gz: '03784d6b78c2acf11b084912739cb5714e95f165871db256a260da8aab1e3c3d278eb8120eb2aec673477467da611a02f4ac89b87ed4b60b099a27d51e3c0e5b'

data/app/controllers/api/v2/rh_cloud/cloud_request_controller.rb

@@ -27,16 +27,18 @@ module Api::V2::RhCloud
     private
 
     def metadata
-      params['metadata']
+      params['Metadata'] || params['metadata']
     end
 
     def content
+      content = params['Content'] || params['content']
+
       # the content received as base 64 of the string in double quotes
-      Base64.decode64(params['content']).tr('"', '')
+      Base64.decode64(content).tr('"', '')
     end
 
     def directive
-      params['directive']
+      params['Directive'] || params['directive']
     end
 
     def handle_run_playbook_request
@@ -44,9 +46,13 @@ module Api::V2::RhCloud
       logger.error("Reporting URL is not valid: #{metadata['return_url']}") && return unless valid_url?(metadata['return_url'])
 
       hosts = metadata['hosts'].split(',')
-      host_ids = host_ids(hosts)
 
-      logger.warn("Some hosts were not found. Looked for: #{hosts}, found ids: #{host_ids}") unless host_ids.length == hosts.length
+      # select hosts from the metadata list that are not disabled by the parameter.
+      host_ids = Host.search_for("not params.#{InsightsCloud.enable_cloud_remediations_param} = f")
+                     .where(id: host_ids(hosts))
+                     .pluck(:id)
+
+      logger.warn("Some hosts were not found/ignored. Looked for: #{hosts}, found ids: #{host_ids}") unless host_ids.length == hosts.length
 
       logger.error("sat_org_id is not present in the metadata") && return unless metadata['sat_org_id']
       org_id = metadata['sat_org_id'].to_i

data/app/controllers/insights_cloud/settings_controller.rb

@@ -9,6 +9,20 @@ module InsightsCloud
       render_setting(:insightsSyncEnabled, :allow_auto_insights_sync)
     end
 
+    def set_org_parameter
+      parameter = params.require(:parameter)
+      new_value = ActiveModel::Type::Boolean.new.cast(params.require(:value))
+      org_id = params.require(:organization_id)
+
+      organization = Organization.authorized.find(org_id)
+
+      org_param = organization.organization_parameters.find_or_create_by(name: parameter) do |org_param|
+        org_param.name = parameter
+      end
+      org_param.value = new_value
+      org_param.save!
+    end
+
     private
 
     def render_setting(node_name, setting)

data/app/services/foreman_rh_cloud/cert_auth.rb

@@ -13,7 +13,7 @@ module ForemanRhCloud
       certs = candlepin_id_cert(params.delete(:organization))
       final_params = {
         ssl_client_cert: OpenSSL::X509::Certificate.new(certs[:cert]),
-        ssl_client_key: OpenSSL::PKey::RSA.new(certs[:key]),
+        ssl_client_key: OpenSSL::PKey.read(certs[:key]),
       }.deep_merge(params)
 
       super(final_params)

data/app/services/foreman_rh_cloud/cloud_ping_service.rb

@@ -27,7 +27,7 @@ module ForemanRhCloud
             content_type: :json,
           },
           ssl_client_cert: OpenSSL::X509::Certificate.new(certs[:cert]),
-          ssl_client_key: OpenSSL::PKey::RSA.new(certs[:key])
+          ssl_client_key: OpenSSL::PKey.read(certs[:key])
         )
       rescue StandardError => ex
         ex

data/app/services/foreman_rh_cloud/cloud_presence.rb

@@ -24,7 +24,7 @@ module ForemanRhCloud
               content_type: :json,
             },
             ssl_client_cert: OpenSSL::X509::Certificate.new(certs[:cert]),
-            ssl_client_key: OpenSSL::PKey::RSA.new(certs[:key])
+            ssl_client_key: OpenSSL::PKey.read(certs[:key])
           )
         )
 
@@ -42,7 +42,7 @@ module ForemanRhCloud
               content_type: :json,
             },
             ssl_client_cert: OpenSSL::X509::Certificate.new(certs[:cert]),
-            ssl_client_key: OpenSSL::PKey::RSA.new(certs[:key])
+            ssl_client_key: OpenSSL::PKey.read(certs[:key])
           )
         )
 
@@ -60,7 +60,7 @@ module ForemanRhCloud
             content_type: :json,
           },
           ssl_client_cert: OpenSSL::X509::Certificate.new(certs[:cert]),
-          ssl_client_key: OpenSSL::PKey::RSA.new(certs[:key]),
+          ssl_client_key: OpenSSL::PKey.read(certs[:key]),
           payload: {
             name: "satellite: #{Foreman.instance_id} org: #{@organization.name}",
             source_ref: Foreman.instance_id,
@@ -84,7 +84,7 @@ module ForemanRhCloud
             content_type: :json,
           },
           ssl_client_cert: OpenSSL::X509::Certificate.new(certs[:cert]),
-          ssl_client_key: OpenSSL::PKey::RSA.new(certs[:key]),
+          ssl_client_key: OpenSSL::PKey.read(certs[:key]),
           payload: {
             source_id: source_id,
             rhc_id: Setting[:rhc_instance_id],

data/app/services/foreman_rh_cloud/cloud_request_forwarder.rb

@@ -63,19 +63,19 @@ module ForemanRhCloud
         {
           url: ForemanRhCloud.cert_base_url + request_path.sub('/redhat_access/r/insights/platform', '/api'),
           ssl_client_cert: OpenSSL::X509::Certificate.new(certs[:cert]),
-          ssl_client_key: OpenSSL::PKey::RSA.new(certs[:key]),
+          ssl_client_key: OpenSSL::PKey.read(certs[:key]),
         }
       when connection_test_request?
         {
           url: ForemanRhCloud.cert_base_url + '/api/apicast-tests/ping',
           ssl_client_cert: OpenSSL::X509::Certificate.new(certs[:cert]),
-          ssl_client_key: OpenSSL::PKey::RSA.new(certs[:key]),
+          ssl_client_key: OpenSSL::PKey.read(certs[:key]),
         }
       else # Legacy insights API
         {
           url: ForemanRhCloud.legacy_insights_url + request_path.sub('/redhat_access/r/insights', '/r/insights'),
           ssl_client_cert: OpenSSL::X509::Certificate.new(certs[:cert]),
-          ssl_client_key: OpenSSL::PKey::RSA.new(certs[:key]),
+          ssl_client_key: OpenSSL::PKey.read(certs[:key]),
           ssl_ca_file: ForemanRhCloud.legacy_insights_ca,
         }
       end