summaryrefslogtreecommitdiff
path: root/app/models
diff options
context:
space:
mode:
authorAzul <azul@leap.se>2014-07-09 22:53:05 +0200
committerAzul <azul@leap.se>2014-07-12 09:14:23 +0200
commitbdd5060ccc13951524c171e2d3b81eeddec1625d (patch)
treebc07fcec83529a43c95cd1c54f0c4f43c77e51dd /app/models
parentcc1666d9832415058bf0b22bb5912e432261af4f (diff)
fix tests and simplify time calculations
Diffstat (limited to 'app/models')
-rw-r--r--app/models/client_certificate.rb30
1 files changed, 10 insertions, 20 deletions
diff --git a/app/models/client_certificate.rb b/app/models/client_certificate.rb
index 6b57985..815801e 100644
--- a/app/models/client_certificate.rb
+++ b/app/models/client_certificate.rb
@@ -48,7 +48,7 @@ class ClientCertificate
end
def expiry
- @expiry ||= months_from_yesterday(APP_CONFIG[:client_cert_lifespan])
+ @expiry ||= lifespan.months.from_now.utc.at_midnight
end
private
@@ -103,28 +103,18 @@ class ClientCertificate
}
end
- ##
- ## TIME HELPERS
- ##
- ## note: we use 'yesterday' instead of 'today', because times are in UTC, and some people on the planet
- ## are behind UTC.
- ##
-
- def yesterday
- t = Time.now - 24*60*60
- Time.utc t.year, t.month, t.day
- end
+ #
+ # TIME HELPERS
+ #
+ # We normalize timestamps at utc and midnight
+ # to reduce the fingerprinting possibilities.
+ #
def last_month
- t = Time.now - 24*60*60*30
- Time.utc t.year, t.month, t.day
+ 1.month.ago.utc.at_midnight
end
- def months_from_yesterday(num)
- t = yesterday
- date = Date.new t.year, t.month, t.day
- date = date >> num # >> is months in the future operator
- Time.utc date.year, date.month, date.day
+ def lifespan
+ APP_CONFIG[:client_cert_lifespan]
end
-
end