THREESCALE-15550: Upgrade uri gem

Gemfile

@@ -71,13 +71,7 @@ gem 'formtastic', '~> 5.0'
 gem 'htmlentities', '~>4.3', '>= 4.3.4'
 gem 'json', '~> 2.7', '>= 2.7.1'
 gem 'responders', '~> 3.2' # For respond_with support
-# uri >= 1.0.0 switched the default parser from RFC2396 to RFC3986 (ruby/uri#107),
-# removed URI::DEFAULT_PARSER, dropped URI.decode, and the RFC3986 parser has no
-# `registry` component. We rely on all of these across models (Proxy, ProxyRule,
-# WebHook, AuthenticationProvider) and controllers. Upgrading is worthwhile but
-# requires careful inspection of every call-site and should be deployed/tested
-# separately from the Faraday update.
-gem 'uri', '< 1.0.0'
+gem 'uri', '~> 1.0'
 
 gem 'mysql2', '~> 0.5.3'
 

Gemfile.lock

@@ -975,7 +975,7 @@ GEM
       rack
       unicorn
     uniform_notifier (1.18.0)
-    uri (0.13.3)
+    uri (1.1.1)
     useragent (0.16.11)
     version_gem (1.1.3)
     webmock (3.24.0)
@@ -1170,7 +1170,7 @@ DEPENDENCIES
   uglifier
   unicorn
   unicorn-rails
-  uri (< 1.0.0)
+  uri (~> 1.0)
   webmock (~> 3.24.0)
   webrick (~> 1.8.2)
   will_paginate (~> 3.3)

app/controllers/provider/admin/redhat/auth_controller.rb

@@ -31,7 +31,7 @@ def authentication_provider
   def referrer_url
     url = params.permit(:referrer)[:referrer]
     if url
-      URI.decode(url)
+      URI::RFC2396_PARSER.unescape(url)
     else
       provider_admin_account_path
     end

app/controllers/provider/admin/service_discovery/auth_controller.rb

@@ -24,9 +24,9 @@ def show
   protected
 
   def referrer_url
-    url = params[:referrer]
+    url = params.permit(:referrer)[:referrer]
     if url
-      URI.decode(url)
+      URI::RFC2396_PARSER.unescape(url)
     else
       new_admin_service_path
     end

app/helpers/messages_helper.rb

@@ -24,7 +24,7 @@ def message_subject(message)
   def hyperlink_urls(text)
     text = h(text)
 
-    text.scan(URI.regexp(%w(http https))) do
+    text.scan(URI::RFC2396_PARSER.make_regexp(%w(http https))) do
       #$& contains the whole match of the regural expression
       url = $&.sub(/\.$/, '').sub(/\:$/,'')
       text = text.sub(url, link_to(url, url))

app/lib/three_scale/oauth2/service_discovery_client.rb

@@ -74,7 +74,7 @@ def query_options
         def call
           url = super
           # OpenShift builtin OAuth has a serious bug, it does not store correctly the redirect_uri
-          ServiceDiscovery::Config.rh_sso? ? url : URI.decode(url)
+          ServiceDiscovery::Config.rh_sso? ? url : URI::RFC2396_PARSER.unescape(url)
         rescue => e
           # Do better error management
           Rails.logger.debug("[Openshift OAuth] Error decoding callback URL for builtin <%s>. Error: %s\n%s" % [url.inspect, e.message, e.backtrace.join("\n")])

app/models/authentication_provider.rb

@@ -31,7 +31,7 @@ class AuthenticationProvider < ApplicationRecord
 
   validates :client_id, :client_secret, presence: true, if: :oauth_config_required?
 
-  with_options format: { with: URI::DEFAULT_PARSER.make_regexp(%w[http https]), allow_blank: true, message: :invalid_url } do |ops|
+  with_options format: { with: URI::RFC2396_PARSER.make_regexp(%w[http https]), allow_blank: true, message: :invalid_url } do |ops|
     ops.validates :site
     ops.validates :token_url
     ops.validates :authorize_url

app/models/proxy.rb

@@ -29,7 +29,7 @@ class Proxy < ApplicationRecord # rubocop:disable Metrics/ClassLength
 
   validates :error_status_no_match, :error_status_auth_missing, :error_status_auth_failed, :error_status_limits_exceeded, presence: true
 
-  uri_pattern = URI::DEFAULT_PARSER.pattern
+  uri_pattern = URI::RFC2396_PARSER.pattern
 
   URI_OR_LOCALHOST  = /\A(https?:\/\/([a-zA-Z0-9._:\/?-])+|.*localhost.*)\Z/
   OPTIONAL_QUERY_FORMAT = "(?:\\?(#{uri_pattern.fetch(:QUERY)}))?"
@@ -675,7 +675,7 @@ def call(attribute)
 
       begin
         uri = URI.parse(attribute_value)
-        value = URI::Generic.new(uri.scheme, uri.userinfo, uri.host, uri.port, uri.registry, uri.path, uri.opaque, uri.query, uri.fragment).to_s
+        value = URI::Generic.new(uri.scheme, uri.userinfo, uri.host, uri.port, nil, uri.path, uri.opaque, uri.query, uri.fragment).to_s
         @model[attribute] = value unless @model[attribute] == value
       rescue URI::InvalidURIError
         @model.errors.add(attribute, 'Invalid domain')

app/models/proxy_rule.rb

@@ -34,9 +34,9 @@ class PatternParser
     #                 ":" | "@" | "&" | "=" | "+" | "$" | ","
     param = /
       (?:
-        [#{URI::REGEXP::PATTERN::UNRESERVED}:@&=+,] # note that $ is in the RFC but is removed for our purpposes
+        [#{URI::RFC2396_REGEXP::PATTERN::UNRESERVED}:@&=+,] # note that $ is in the RFC but is removed for our purpposes
         |
-        #{URI::REGEXP::PATTERN::ESCAPED}
+        #{URI::RFC2396_REGEXP::PATTERN::ESCAPED}
         |
         #{REGEX_VARIABLE}
       )*
@@ -53,9 +53,9 @@ class PatternParser
 
     query = /
       (?:
-        [#{URI::REGEXP::PATTERN::UNRESERVED}#{URI::REGEXP::PATTERN::RESERVED}]
+        [#{URI::RFC2396_REGEXP::PATTERN::UNRESERVED}#{URI::RFC2396_REGEXP::PATTERN::RESERVED}]
         |
-        #{URI::REGEXP::PATTERN::ESCAPED}
+        #{URI::RFC2396_REGEXP::PATTERN::ESCAPED}
         |
         #{REGEX_LITERAL}=#{REGEX_VARIABLE}
       )*
@@ -89,7 +89,7 @@ def call(_)
   validates :http_method, inclusion: { in: ALLOWED_HTTP_METHODS }
   validate :non_repeated_parameters
   validate :no_vars_in_keys
-  validates :redirect_url, format: URI::DEFAULT_PARSER.make_regexp(%w[http https]), allow_blank: true, length: { maximum: 10000 }
+  validates :redirect_url, format: URI::RFC2396_PARSER.make_regexp(%w[http https]), allow_blank: true, length: { maximum: 10000 }
 
   def parameters
     Addressable::Template.new(path_pattern).variables

app/models/web_hook.rb

@@ -4,7 +4,7 @@ class WebHook < ApplicationRecord
   alias provider account
 
   validates :account_id, presence: true
-  validates :url, format: { :with => URI::DEFAULT_PARSER.make_regexp(%w[http https]), :if => :active }, length: { maximum: 255 }
+  validates :url, format: { :with => URI::RFC2396_PARSER.make_regexp(%w[http https]), :if => :active }, length: { maximum: 255 }
 
   #TODO: limit association only to providers?
   #TODO validate url as url?