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

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

diff --git a/app/models/oauth_nonce.rb b/app/models/oauth_nonce.rb
index 075351b9140d2724f539387fe3be978974a8148d..86463f297226e11dce96bcc55af1ffd31e92342e 100644 (file)
--- a/app/models/oauth_nonce.rb
+++ b/app/models/oauth_nonce.rb
@@ -1,13 +1,31 @@
+# == Schema Information
+#
+# Table name: oauth_nonces
+#
+#  id         :bigint           not null, primary key
+#  nonce      :string
+#  timestamp  :integer
+#  created_at :datetime
+#  updated_at :datetime
+#
+# Indexes
+#
+#  index_oauth_nonces_on_nonce_and_timestamp  (nonce,timestamp) UNIQUE
+#
+

 # Simple store of nonces. The OAuth Spec requires that any given pair of nonce and timestamps are unique.
 # Thus you can use the same nonce with a different timestamp and viceversa.
 # Simple store of nonces. The OAuth Spec requires that any given pair of nonce and timestamps are unique.
 # Thus you can use the same nonce with a different timestamp and viceversa.

-class OauthNonce < ActiveRecord::Base
-  validates_presence_of :nonce, :timestamp
-  validates_uniqueness_of :nonce, :scope => :timestamp
-  
+class OauthNonce < ApplicationRecord
+  validates :timestamp, :presence => true
+  validates :nonce, :presence => true, :uniqueness => { :scope => :timestamp }
+

   # Remembers a nonce and it's associated timestamp. It returns false if it has already been used
   def self.remember(nonce, timestamp)
   # Remembers a nonce and it's associated timestamp. It returns false if it has already been used
   def self.remember(nonce, timestamp)

-    oauth_nonce = OauthNonce.create(:nonce => nonce, :timestamp => timestamp)
+    return false if Time.now.to_i - timestamp.to_i > 86400
+
+    oauth_nonce = OauthNonce.create(:nonce => nonce, :timestamp => timestamp.to_i)

     return false if oauth_nonce.new_record?
     return false if oauth_nonce.new_record?

+

     oauth_nonce
   end
 end
     oauth_nonce
   end
 end