redhat_access 2.2.12 → 2.2.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d712c27863c4a01278f3e99c7db3550aeb0c93864ba8ca49ff2eba9c8bd9cd4c
-  data.tar.gz: a1848a0e157d1a99cf58ed460044e9bb684502a8942b77cd36d0c2d3743c82cf
+  metadata.gz: e9cd68efa44ac50cd24ec3fc1c4b1f9fd61752f4291d19a4b3e501e448d68c20
+  data.tar.gz: 2395b964158f86f3f9245afd76cd642d6d8859e612939b3b5e1f2e821ef2a67a
 SHA512:
-  metadata.gz: 9eee1ab2ffae45b52e35644efc1bd46440e7c5c818fbf09c37191e6c8bb2273765a9558506b9ee2af8038279be13fe826e9927d26b533f6cc73fa4eb0e6fe96d
-  data.tar.gz: e03fbd9dc81305e21d03b43263b3633e41093c2975e3282e81f62ab51b35e30b2d94115237e5127482912430b9809677620057841cdbecf1fee994c38ee4b4c0
+  metadata.gz: 1acdb89a85f087486734587508c79e63b9d051d1929007577c107635652b6923f31fd8238357faa3d20833de1781dd81262defd03c49bd578c4b9f615cd33d3e
+  data.tar.gz: 3ecea8e8218a293818b409a4d7b62f92a34b00cf3f5afc2b9ce211cce813ab61c583614fbbdae81b7ce4fafd3b094b4cbddccac26e35f0b9ce1d72fd3cb4ded6

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

@@ -204,32 +204,47 @@ module RedhatAccess
         begin
           @http_proxy_string ||=
               begin
-                if Setting[:content_default_http_proxy]
-                  HttpProxy.unscoped.find_by(name: Setting[:content_default_http_proxy])&.full_url
+                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
 
-          if @http_proxy_string.blank?
-            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]
-              @http_proxy_string = uri.to_s
-            end
-          end
           Rails.logger.debug("Insights proxy url = #{@http_proxy_string}")
           @http_proxy_string
-        rescue => error
-          Rails.logger.debug("Something bad happened trying to get the proxy url: #{error}")
-          return nil
+        rescue
+          Rails.logger.debug("insights plugin: Something bad happened trying to get the proxy url")
+          raise
         end
       end
 

data/lib/redhat_access/version.rb

@@ -1,3 +1,3 @@
 module RedhatAccess
-  VERSION = "2.2.12"
+  VERSION = "2.2.13"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redhat_access
 version: !ruby/object:Gem::Version
-  version: 2.2.12
+  version: 2.2.13
 platform: ruby
 authors:
 - Lindani Phiri
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-04 00:00:00.000000000 Z
+date: 2020-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redhat_access_lib