Merge remote-tracking branch 'upstream/pull/2661'

[rails.git] / app / models / client_application.rb

diff --git a/app/models/client_application.rb b/app/models/client_application.rb
index ef1a0110ec8bbeac3ed28303e13b49ce7e2b365f..4e3dffb998aba0081a61dd56b145420f47a7f3df 100644 (file)
--- a/app/models/client_application.rb
+++ b/app/models/client_application.rb
@@ -30,9 +30,7 @@
 #  client_applications_user_id_fkey  (user_id => users.id)
 #
 
 #  client_applications_user_id_fkey  (user_id => users.id)
 #
 

-require "oauth"
-
-class ClientApplication < ActiveRecord::Base
+class ClientApplication < ApplicationRecord

   belongs_to :user
   has_many :tokens, :class_name => "OauthToken", :dependent => :delete_all
   has_many :access_tokens
   belongs_to :user
   has_many :tokens, :class_name => "OauthToken", :dependent => :delete_all
   has_many :access_tokens


@@ -41,9 +39,9 @@ class ClientApplication < ActiveRecord::Base
 
   validates :key, :presence => true, :uniqueness => true
   validates :name, :url, :secret, :presence => true
 
   validates :key, :presence => true, :uniqueness => true
   validates :name, :url, :secret, :presence => true

-  validates :url, :format => %r{\Ahttp(s?)://(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(/|/([\w#!:.?+=&%@!\-/]))?}i
-  validates :support_url, :allow_blank => true, :format => %r{\Ahttp(s?)://(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(/|/([\w#!:.?+=&%@!\-/]))?}i
-  validates :callback_url, :allow_blank => true, :format => %r{\A[a-z][a-z0-9.+-]*://(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(/|/([\w#!:.?+=&%@!\-/]))?}i
+  validates :url, :format => /\A#{URI::DEFAULT_PARSER.make_regexp(%w[http https])}\z/
+  validates :support_url, :allow_blank => true, :format => /\A#{URI::DEFAULT_PARSER.make_regexp(%w[http https])}\z/
+  validates :callback_url, :allow_blank => true, :format => /\A#{URI::DEFAULT_PARSER.make_regexp}\z/

 
   before_validation :generate_keys, :on => :create
 
 
   before_validation :generate_keys, :on => :create
 


@@ -51,12 +49,13 @@ class ClientApplication < ActiveRecord::Base
 
   def self.find_token(token_key)
     token = OauthToken.includes(:client_application).find_by(:token => token_key)
 
   def self.find_token(token_key)
     token = OauthToken.includes(:client_application).find_by(:token => token_key)

-    token if token && token.authorized?
+    token if token&.authorized?

   end
 
   def self.verify_request(request, options = {}, &block)
     signature = OAuth::Signature.build(request, options, &block)
     return false unless OauthNonce.remember(signature.request.nonce, signature.request.timestamp)
   end
 
   def self.verify_request(request, options = {}, &block)
     signature = OAuth::Signature.build(request, options, &block)
     return false unless OauthNonce.remember(signature.request.nonce, signature.request.timestamp)

+

     value = signature.verify
     value
   rescue OAuth::Signature::UnknownSignatureMethod
     value = signature.verify
     value
   rescue OAuth::Signature::UnknownSignatureMethod


@@ -68,7 +67,7 @@ class ClientApplication < ActiveRecord::Base
   end
 
   def oauth_server
   end
 
   def oauth_server

-    @oauth_server ||= OAuth::Server.new("https://" + SERVER_URL)
+    @oauth_server ||= OAuth::Server.new("https://" + Settings.server_url)

   end
 
   def credentials
   end
 
   def credentials