redhat_access 2.2.11 → 2.2.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e94c4f74c8bf19599836bcfa836469540b00cb9680dad9c9a21aaaddb2ef4c4f
-  data.tar.gz: ec9a734f1907e2ebe6317accdaaa5b23d218eddc60ac2730f38040bd6f204dad
+  metadata.gz: d712c27863c4a01278f3e99c7db3550aeb0c93864ba8ca49ff2eba9c8bd9cd4c
+  data.tar.gz: a1848a0e157d1a99cf58ed460044e9bb684502a8942b77cd36d0c2d3743c82cf
 SHA512:
-  metadata.gz: 3119df6ee719a94587de96ed060c8f505fce193c9c40d67555471a8a3176a000501d96a1b725c1bac132fe3e6edd1d9c8ed6f2717982e509bc0974fa7b6e75b6
-  data.tar.gz: 180a8b8c3b4a528f4d16d7fa3b117851ce527ed646a51491c4928947136608799e49f8dd37858158e732125e5fa53256ac320dcced2e4b5407559d6f9ab965ec
+  metadata.gz: 9eee1ab2ffae45b52e35644efc1bd46440e7c5c818fbf09c37191e6c8bb2273765a9558506b9ee2af8038279be13fe826e9927d26b533f6cc73fa4eb0e6fe96d
+  data.tar.gz: e03fbd9dc81305e21d03b43263b3633e41093c2975e3282e81f62ab51b35e30b2d94115237e5127482912430b9809677620057841cdbecf1fee994c38ee4b4c0

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

@@ -201,22 +201,36 @@ 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
+                if Setting[:content_default_http_proxy]
+                  HttpProxy.unscoped.find_by(name: Setting[:content_default_http_proxy])&.full_url
+                end
+              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
         end
-        proxy
       end
 
       def get_http_user_agent

data/lib/redhat_access/version.rb

@@ -1,3 +1,3 @@
 module RedhatAccess
-  VERSION = "2.2.11"
+  VERSION = "2.2.12"
 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.12
 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-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redhat_access_lib