Skip to content

feat: Allow multiple OIDC domains #5210

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
merged 12 commits into from
Dec 5, 2022
Merged

feat: Allow multiple OIDC domains #5210

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
77bda0c
feat: allow multiple oidc domains using comma delimmited list
Dec 1, 2022
865710a
feat: update to plural and lowercase domain
Dec 1, 2022
d0b5240
fix: plural
Dec 1, 2022
456c6f3
feat: update to greater
Dec 1, 2022
31409cd
fix: update test
Dec 1, 2022
ba579fe
fix: update golden files
Dec 1, 2022
96278c6
fix: plural email domains
Dec 1, 2022
db05d72
feat: add sample multiple domains
Dec 1, 2022
ff6f16d
fix: plural
Dec 1, 2022
9c67a5c
revert from plural
Dec 2, 2022
193c000
revert plural
Dec 2, 2022
f65ce98
Update coderd/userauth.go
mafredri Dec 2, 2022
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
Prev Previous commit
Next Next commit
revert from plural
  • Loading branch information
Daniel Carrion committed Dec 2, 2022
commit 9c67a5c1004f7281049afde353c8945a76942b3c
4 changes: 2 additions & 2 deletions cli/deployment/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,9 +216,9 @@ func newConfig() *codersdk.DeploymentConfig {
Secret: true,
},
EmailDomains: &codersdk.DeploymentConfigField[[]string]{
Name: "OIDC Email Domains",
Name: "OIDC Email Domain",
Usage: "Email domains that clients logging in with OIDC must match.",
Flag: "oidc-email-domains",
Flag: "oidc-email-domain",
},
IssuerURL: &codersdk.DeploymentConfigField[string]{
Name: "OIDC Issuer URL",
Expand Down
2 changes: 1 addition & 1 deletion cli/deployment/config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ func TestConfig(t *testing.T) {
Name: "OIDC",
Env: map[string]string{
"CODER_OIDC_ISSUER_URL": "https://accounts.google.com",
"CODER_OIDC_EMAIL_DOMAINS": "coder.com",
"CODER_OIDC_EMAIL_DOMAIN": "coder.com",
"CODER_OIDC_CLIENT_ID": "client",
"CODER_OIDC_CLIENT_SECRET": "secret",
"CODER_OIDC_ALLOW_SIGNUPS": "false",
Expand Down
2 changes: 1 addition & 1 deletion cli/testdata/coder_server_--help.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ Flags:
Consumes $CODER_OIDC_CLIENT_ID
--oidc-client-secret string Client secret to use for Login with OIDC.
Consumes $CODER_OIDC_CLIENT_SECRET
--oidc-email-domains strings Email domains that clients logging in
--oidc-email-domain strings Email domains that clients logging in
with OIDC must match.
Consumes $CODER_OIDC_EMAIL_DOMAINS
--oidc-ignore-email-verified Ignore the email_verified claim from the
Expand Down
2 changes: 1 addition & 1 deletion docs/admin/auth.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ to the `/etc/coder.d/coder.env` file:

```console
CODER_OIDC_ISSUER_URL="https://accounts.google.com"
CODER_OIDC_EMAIL_DOMAINS="your-domain-1,your-domain-2"
CODER_OIDC_EMAIL_DOMAIN="your-domain-1,your-domain-2"
CODER_OIDC_CLIENT_ID="533...ent.com"
CODER_OIDC_CLIENT_SECRET="G0CSP...7qSM"
```
Expand Down