Skip to content

feat: Add OIDC authentication #3314

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
Aug 1, 2022
Merged

feat: Add OIDC authentication #3314

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
50ee7ad
feat: Add OIDC authentication
kylecarbs Jul 29, 2022
7eb897a
Extract username into a separate package and add OIDC tests
kylecarbs Jul 31, 2022
424579e
Add test case for invalid tokens
kylecarbs Jul 31, 2022
a49b491
Add test case for username as email
kylecarbs Jul 31, 2022
6eae627
Add OIDC to the frontend
kylecarbs Jul 31, 2022
292d9f6
Merge branch 'main' into oidc
kylecarbs Jul 31, 2022
e6619ff
Improve comments from self-review
kylecarbs Jul 31, 2022
3a20472
Add authentication docs
kylecarbs Jul 31, 2022
5f7176c
Add telemetry
kylecarbs Jul 31, 2022
c2a4481
Update docs/install/auth.md
kylecarbs Jul 31, 2022
4b71655
Update docs/install/auth.md
kylecarbs Jul 31, 2022
7b487be
Remove username package
kylecarbs Aug 1, 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
Add test case for invalid tokens
  • Loading branch information
@kylecarbs
kylecarbs committed Jul 31, 2022
commit 424579edeb27fa781adec1dffdf4af55fb388bb3
14 changes: 0 additions & 14 deletions coderd/userauth.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,6 @@ func (api *API) userAuthMethods(rw http.ResponseWriter, _ *http.Request) {
}

func (api *API) userOAuth2Github(rw http.ResponseWriter, r *http.Request) {
if api.GithubOAuth2Config == nil {
httpapi.Write(rw, http.StatusPreconditionRequired, codersdk.Response{
Message: "GitHub authentication is not enabled!",
})
return
}

state := httpmw.OAuth2(r)

oauthClient := oauth2.NewClient(r.Context(), oauth2.StaticTokenSource(state.Token))
Expand Down Expand Up @@ -227,13 +220,6 @@ type OIDCConfig struct {
}

func (api *API) userOIDC(rw http.ResponseWriter, r *http.Request) {
if api.OIDCConfig == nil {
httpapi.Write(rw, http.StatusPreconditionRequired, codersdk.Response{
Message: "OpenID Connect authentication is not enabled!",
})
return
}

state := httpmw.OAuth2(r)

// See the example here: https://github.com/coreos/go-oidc
Expand Down
40 changes: 40 additions & 0 deletions coderd/userauth_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,6 +340,46 @@ func TestUserOIDC(t *testing.T) {
}
})
}

t.Run("Disabled", func(t *testing.T) {
t.Parallel()
client := coderdtest.New(t, nil)
resp := oidcCallback(t, client)
require.Equal(t, http.StatusPreconditionRequired, resp.StatusCode)
})

t.Run("NoIDToken", func(t *testing.T) {
t.Parallel()
client := coderdtest.New(t, &coderdtest.Options{
OIDCConfig: &coderd.OIDCConfig{
OAuth2Config: &oauth2Config{},
},
})
resp := oidcCallback(t, client)
require.Equal(t, http.StatusBadRequest, resp.StatusCode)
})

t.Run("BadVerify", func(t *testing.T) {
t.Parallel()
verifier := oidc.NewVerifier("", &oidc.StaticKeySet{
PublicKeys: []crypto.PublicKey{},
}, &oidc.Config{})

client := coderdtest.New(t, &coderdtest.Options{
OIDCConfig: &coderd.OIDCConfig{
OAuth2Config: &oauth2Config{
token: (&oauth2.Token{
AccessToken: "token",
}).WithExtra(map[string]interface{}{
"id_token": "invalid",
}),
},
Verifier: verifier,
},
})
resp := oidcCallback(t, client)
require.Equal(t, http.StatusBadRequest, resp.StatusCode)
})
}

// createOIDCConfig generates a new OIDCConfig that returns a static token
Expand Down