Skip to content
This repository
Browse code

Merge commit '8a9f2f8a0a7683fa0bad8bf33f209cb915e2ce3c'

  • Loading branch information...
commit 4025609e1c373bf45e19151be47c8b74b701e07e 2 parents db9497b + 8a9f2f8
Alan Malloy amalloy authored

Showing 2 changed files with 4 additions and 10 deletions. Show diff stats Hide diff stats

  1. +2 2 project.clj
  2. +2 8 src/foreclojure/problems.clj
4 project.clj
... ... @@ -1,9 +1,9 @@
1   -(defproject foreclojure "2.0.0-alpha1"
  1 +(defproject foreclojure "2.0.0-alpha2"
2 2 :description "4clojure - a website for learning Clojure"
3 3 :dependencies [[org.clojure/clojure "1.4.0"]
4 4 [compojure "1.1.0"]
5 5 [hiccup "1.0.0"]
6   - [clojail "0.6.0"]
  6 + [clojail "0.5.1"]
7 7 [lib-noir "0.1.1"]
8 8 [congomongo "0.1.9"]
9 9 [org.jasypt/jasypt "1.7"]
10 src/foreclojure/problems.clj
@@ -14,7 +14,7 @@
14 14 [foreclojure.users :only [golfer? get-user-id disable-codebox?]]
15 15 [foreclojure.solutions :only [save-solution get-solution]]
16 16 [clojail.core :exclude [safe-read]]
17   - [clojail.testers :only [secure-tester blanket]]
  17 + [clojail.testers :only [secure-tester]]
18 18 [somnium.congomongo :only [update! fetch-one fetch fetch-and-modify destroy!]]
19 19 [hiccup.form :only [form-to text-area hidden-field label text-field drop-down]]
20 20 [hiccup.element :only [link-to]]
@@ -162,14 +162,8 @@
162 162
163 163 (def restricted-list '[use require in-ns future agent send send-off pmap pcalls])
164 164
165   -(def base-tester (blanket secure-tester
166   - "foreclojure"
167   - "somnium"
168   - "ring"
169   - "compojure"))
170   -
171 165 (defn get-tester [restricted]
172   - (into base-tester (concat restricted-list (map symbol restricted))))
  166 + (into secure-tester (concat restricted-list (map symbol restricted))))
173 167
174 168 (def sb (sandbox*))
175 169

0 comments on commit 4025609

Please sign in to comment.
Something went wrong with that request. Please try again.