redhat_access 2.2.11 → 2.2.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e94c4f74c8bf19599836bcfa836469540b00cb9680dad9c9a21aaaddb2ef4c4f
-  data.tar.gz: ec9a734f1907e2ebe6317accdaaa5b23d218eddc60ac2730f38040bd6f204dad
+  metadata.gz: fe33c66ba4b918fd0d0a4b643075d656ba00c8f1af2efc387643d181b8b132df
+  data.tar.gz: 1b7c7b46ffe75f51142247eac000413b5507f343bcefbeae4d436663adc74ae2
 SHA512:
-  metadata.gz: 3119df6ee719a94587de96ed060c8f505fce193c9c40d67555471a8a3176a000501d96a1b725c1bac132fe3e6edd1d9c8ed6f2717982e509bc0974fa7b6e75b6
-  data.tar.gz: 180a8b8c3b4a528f4d16d7fa3b117851ce527ed646a51491c4928947136608799e49f8dd37858158e732125e5fa53256ac320dcced2e4b5407559d6f9ab965ec
+  metadata.gz: 2cfb18c7636c09b3e55bb16c8d848a55ff1d64c87129b0de6291121ac2da3aff83a363b679346c9bbd4dd5b347290a81a4d29aa36c96ab7d7239be9f57ecfd48
+  data.tar.gz: 89f7c4b1effd5629d548c82def18385e60e1357729024162daac288524b9fa9561bbdfc1bd317a496182934b82359f90bfa8b14c0f5b995ecd78ca4ec7038f9c

data/app/controllers/redhat_access/api/machine_telemetry_api_controller.rb

@@ -120,6 +120,18 @@ module RedhatAccess
         host = get_content_host(uuid)
         org = get_organization(host)
 
+        # {
+        #     "Satellite":  {
+        #         "Organization": ["Insights"],
+        #         "Location": ["North America", "RTP"]
+        #     },
+        #
+        #     "SatelliteParameter": {
+        #         "parameter_1": ["value_1"],
+        #         "parameter_2": ["value_2"]
+        #     }
+        # }
+
         # get organization
         labels = [{
                       :namespace => "Satellite",

data/app/controllers/redhat_access/api/telemetry_api_controller.rb

@@ -118,7 +118,7 @@ module RedhatAccess
 
         client = get_api_client
         res = client.call_tapi(original_method, URI.escape(resource), original_params, original_payload, {timeout: get_tapi_timeout}, use_subsets)
-        #401 erros means our proxy is not configured right.
+        #401 errors means our proxy is not configured right.
         #Change it to 502 to distinguish with local applications 401 errors
         resp_data = res[:data]
         if res[:code] == 401
@@ -136,6 +136,9 @@ module RedhatAccess
           if resp_data.headers[:x_resource_count]
             response.headers['x-resource-count'] = resp_data.headers[:x_resource_count]
           end
+          if resp_data.headers[:x_rh_insights_request_id]
+            response.headers['x_rh_insights_request_id'] = resp_data.headers[:x_rh_insights_request_id]
+          end
           render status: res[:code], json: resp_data
         else
           render status: res[:code], json: resp_data

data/app/models/redhat_access/concerns/host_managed_extensions.rb

@@ -12,7 +12,7 @@ module RedhatAccess
         def search_by_plan_id(key, operator, value)
           insights_plan_runner = ForemanAnsible::InsightsPlanRunner.new(Organization.current, value.to_i)
           hostname_rules_relation = insights_plan_runner.hostname_rules(insights_plan_runner.playbook)
-          host_ids = Host::Managed.where(:name => hostname_rules_relation.keys).pluck(:id)
+          host_ids = Host::Managed.where(:name => hostname_rules_relation.keys.map{|h| h.downcase}).pluck(:id)
           { :conditions => " hosts.id IN(#{host_ids.join(',')})" }
         end
       end

data/app/services/redhat_access/telemetry/look_ups.rb

@@ -15,8 +15,7 @@ module RedhatAccess
       end
 
       def can_mask_rules(user)
-        # #TODO move this to an auth class?
-        # TODO move this to an auth class?
+        849456        # TODO move this to an auth class?
         return false if user.nil?
         return true if user.admin
         permissions = user.cached_roles.collect(&:permissions).flatten.map!(&:name)
@@ -67,7 +66,8 @@ module RedhatAccess
       def disconnected_org?(org)
         if org
           # TODO: fix hard coding
-          org.redhat_repository_url != 'https://cdn.redhat.com'
+          # disable insights if disconnected orgs aren't enabled and katello doesn't point to redhat's CDN
+          !REDHAT_ACCESS_CONFIG[:enable_insights_for_disconnected_orgs] && org.redhat_repository_url != 'https://cdn.redhat.com'
         else
           raise(RecordNotFound, 'Organization not found or invalid')
         end
@@ -201,22 +201,51 @@ module RedhatAccess
       end
 
       def get_portal_http_proxy
-        proxy = nil
-        if SETTINGS[:katello][:cdn_proxy] && SETTINGS[:katello][:cdn_proxy][:host]
-          proxy_config = SETTINGS[:katello][:cdn_proxy]
-          scheme = URI.parse(proxy_config[:host]).scheme
-          uri = URI('')
-          # Ruby's uri parser doesn't handle encoded characters so Katello added two new schemes to handle proxy
-          # passwords.  See https://github.com/Katello/katello/blob/master/app/lib/katello/util/proxy_uri.rb
-          uri.scheme = 'proxy' if scheme == 'http'
-          uri.scheme = 'proxys' if scheme == 'https'
-          uri.host = URI.parse(proxy_config[:host]).host
-          uri.port = proxy_config[:port] if proxy_config[:port]
-          uri.user =  CGI.escape(proxy_config[:user]) if proxy_config[:user]
-          uri.password = CGI.escape(proxy_config[:password]) if proxy_config[:password]
-          proxy = uri.to_s
+        begin
+          @http_proxy_string ||=
+              begin
+                proxy_uri = URI('')
+
+                if Setting[:content_default_http_proxy].present?
+                  proxy_config = HttpProxy.default_global_content_proxy
+                  proxy_uri = URI(proxy_config&.url)
+                  if proxy_config&.username.present?
+                    proxy_uri.user = CGI.escape(proxy_config&.username)
+                    if proxy_config&.password.present?
+                      proxy_uri.password = CGI.escape(proxy_config&.password)
+                    end
+                  end
+                end
+
+                if proxy_uri.to_s.blank?
+                  if SETTINGS[:katello][:cdn_proxy] && SETTINGS[:katello][:cdn_proxy][:host]
+                    proxy_config = SETTINGS[:katello][:cdn_proxy]
+                    proxy_uri.scheme = URI.parse(proxy_config[:host]).scheme
+                    proxy_uri.host = URI.parse(proxy_config[:host]).host
+                    proxy_uri.port = proxy_config[:port] if proxy_config[:port]
+                    if proxy_config[:user].present?
+                      proxy_uri.user =  CGI.escape(proxy_config[:user]) if proxy_config[:user]
+                      if proxy_config[:password].present?
+                        proxy_uri.password = CGI.escape(proxy_config[:password])
+                      end
+                    end
+                  end
+                end
+
+                # Ruby's uri parser doesn't handle encoded characters so Katello added two new schemes to handle proxy
+                # passwords.  See https://github.com/Katello/katello/blob/master/app/lib/katello/util/proxy_uri.rb
+                proxy_uri.scheme = 'proxy' if proxy_uri.scheme == 'http'
+                proxy_uri.scheme = 'proxys' if proxy_uri.scheme == 'https'
+
+                proxy_uri.to_s
+              end
+
+          Rails.logger.debug("Insights proxy url = #{@http_proxy_string}")
+          @http_proxy_string
+        rescue
+          Rails.logger.debug("insights plugin: Something bad happened trying to get the proxy url")
+          raise
         end
-        proxy
       end
 
       def get_http_user_agent

data/config/config.yml.example

@@ -11,6 +11,7 @@
 # :telemetry_api_timeout_s : 60
 :telemetry_ssl_verify_peer : true
 :use_subsets : false
+:enable_insights_for_disconnected_orgs : false
 
 :diagnostic_logs :
   - /var/log/foreman/production.log

data/config/defaults.yml

@@ -9,6 +9,7 @@
 :telemetry_api_host : "https://cert-api.access.redhat.com"
 :telemetry_ssl_verify_peer : true
 
+:enable_insights_for_disconnected_orgs : false
 :use_subsets : false
 
 :diagnostic_logs :

data/lib/redhat_access/version.rb

@@ -1,3 +1,3 @@
 module RedhatAccess
-  VERSION = "2.2.11"
+  VERSION = "2.2.16"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redhat_access
 version: !ruby/object:Gem::Version
-  version: 2.2.11
+  version: 2.2.16
 platform: ruby
 authors:
 - Lindani Phiri
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-21 00:00:00.000000000 Z
+date: 2020-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redhat_access_lib