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

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

diff --git a/app/models/client_application.rb b/app/models/client_application.rb
index 156eeafc7989cc15a6d03d504bef6477aa0604e8..d9d6b2df8ca60d11ecfe404d1bc6ef94cfe7178f 100644 (file)
--- a/app/models/client_application.rb
+++ b/app/models/client_application.rb
@@ -1,7 +1,37 @@
-require "oauth"
-
-class ClientApplication < ActiveRecord::Base
-  belongs_to :user
+# == 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, :optional => true

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


@@ -9,41 +39,41 @@ 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
 
   attr_accessor :token_callback_url
 
   def self.find_token(token_key)
 
   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)
-    token if token && token.authorized?
+    token = OauthToken.includes(:client_application).find_by(:token => token_key)
+    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
+
+    signature.verify

   rescue OAuth::Signature::UnknownSignatureMethod
     false
   end
 
   def self.all_permissions
   rescue OAuth::Signature::UnknownSignatureMethod
     false
   end
 
   def self.all_permissions

-    PERMISSIONS
+    Oauth.scopes.collect { |s| :"allow_#{s.name}" }

   end
 
   def oauth_server
   end
 
   def oauth_server

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

   end
 
   def credentials
   end
 
   def credentials

-    @oauth_client ||= OAuth::Consumer.new(key, secret)
+    @credentials ||= OAuth::Consumer.new(key, secret)

   end
 
   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
     params = { :client_application => self, :callback_url => token_callback_url }
     permissions.each do |p|
       params[p] = true


@@ -72,13 +102,6 @@ class ClientApplication < ActiveRecord::Base
 
   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,
-                 :allow_write_notes].freeze
-

   def generate_keys
     self.key = OAuth::Helper.generate_key(40)[0, 40]
     self.secret = OAuth::Helper.generate_key(40)[0, 40]
   def generate_keys
     self.key = OAuth::Helper.generate_key(40)[0, 40]
     self.secret = OAuth::Helper.generate_key(40)[0, 40]