summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorazul <azul@riseup.net>2017-08-07 08:37:13 +0000
committerazul <azul@riseup.net>2017-08-07 08:37:13 +0000
commit66b05aa9dc702096d5ce2b75abe7619f780ff8ec (patch)
treed6442dbd54d2cf6224714ce2b96643f548148f09 /app
parent38ce3a14652aca9b3b8d8ad42f9968cfbcc44478 (diff)
parent0a161e88143d28349c49805ea7cc83c5106e075a (diff)
Merge branch 'fix/token-conflict' into 'master'
prevent token conflicts Closes #8792 See merge request !42
Diffstat (limited to 'app')
-rw-r--r--app/models/token.rb51
1 files changed, 39 insertions, 12 deletions
diff --git a/app/models/token.rb b/app/models/token.rb
index 8ac32b8..6d9f0fe 100644
--- a/app/models/token.rb
+++ b/app/models/token.rb
@@ -35,8 +35,13 @@ class Token < CouchRest::Model::Base
by_last_seen_at.endkey(expires_after.minutes.ago)
end
+ def self.to_cleanup
+ return [] unless expires_after
+ by_last_seen_at.endkey((expires_after + 5).minutes.ago)
+ end
+
def self.destroy_all_expired
- self.expired.each do |token|
+ self.to_cleanup.each do |token|
token.destroy
end
end
@@ -46,27 +51,29 @@ class Token < CouchRest::Model::Base
end
def authenticate
- if expired?
- destroy
- return nil
- else
- touch
- return user
- end
+ return if expired?
+ touch
+ return user
+ rescue CouchRest::NotFound
+ # Reload in touch failed - token has been deleted.
+ # That's either an active logout or account destruction.
+ # We don't accept the token anymore.
end
# Tokens can be cleaned up in different ways.
# So let's make sure we don't crash if they disappeared
def destroy_with_rescue
destroy_without_rescue
- rescue CouchRest::NotFound
rescue CouchRest::Conflict # do nothing - it's been updated - #7670
+ try_to_reload && retry
+ rescue CouchRest::NotFound
end
alias_method_chain :destroy, :rescue
def touch
- self.last_seen_at = Time.now
- save
+ update_attributes last_seen_at: Time.now
+ rescue CouchRest::Conflict
+ reload && retry
end
def expired?
@@ -82,5 +89,25 @@ class Token < CouchRest::Model::Base
self.last_seen_at = Time.now
end
end
-end
+ # UPGRADE: the underlying code here changes between CouchRest::Model
+ # 2.1.0.rc1 and 2.2.0.beta2
+ # Hopefully we'll also get a pr merged that pushes this workaround
+ # upstream:
+ # https://github.com/couchrest/couchrest_model/pull/223
+ def reload
+ prepare_all_attributes(
+ database.get!(id), :directly_set_attributes => true
+ )
+ self
+ end
+
+ protected
+
+ def try_to_reload
+ reload
+ rescue CouchRest::NotFound
+ return false
+ end
+
+end