X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/832b96b75ac05177e6baad7b414066ccfd7cfa51..255ce8708a4e9099f9a9eaa92278a40629a4d883:/app/models/client_application.rb?ds=inline diff --git a/app/models/client_application.rb b/app/models/client_application.rb index ffca1c63c..ee39c294b 100644 --- a/app/models/client_application.rb +++ b/app/models/client_application.rb @@ -1,61 +1,88 @@ -require 'oauth' -class ClientApplication < ActiveRecord::Base +# == Schema Information +# +# Table name: client_applications +# +# id :integer not null, primary key +# name :string +# url :string +# support_url :string +# callback_url :string +# key :string(50) +# secret :string(50) +# user_id :integer +# created_at :datetime +# updated_at :datetime +# allow_read_prefs :boolean default(FALSE), not null +# allow_write_prefs :boolean default(FALSE), not null +# allow_write_diary :boolean default(FALSE), not null +# allow_write_api :boolean default(FALSE), not null +# allow_read_gpx :boolean default(FALSE), not null +# allow_write_gpx :boolean default(FALSE), not null +# allow_write_notes :boolean default(FALSE), not null +# +# Indexes +# +# index_client_applications_on_key (key) UNIQUE +# index_client_applications_on_user_id (user_id) +# +# Foreign Keys +# +# client_applications_user_id_fkey (user_id => users.id) +# + +class ClientApplication < ApplicationRecord belongs_to :user - has_many :tokens, :class_name => "OauthToken" + has_many :tokens, :class_name => "OauthToken", :dependent => :delete_all has_many :access_tokens - validates_presence_of :name, :url, :key, :secret - validates_uniqueness_of :key - before_validation_on_create :generate_keys - - validates_format_of :url, :with => /\Ahttp(s?):\/\/(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?/i - validates_format_of :support_url, :with => /\Ahttp(s?):\/\/(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?/i, :allow_blank=>true - validates_format_of :callback_url, :with => /\A[a-z][a-z0-9.+-]*:\/\/(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?/i, :allow_blank=>true + has_many :oauth2_verifiers + has_many :oauth_tokens + + validates :key, :presence => true, :uniqueness => true + validates :name, :url, :secret, :presence => true + 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 attr_accessor :token_callback_url - + def self.find_token(token_key) - token = OauthToken.find_by_token(token_key, :include => :client_application) - if token && token.authorized? - token - else - nil - end + token = OauthToken.includes(:client_application).find_by(:token => token_key) + token if token&.authorized? end def self.verify_request(request, options = {}, &block) - begin - signature = OAuth::Signature.build(request, options, &block) - logger.info "Signature Base String: #{signature.signature_base_string}" - logger.info "Consumer: #{signature.send :consumer_key}" - logger.info "Token: #{signature.send :token}" - return false unless OauthNonce.remember(signature.request.nonce, signature.request.timestamp) - value = signature.verify - logger.info "Signature verification returned: #{value.to_s}" - value - rescue OAuth::Signature::UnknownSignatureMethod => e - logger.info "ERROR"+e.to_s - false - end + signature = OAuth::Signature.build(request, options, &block) + return false unless OauthNonce.remember(signature.request.nonce, signature.request.timestamp) + + signature.verify + rescue OAuth::Signature::UnknownSignatureMethod + false end - + def self.all_permissions PERMISSIONS 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 - RequestToken.create :client_application => self, :callback_url => self.token_callback_url + + def create_request_token(_params = {}) + params = { :client_application => self, :callback_url => token_callback_url } + permissions.each do |p| + params[p] = true + end + RequestToken.create(params) end def access_token_for_user(user) - unless token = access_tokens.find(:first, :conditions => { :user_id => user.id, :invalidated_at => nil }) + unless token = access_tokens.valid.find_by(:user_id => user) params = { :user => user } permissions.each do |p| @@ -64,7 +91,7 @@ class ClientApplication < ActiveRecord::Base token = access_tokens.create(params) end - + token end @@ -73,17 +100,15 @@ class ClientApplication < ActiveRecord::Base ClientApplication.all_permissions.select { |p| self[p] } end -protected - + protected + # this is the set of permissions that the client can ask for. clients # have to say up-front what permissions they want and when users sign up they # can agree or not agree to each of them. - PERMISSIONS = [:allow_read_prefs, :allow_write_prefs, :allow_write_diary, - :allow_write_api, :allow_read_gpx, :allow_write_gpx ] + PERMISSIONS = [:allow_read_prefs, :allow_write_prefs, :allow_write_diary, :allow_write_api, :allow_read_gpx, :allow_write_gpx, :allow_write_notes].freeze def generate_keys - oauth_client = oauth_server.generate_consumer_credentials - self.key = oauth_client.key - self.secret = oauth_client.secret + self.key = OAuth::Helper.generate_key(40)[0, 40] + self.secret = OAuth::Helper.generate_key(40)[0, 40] end end