From f85db22e4f64b1ad4cbdc9309cf560410faf1e80 Mon Sep 17 00:00:00 2001
From: Tore Brede <Tore.Brede@uib.no>
Date: Mon, 15 Nov 2021 11:37:18 +0100
Subject: [PATCH 1/3] Fixing redeclaration of rest framework settings
---
gregsite/settings/base.py | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/gregsite/settings/base.py b/gregsite/settings/base.py
index a4e14bb7..946e2a85 100644
--- a/gregsite/settings/base.py
+++ b/gregsite/settings/base.py
@@ -98,6 +98,13 @@ REST_FRAMEWORK = {
),
"DEFAULT_PERMISSION_CLASSES": ("rest_framework.permissions.IsAuthenticated",),
"DEFAULT_SCHEMA_CLASS": "drf_spectacular.openapi.AutoSchema",
+ # Rate limit settings of invite endpoint
+ "DEFAULT_THROTTLE_CLASSES": [
+ "rest_framework.throttling.AnonRateThrottle",
+ ],
+ "DEFAULT_THROTTLE_RATES": {
+ "anon": "100/day",
+ },
}
SPECTACULAR_SETTINGS = {
@@ -293,15 +300,6 @@ INTERNAL_RK_PREFIX = "no.{instance}.greg".format(instance=INSTANCE_NAME)
FEIDE_SOURCE = "feide"
-# Rate limit settings of invite endpoint
-REST_FRAMEWORK = {
- "DEFAULT_THROTTLE_CLASSES": [
- "rest_framework.throttling.AnonRateThrottle",
- ],
- "DEFAULT_THROTTLE_RATES": {
- "anon": "100/day",
- },
-}
# Used by the OU import from orgreg to distinguish the OuIdentifiers from others
--
GitLab
From 8f2e40e38f04e4cbed914d0501dcfbaee2dbba75 Mon Sep 17 00:00:00 2001
From: Tore Brede <Tore.Brede@uib.no>
Date: Mon, 15 Nov 2021 11:45:43 +0100
Subject: [PATCH 2/3] Fixing formatting
---
gregsite/settings/base.py | 1 -
1 file changed, 1 deletion(-)
diff --git a/gregsite/settings/base.py b/gregsite/settings/base.py
index 946e2a85..277c4a60 100644
--- a/gregsite/settings/base.py
+++ b/gregsite/settings/base.py
@@ -301,7 +301,6 @@ INTERNAL_RK_PREFIX = "no.{instance}.greg".format(instance=INSTANCE_NAME)
FEIDE_SOURCE = "feide"
-
# Used by the OU import from orgreg to distinguish the OuIdentifiers from others
ORGREG_SOURCE = "orgreg"
ORGREG_NAME = "orgreg_id"
--
GitLab
From f52d2b3f51322ee3f576bdfad1503cd39b488c27 Mon Sep 17 00:00:00 2001
From: Tore Brede <Tore.Brede@uib.no>
Date: Mon, 15 Nov 2021 12:24:48 +0100
Subject: [PATCH 3/3] Updating throttle limit
---
gregsite/settings/base.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gregsite/settings/base.py b/gregsite/settings/base.py
index 277c4a60..4661b7ba 100644
--- a/gregsite/settings/base.py
+++ b/gregsite/settings/base.py
@@ -103,7 +103,7 @@ REST_FRAMEWORK = {
"rest_framework.throttling.AnonRateThrottle",
],
"DEFAULT_THROTTLE_RATES": {
- "anon": "100/day",
+ "anon": "10/minute",
},
}
--
GitLab