redhat_access 2.2.9 → 2.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 763ecb0aee7ff050cb54b292349af94c946bbd41fc15ae51b7e171e8afc53f7e
-  data.tar.gz: 4b90e6187c78d7ba070c4e0246e1e756aee83962317ddf1af6f5678380755e63
+  metadata.gz: 67e8e666255e81f7ceb89434135c64a904a772adad60369a9d24e0770000c1ae
+  data.tar.gz: 99124c4b5f76163caff0d015f0d0344210283e40421a5175696419b3f297edfa
 SHA512:
-  metadata.gz: 8a56a0a729bec186c354eae196f6b79eb214f62b5a9771ccf4a9a0e3e38c8821cc04977ed01988bb1a5c6fb826e0014babc67109f585b22b3dcc72e96576139d
-  data.tar.gz: 31f28733074e6014228011af824b7e4d4c0645e977cf4deacd6426bc901750441f770b5083ea22aa158a58c3ef6db8eb4c492f1a5405bc513fad63f6c2c76e9d
+  metadata.gz: 187cc7495cc438df0c718dcb0a809c4ec48170e3d1fee9afcf731d0734d67429a92ea615ee69a08815a8d4ce8d5b1722f148dd98c56388f0a2a48991824b04ec
+  data.tar.gz: '089e0155d72b586a7cb3b988842e07c05e160103e3620e33163ac875d22005ec5dfbe9079005b2e6c7cb44693270be91012b1360f3d519c74ffbef491554d267'

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

@@ -1,8 +1,6 @@
 module RedhatAccess
   module Telemetry
     module LookUps
-      include Katello::Util::HttpProxy
-
       class  RecordNotFound < StandardError
       end
 
@@ -194,9 +192,20 @@ module RedhatAccess
       end
 
       def get_portal_http_proxy
-        # switching to Katello::Util::HttpProxy's proxy_uri, which has a workaround for rest-client's poor handling
-        # of special characters in proxy passwords (see https://github.com/Katello/katello/commit/bea53437509f68ceeff0eabfde88f69810876307)
-        proxy_uri
+        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('')
+          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
+        end
+        proxy
       end
 
       def get_http_user_agent

data/lib/redhat_access/version.rb

@@ -1,3 +1,3 @@
 module RedhatAccess
-  VERSION = "2.2.9"
+  VERSION = "2.2.10"
 end

data/redhat_access.gemspec

@@ -7,7 +7,7 @@ require "redhat_access/version"
 Gem::Specification.new do |s|
   s.name        = "redhat_access"
   s.version     = RedhatAccess::VERSION
-  s.authors     = ["Lindani Phiri"]
+  s.authors     = ["Lindani Phiri", "Rex White"]
   s.email       = ["lphiri@redhat.com"]
   s.homepage    = "https://github.com/redhataccess/foreman-plugin"
   s.license     = 'GPLv3'
@@ -19,5 +19,7 @@ Gem::Specification.new do |s|
   s.test_files = Dir["test/**/*"]
   s.add_dependency "redhat_access_lib" , ">=1.1.5"
   s.add_dependency "angular-rails-templates", ">=0.0.4"
+  s.add_dependency "foreman-tasks"
+  s.add_dependency "katello"
 
 end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: redhat_access
 version: !ruby/object:Gem::Version
-  version: 2.2.9
+  version: 2.2.10
 platform: ruby
 authors:
 - Lindani Phiri
+- Rex White
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-27 00:00:00.000000000 Z
+date: 2020-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redhat_access_lib
@@ -38,6 +39,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.4
+- !ruby/object:Gem::Dependency
+  name: foreman-tasks
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: katello
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: This plugin adds Red Hat Access knowledge base search, case management
   and diagnostics to Foreman
 email: