X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/0ea9f92be50a8763331a81d3c32a5f5a157265c6..6f144e8b7dbedab09042f461bd55d357c8896612:/app/models/client_application.rb

diff --git a/app/models/client_application.rb b/app/models/client_application.rb
index 09eec40d3..156eeafc7 100644
--- a/app/models/client_application.rb
+++ b/app/models/client_application.rb
@@ -1,43 +1,36 @@
-require 'oauth'
+require "oauth"
+
 class ClientApplication < ActiveRecord::Base
   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 => /\Ahttp(s?):\/\/(\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 => %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
+
+  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 if token && 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)
+    value = signature.verify
+    value
+  rescue OAuth::Signature::UnknownSignatureMethod
+    false
   end
-  
+
   def self.all_permissions
     PERMISSIONS
   end
@@ -45,17 +38,21 @@ class ClientApplication < ActiveRecord::Base
   def oauth_server
     @oauth_server ||= OAuth::Server.new("http://" + SERVER_URL)
   end
-  
+
   def credentials
     @oauth_client ||= 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 +61,7 @@ class ClientApplication < ActiveRecord::Base
 
       token = access_tokens.create(params)
     end
-    
+
     token
   end
 
@@ -73,17 +70,17 @@ 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 ]
+                 :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