X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/461f99dfe03ed0dfea2d973378e0ace70134c199..255ce8708a4e9099f9a9eaa92278a40629a4d883:/app/models/client_application.rb?ds=inline diff --git a/app/models/client_application.rb b/app/models/client_application.rb index 67ff075f1..ee39c294b 100644 --- a/app/models/client_application.rb +++ b/app/models/client_application.rb @@ -39,9 +39,9 @@ class ClientApplication < ApplicationRecord 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 @@ -56,8 +56,7 @@ class ClientApplication < ApplicationRecord 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 @@ -67,7 +66,7 @@ class ClientApplication < ApplicationRecord end def oauth_server - @oauth_server ||= OAuth::Server.new("https://" + Settings.server_url) + @oauth_server ||= OAuth::Server.new("https://#{Settings.server_url}") end def credentials