meissa/c4k-forgejo
6
0
Fork 0
Code Issues Pull requests Projects Releases 27 Packages Wiki Activity

rate-limit #3

Merged
patdyn merged 23 commits from rate-limit into main 2024-01-23 09:02:07 +00:00
Conversation 0 Commits 23 Files changed 5 +3 -3
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit aec67352d5 - Show all commits

2
src/main/cljc/dda/c4k_forgejo/core.cljc
View file

@ -50,7 +50,7 @@
(forgejo/generate-data-volume config) (forgejo/generate-data-volume config)
(forgejo/generate-appini-env config) (forgejo/generate-appini-env config)
(forgejo/generate-secrets auth)] (forgejo/generate-secrets auth)]
(when (contains? config :average) (when (contains? config :average) ; ToDo: just leave this out and make sensible defaults
(forgejo/generate-rate-limit-ingress-and-cert config)) ; this function has a vector as output (forgejo/generate-rate-limit-ingress-and-cert config)) ; this function has a vector as output
(when (contains? config :average) (when (contains? config :average)
[(forgejo/generate-rate-limit-middleware config)]) ; this does not [(forgejo/generate-rate-limit-middleware config)]) ; this does not

4
src/main/cljc/dda/c4k_forgejo/forgejo.cljc
View file

@ -42,7 +42,7 @@
(s/def ::mailer-pw pred/bash-env-string?) (s/def ::mailer-pw pred/bash-env-string?)
(s/def ::issuer pred/letsencrypt-issuer?) (s/def ::issuer pred/letsencrypt-issuer?)
(s/def ::volume-total-storage-size (partial pred/int-gt-n? 5)) (s/def ::volume-total-storage-size (partial pred/int-gt-n? 5))
(s/def ::average int?) (s/def ::average int?)
(s/def ::burst int?) (s/def ::burst int?)
(def config? (s/keys :req-un [::fqdn (def config? (s/keys :req-un [::fqdn
@ -137,7 +137,7 @@
; using :average and :burst seems sensible, :period may be interesting for fine tuning later on ; using :average and :burst seems sensible, :period may be interesting for fine tuning later on
(defn-spec generate-rate-limit-middleware pred/map-or-seq? (defn-spec generate-rate-limit-middleware pred/map-or-seq?
[config config?] [config config?]
(let [{:keys [average burst]} config] (let [{:keys [average burst]} config] ; ToDo: Set defaults, don't read config ; refactor ":average" KW to smth more speaking
(-> (->
(yaml/load-as-edn "forgejo/middleware-ratelimit.yaml") (yaml/load-as-edn "forgejo/middleware-ratelimit.yaml")
(cm/replace-key-value :average average) (cm/replace-key-value :average average)