summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/origin_check.clj8
-rwxr-xr-xsrc/site.clj10
2 files changed, 4 insertions, 14 deletions
diff --git a/src/origin_check.clj b/src/origin_check.clj
deleted file mode 100644
index a24e43b..0000000
--- a/src/origin_check.clj
+++ /dev/null
@@ -1,8 +0,0 @@
-(ns origin-check)
-
-(defn with-origin-check
- "Middleware to validate that state-changing URL access
- originated from a page in the local domain."
- [handler]
- (fn [request]
- (handler request))) \ No newline at end of file
diff --git a/src/site.clj b/src/site.clj
index 2ed5892..f76531d 100755
--- a/src/site.clj
+++ b/src/site.clj
@@ -15,7 +15,6 @@
clojure.contrib.sql
clojure.contrib.str-utils
compojure
- origin-check
utils
cookie-login
session-sweeper
@@ -411,7 +410,7 @@
WHERE user_id = u.user_id
AND room_id = 1
AND is_image = true
- ORDER BY created_on LIMIT 1)")]
+ ORDER BY created_on DESC LIMIT 1)")]
(when (> (count user-ids) 0)
(let [res (do-select [qry])
keys (map :user_id res)
@@ -830,13 +829,11 @@
(with-mimetypes {:mimetypes mimetypes}))
(decorate pichat
- (with-origin-check)
(with-mimetypes {:mimetypes mimetypes})
(with-cookie-login (comp not logged-in?) make-login-token read-login-token)
(with-session {:type :memory, :expires (* 60 60)}))
(decorate multipart
- (with-origin-check)
(with-mimetypes {:mimetypes mimetypes})
(with-session {:type :memory, :expires (* 60 60)})
(with-multipart))
@@ -860,9 +857,10 @@
"Parses command-line arguments. First arg is script name,
second arg is port number (defaults to 8080)."
([script] {:port 8080})
- ([script port] {:port (maybe-parse-int port)}))
+ ([script port] {:port (Integer/parseInt port)}))
-(def options (apply parse-command-args *command-line-args*))
+(def options
+ (apply parse-command-args *command-line-args*))
(start-server (options :port))
(start-user-flusher!)