X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/f0b2ed9bb6c1e153231b8088eabe6e3edcee9420..255ce8708a4e9099f9a9eaa92278a40629a4d883:/app/models/client_application.rb?ds=inline diff --git a/app/models/client_application.rb b/app/models/client_application.rb index 90523a265..ee39c294b 100644 --- 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) # -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 @@ -41,9 +39,9 @@ class ClientApplication < ActiveRecord::Base 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 @@ -51,14 +49,14 @@ class ClientApplication < ActiveRecord::Base 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) - value = signature.verify - value + + signature.verify rescue OAuth::Signature::UnknownSignatureMethod false end @@ -68,14 +66,14 @@ class ClientApplication < ActiveRecord::Base end def oauth_server - @oauth_server ||= OAuth::Server.new("http://" + SERVER_URL) + @oauth_server ||= OAuth::Server.new("https://#{Settings.server_url}") end def credentials - @oauth_client ||= OAuth::Consumer.new(key, secret) + @credentials ||= OAuth::Consumer.new(key, secret) end - def create_request_token(params = {}) + def create_request_token(_params = {}) params = { :client_application => self, :callback_url => token_callback_url } permissions.each do |p| params[p] = true