fix(oauth2): Fix google oauth2 whitelisting.

The variable is a tuple and should be managed as such Signed-off-by: Julien Godin <[email protected]>
DefectDojo · Dec 4, 2024 · 0f2e632 · 0f2e632
1 parent 0882320
commit 0f2e632
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/docs/content/en/open_source/archived_docs/integrations/social-authentication.md b/docs/content/en/open_source/archived_docs/integrations/social-authentication.md
@@ -86,12 +86,24 @@ to be created. Closely follow the steps below to guarantee success.
     DD_SOCIAL_AUTH_GOOGLE_OAUTH2_WHITELISTED_DOMAINS = ['example.com', 'example.org']
     {{< /highlight >}}
 
+    As an environment variable: 
+
+    {{< highlight python >}}
+    DD_SOCIAL_AUTH_GOOGLE_OAUTH2_WHITELISTED_DOMAINS = example.com,example.org
+    {{< /highlight >}}
+
     or
 
     {{< highlight python >}}
     DD_SOCIAL_AUTH_GOOGLE_OAUTH2_WHITELISTED_EMAILS = ['<[email protected]>']
     {{< /highlight >}}
 
+    As an environment variable: 
+
+    {{< highlight python >}}
+    DD_SOCIAL_AUTH_GOOGLE_OAUTH2_WHITELISTED_EMAILS = [email protected]
+    {{< /highlight >}}
+
 ## OKTA
 
 In a similar fashion to that of Google, using OKTA as a OAuth2 provider

diff --git a/dojo/settings/.settings.dist.py.sha256sum b/dojo/settings/.settings.dist.py.sha256sum
@@ -1 +1 @@
-1b1f0b7210b79790c2bf1a3fdb62e24521544600bb4b460ed6a15cfd26f68640
+21dbb927fc11808947edca13dc908fc7fc2b905563e50e6af7a18ca6deb75dd9
diff --git a/dojo/settings/settings.dist.py b/dojo/settings/settings.dist.py
@@ -549,8 +549,8 @@ def generate_url(scheme, double_slashes, user, password, host, port, path, param
 GOOGLE_OAUTH_ENABLED = env("DD_SOCIAL_AUTH_GOOGLE_OAUTH2_ENABLED")
 SOCIAL_AUTH_GOOGLE_OAUTH2_KEY = env("DD_SOCIAL_AUTH_GOOGLE_OAUTH2_KEY")
 SOCIAL_AUTH_GOOGLE_OAUTH2_SECRET = env("DD_SOCIAL_AUTH_GOOGLE_OAUTH2_SECRET")
-SOCIAL_AUTH_GOOGLE_OAUTH2_WHITELISTED_DOMAINS = env("DD_SOCIAL_AUTH_GOOGLE_OAUTH2_WHITELISTED_DOMAINS")
-SOCIAL_AUTH_GOOGLE_OAUTH2_WHITELISTED_EMAILS = env("DD_SOCIAL_AUTH_GOOGLE_OAUTH2_WHITELISTED_EMAILS")
+SOCIAL_AUTH_GOOGLE_OAUTH2_WHITELISTED_DOMAINS = tuple(env.list("DD_SOCIAL_AUTH_GOOGLE_OAUTH2_WHITELISTED_DOMAINS", default=[""]))
+SOCIAL_AUTH_GOOGLE_OAUTH2_WHITELISTED_EMAILS = tuple(env.list("DD_SOCIAL_AUTH_GOOGLE_OAUTH2_WHITELISTED_EMAILS", default=[""]))
 SOCIAL_AUTH_LOGIN_ERROR_URL = "/login"
 SOCIAL_AUTH_BACKEND_ERROR_URL = "/login"
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		1b1f0b7210b79790c2bf1a3fdb62e24521544600bb4b460ed6a15cfd26f68640
		21dbb927fc11808947edca13dc908fc7fc2b905563e50e6af7a18ca6deb75dd9