summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorsostler <sbostler@gmail.com>2010-02-17 00:48:03 -0500
committersostler <sbostler@gmail.com>2010-02-17 00:48:03 -0500
commitff5ffda64a346ca984eaa233b7cbba65e35e7e3e (patch)
treeda4e7868569403cb24e968308c51a972f717d1eb /src
parent20126bfad85a059912a2c372bd8e1239871c7b92 (diff)
parent2b64baa3f6cffe0153596613ee7a749b90aaa816 (diff)
Merge branch 'master' of ssh://sostler@dump.fm/home/dumpfmprod/prod
Diffstat (limited to 'src')
-rwxr-xr-xsrc/site.clj12
1 files changed, 4 insertions, 8 deletions
diff --git a/src/site.clj b/src/site.clj
index 2516d49..a524a1c 100755
--- a/src/site.clj
+++ b/src/site.clj
@@ -244,13 +244,9 @@
(try [(aget x 0) (Long/parseLong (aget x 1)) (aget x 2)]
(catch NumberFormatException _ nil))))
+
(defn read-login-token [token]
- (if-let [[nick expiry token-hash] (parse-login-token token)]
- (if (>= expiry (System/currentTimeMillis))
- (let [db-info (fetch-nick nick)
- computed-hash (sha1-hash (db-info :hash) expiry)]
- (if (= token-hash computed-hash)
- db-info)))))
+ nil)
(defn make-login-token
[{nick :nick hash :hash}]
@@ -273,7 +269,7 @@
db-user (authorize-nick-hash nick hash)
remember-me (= (params :rememberme) "yes")
login-cookie (if remember-me
- (make-login-token db-user *login-token-expiry*)
+ (make-login-token db-user)
(clear-login-token *login-token-key*))]
(if db-user
[(session-assoc-from-db db-user)
@@ -624,4 +620,4 @@
"/upload" (servlet multipart)
"/*" (servlet pichat))
-(send-off flusher flush!) \ No newline at end of file
+(send-off flusher flush!)