Skip to content

Commit 6089c7a

Browse files
author
Gary Johnson
committed
Review fixes: see below for details
* Global - Rename `:truncate-request?` to `:truncate-request` everywhere * README.org - Make `:truncate-request` false by default (more intuitive) * config.namespaced-example.edn - Add example for `:triangulum.handler/truncate-request` * config.nested-example.edn - Add example for `:server` -> `:truncate-request` * src/triangulum/config.clj - 27: `::boolean` spec is unused * src/triangulum/config_namespaced_spec.clj - 36: Include `:triangulum.handler/truncate-request` in server spec * src/triangulum/config_nested_spec.clj - 23: Include `:triangulum.handler/truncate-request` in server spec * src/triangulum/handler.clj - 38: Add spec: `::truncate-request boolean?` - Change :truncate-request logic to be false by default (more intuitive) * src/triangulum/server.clj - 28: Remove `::truncate-request` spec
1 parent eea93ee commit 6089c7a

8 files changed

+7
-6
lines changed

README.org

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ file logging system, and worker functions for non-HTTP-related tasks.
6767
:cider-nrepl true ; If your editor supports CIDER middleware
6868
:mode "dev" ; or prod
6969
:log-dir "logs" ; or "" for stdout
70-
:truncate-request? false ; true by default
70+
:truncate-request true ; false by default
7171
:handler product-ns.routing/handler
7272
:workers {:scheduler {:start product-ns.jobs/start-scheduled-jobs!
7373
:stop product-ns.jobs/stop-scheduled-jobs!}}

config.namespaced-example.edn

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
:triangulum.handler/route-authenticator product-ns.handlers/route-authenticator
1919
:triangulum.handler/routing-tables [backend-libary-ns.routing/routes product-ns.routing/routes]
2020
:triangulum.handler/bad-tokens #{".php"}
21+
:triangulum.handler/truncate-request false
2122
:triangulum.handler/private-request-keys #{:base64Image :plotFileBase64 :sampleFileBase64}
2223
:triangulum.handler/private-response-keys #{}
2324

config.nested-example.edn

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
:route-authenticator product-ns.handlers/route-authenticator
1919
:routing-tables [common-libary-ns.routing/routes product-ns.routing/routes]
2020
:bad-tokens #{".php"}
21+
:truncate-request false
2122
:private-request-keys #{:base64Image :plotFileBase64 :sampleFileBase64}
2223
:private-response-keys #{}
2324

src/triangulum/config.clj

-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
(s/def ::url-or-file-path (s/and string? #(re-matches #"^(https?:\/\/[^\s\/$.?#].[^\s]*)|(/[^:*?\"<>|]*)$" %)))
2525
(s/def ::path (s/and string? #(re-matches #"[./][^:*?\"<>|]*" %)))
2626
(s/def ::hostname (s/and string? #(re-matches #"[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}" %)))
27-
(s/def ::boolean boolean?)
2827

2928
;; Config file
3029

src/triangulum/config_namespaced_spec.clj

+1
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
:triangulum.handler/redirect-handler
3434
:triangulum.handler/route-authenticator
3535
:triangulum.handler/routing-tables
36+
:triangulum.handler/truncate-request
3637
:triangulum.handler/private-request-keys
3738
:triangulum.handler/private-response-keys
3839
:triangulum.handler/bad-tokens

src/triangulum/config_nested_spec.clj

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
:triangulum.handler/route-authenticator
2121
:triangulum.handler/routing-tables
2222
:triangulum.handler/bad-tokens
23+
:triangulum.handler/truncate-request
2324
:triangulum.handler/private-request-keys
2425
:triangulum.handler/private-response-keys
2526
:triangulum.worker/workers

src/triangulum/handler.clj

+2-3
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
(s/def ::route-authenticator ::config/namespaced-symbol)
3636
(s/def ::routing-tables (s/coll-of ::config/namespaced-symbol))
3737
(s/def ::bad-tokens (s/coll-of ::config/string :kind set? :min-count 0))
38+
(s/def ::truncate-request boolean?)
3839
(s/def ::private-request-keys (s/coll-of keyword :kind set?))
3940
(s/def ::private-response-keys (s/coll-of keyword :kind set?))
4041

@@ -85,11 +86,9 @@
8586
[handler]
8687
(fn [request]
8788
(let [{:keys [uri request-method params]} request
89+
truncate-request? (get-config :server :truncate-request)
8890
private-request-keys (or (get-config :server :private-request-keys)
8991
#{:password :passwordConfirmation})
90-
truncate-request? (if (some? (get-config :server :truncate-request?))
91-
(get-config :server :truncate-request?)
92-
true)
9392
param-str (pr-str (apply dissoc params private-request-keys))]
9493
(log (apply str "Request(" (name request-method) "): \"" uri "\" " param-str) :truncate? truncate-request?)
9594
(handler request))))

src/triangulum/server.clj

-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
(s/def ::cider-nrepl boolean?)
2626
(s/def ::mode (s/and ::config/string #{"dev" "prod"}))
2727
(s/def ::log-dir ::config/string)
28-
(s/def ::truncate-request? ::config/boolean)
2928
(s/def ::handler ::config/namespaced-symbol)
3029
(s/def ::keystore-file ::config/string)
3130
(s/def ::keystore-type ::config/string)

0 commit comments

Comments
 (0)