Skip to content

Add rate-limiting to admin query/transact #2887

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dwwoelfel merged 2 commits into from
Aug 30, 2026
Merged

Add rate-limiting to admin query/transact #2887

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
df5fd27
Add rate-limiting to admin query/transact
dwwoelfel Aug 30, 2026
ad89530
cover perms checks
dwwoelfel Aug 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 19 additions & 6 deletions server/src/instant/admin/routes.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
[instant.model.app-user-refresh-token :as app-user-refresh-token-model]
[instant.model.rule :as rule-model]
[instant.model.instant-user :as instant-user-model]
[instant.rate-limit :as rate-limit]
[instant.reactive.receive-queue :as receive-queue]
[instant.reactive.session :as session]
[instant.reactive.sse :as sse]
Expand Down Expand Up @@ -137,13 +138,22 @@
"authorization" "foo"}}
:data/read))

(defn rate-limit! [app-id type]
(when-let [rate-limit-config (flags/app-admin-rate-limit-config app-id)]
(rate-limit/consume-user-rate-limit (eph/get-rate-limit)
{:app-id app-id
:bucket-key app-id
:bucket-name (str "__instant-admin-" type)
:config rate-limit-config})))

;; ------
;; Query

(defn query-post [req]
(let [query (ex/get-param! req [:body :query] #(when (map? %) %))
inference? (-> req :body :inference? boolean)
{:keys [app-id] :as perms} (get-perms! req :data/read)
_ (rate-limit! app-id "query")
attrs (attr-model/get-by-app-id app-id)
ctx (merge {:db {:conn-pool (aurora/conn-pool :read)}
:app-id app-id
Expand Down Expand Up @@ -227,6 +237,7 @@
_ (when rules-override
(ex/assert-valid! :rule rules-override
(rule-model/validation-errors rules-override)))
_ (rate-limit! app-id "query")
ip-override (ex/get-optional-param! req [:body :ip-override] string-util/coerce-non-blank-str)
origin-override (ex/get-optional-param! req [:body :origin-override] string-util/coerce-non-blank-str)
query (ex/get-param! req [:body :query] #(when (map? %) %))
Expand Down Expand Up @@ -279,6 +290,7 @@
tx-steps (admin-model/->tx-steps! {:attrs attrs
:throw-on-missing-attrs? throw-on-missing-attrs?}
steps)
_ (rate-limit! app-id "transact")
Comment thread
coderabbitai[bot] marked this conversation as resolved.
use-tx-queue? (flags/admin-tx-queue-enabled? app-id)]
(tracer/add-data! {:attributes {:use-tx-queue use-tx-queue?}})
(if-not use-tx-queue?
Expand Down Expand Up @@ -357,9 +369,10 @@
tx-steps (admin-model/->tx-steps! {:attrs attrs
:throw-on-missing-attrs? throw-on-missing-attrs?}
steps)
_ (rate-limit! app-id "transact")
result (binding [*request-info* (cond-> *request-info*
ip-override (assoc :ip ip-override)
origin-override (assoc :origin origin-override))]
ip-override (assoc :ip ip-override)
origin-override (assoc :origin origin-override))]
(permissioned-tx/transact! ctx tx-steps))
cleaned-result {:tx-id (:id result)
:all-checks-ok? (:all-checks-ok? result)
Expand Down Expand Up @@ -541,10 +554,10 @@
:extra-fields extra-fields
:skip-perm-check? true}))
user (app-user-model/create!
{:app-id app-id
:id user-id
:type "guest"
:extra-fields extra-fields})
{:app-id app-id
:id user-id
:type "guest"
:extra-fields extra-fields})
refresh-token (random-uuid)
_ (app-user-refresh-token-model/create!
{:app-id app-id
Expand Down
14 changes: 14 additions & 0 deletions server/src/instant/flags.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -694,3 +694,17 @@
users keep team access after we cancel their Stripe subscriptions."
[]
(sunset-stage-at-least? :signups-closed))

(defn app-admin-rate-limit-config
"Config for rate-limiting admin transact and query.
The config should look like:
{\"limits\": [
{\"capacity\": 10,
\"refill\": {
\"period\": \"1 hour\",
\"amount\": 10,
\"type\": \"interval\" // or \"greedy\"}}]}
Make sure to key by app_id for admin-rate-limit-for-app"
[app-id]
(or (get (flag :admin-rate-limit-for-app) (str app-id))
(flag :global-admin-rate-limit)))
Loading