Merge pull request #1605 from doorkeeper-gem/fix-uri-valiation-for-ru…

…by-3.2

Fix URI validation for Ruby 3.2+

CHANGELOG.md

@@ -8,6 +8,7 @@ User-visible changes worth mentioning.
 ## main
 
 - [#ID] Add your PR description here.
+- [#1605] Fix URI validation for Ruby 3.2+.
 
 ## 5.6.2
 

lib/doorkeeper/oauth/helpers/uri_checker.rb

@@ -61,17 +61,17 @@ def self.query_matches?(query, client_query)
  end
 
  def self.valid_scheme?(uri)
- return false if uri.scheme.nil?
+ return false if uri.scheme.blank?
 
- %w[localhost].include?(uri.scheme) == false
+ %w[localhost].exclude?(uri.scheme)
  end
 
  def self.hypertext_scheme?(uri)
  %w[http https].include?(uri.scheme)
  end
 
  def self.iff_host?(uri)
- !(hypertext_scheme?(uri) && uri.host.nil?)
+ !(hypertext_scheme?(uri) && uri.host.blank?)
  end
 
  def self.oob_uri?(uri)

lib/doorkeeper/orm/active_record/redirect_uri_validator.rb

@@ -45,11 +45,11 @@ def unspecified_scheme?(uri)
  end
 
  def unspecified_host?(uri)
- uri.is_a?(URI::HTTP) && uri.host.nil?
+ uri.is_a?(URI::HTTP) && uri.host.blank?
  end
 
  def relative_uri?(uri)
- uri.scheme.nil? && uri.host.nil?
+ uri.scheme.nil? && uri.host.blank?
  end
 
  def invalid_ssl_uri?(uri)