Attachment 1470341 Details for Bug 1566615 – Monkey patch rest-client to support percent encoded proxy user/password.

[patch] Monkey patch rest-client to support percent encoded proxy user/password.

0001-PAUSED-Use-git-resume-to-continue-working.patch (text/plain), 2.06 KB, created by Joe Rafaniello on 2018-07-24 18:16:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Joe Rafaniello

Created: 2018-07-24 18:16:58 UTC

Size: 2.06 KB

patch

obsolete

>From a6abf331b12f74025e54a592b13dec31ff82c15d Mon Sep 17 00:00:00 2001
>From: Joe Rafaniello <jrafanie@redhat.com>
>Date: Tue, 24 Jul 2018 14:13:59 -0400
>Subject: [PATCH] PAUSED: Use `git resume` to continue working.
>
>---
> lib/patches/rest_client_patch.rb | 27 +++++++++++++++++++++++++++
> lib/vmdb_helper.rb               |  1 +
> 2 files changed, 28 insertions(+)
> create mode 100644 lib/patches/rest_client_patch.rb
>
>diff --git a/lib/patches/rest_client_patch.rb b/lib/patches/rest_client_patch.rb
>new file mode 100644
>index 0000000000..f1adf5c29a
>--- /dev/null
>+++ b/lib/patches/rest_client_patch.rb
>@@ -0,0 +1,27 @@
>+require 'restclient/version'
>+if RestClient::VERSION == "2.0.2"
>+  require 'restclient/request'
>+  RestClient::Request.module_eval do
>+    def net_http_object(hostname, port)
>+      p_uri = proxy_uri
>+
>+      if p_uri.nil?
>+        # no proxy set
>+        Net::HTTP.new(hostname, port)
>+      elsif !p_uri
>+        # proxy explicitly set to none
>+        Net::HTTP.new(hostname, port, nil, nil, nil, nil)
>+      else
>+        pass = p_uri.password ? CGI.unescape(p_uri.password) : nil
>+        user = p_uri.user     ? CGI.unescape(p_uri.user)     : nil
>+        Net::HTTP.new(hostname, port,
>+                      p_uri.hostname, p_uri.port, user, pass)
>+
>+      end
>+    end
>+  end
>+else
>+  # We need verify new releases of rest-client have the PR change below or if this monkey patch needs to change
>+  # https://github.com/rest-client/rest-client/pull/665
>+  warn "Not monkey patching RestClient version #{RestClient::VERSION} to support proxy with percent encoded user/password"
>+end
>diff --git a/lib/vmdb_helper.rb b/lib/vmdb_helper.rb
>index b800892647..79afa76e92 100644
>--- a/lib/vmdb_helper.rb
>+++ b/lib/vmdb_helper.rb
>@@ -21,6 +21,7 @@ require 'active_record_query_parts'
> # Include monkey-patches
> $:.push("#{File.dirname(__FILE__)}/patches")
> require 'ruport_patch'
>+require 'rest_client_patch'
> 
> APPLIANCE_DATA_VOL = File.directory?("/var/www/miq/vmdb") ? "/var/lib/data" : Rails.root.join("tmp")
> MIQ_TEMP           = File.join(APPLIANCE_DATA_VOL, "miq_temp")
>-- 
>2.14.2
>

Actions: View | Diff

Attachments on bug 1566615: 1470341