Skip to content

chore: add custom samesite options to auth cookies #16885

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 11 commits into from
Apr 8, 2025
Merged

chore: add custom samesite options to auth cookies #16885

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
9de7ee3
chore: add custom samesite options to auth cookies
Emyrk Mar 11, 2025
4f6e753
fixup! chore: add custom samesite options to auth cookies
Emyrk Mar 12, 2025
8a3b820
chore: fixup tests
Emyrk Mar 13, 2025
77da925
make gen
Emyrk Mar 13, 2025
71965d8
fixup test with incorrect reference
Emyrk Mar 25, 2025
f1b4944
pass in the correct cookie options
Emyrk Apr 1, 2025
23f17ae
make gen
Emyrk Apr 1, 2025
a90eff7
Add unit test to check for secure and samesite cookie flags
Emyrk Apr 1, 2025
654fc1e
compile fix
Emyrk Apr 1, 2025
a9c22a0
update golden files
Emyrk Apr 1, 2025
90758f5
linting
Emyrk Apr 7, 2025
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
pass in the correct cookie options
  • Loading branch information
@Emyrk
Emyrk committed Apr 8, 2025
commit f1b49449defc27f8d2e2c9326b6d76f968bb0256
6 changes: 3 additions & 3 deletions coderd/coderd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -868,7 +868,7 @@ func New(options *Options) *API {
r.Route(fmt.Sprintf("/%s/callback", externalAuthConfig.ID), func(r chi.Router) {
r.Use(
apiKeyMiddlewareRedirect,
httpmw.ExtractOAuth2(externalAuthConfig, options.HTTPClient, codersdk.HTTPCookieConfig{}, nil),
httpmw.ExtractOAuth2(externalAuthConfig, options.HTTPClient, options.Cookies, nil),
)
r.Get("/", api.externalAuthCallback(externalAuthConfig))
})
Expand Down Expand Up @@ -1123,14 +1123,14 @@ func New(options *Options) *API {
r.Get("/github/device", api.userOAuth2GithubDevice)
r.Route("/github", func(r chi.Router) {
r.Use(
httpmw.ExtractOAuth2(options.GithubOAuth2Config, options.HTTPClient, codersdk.HTTPCookieConfig{}, nil),
httpmw.ExtractOAuth2(options.GithubOAuth2Config, options.HTTPClient, options.Cookies, nil),
)
r.Get("/callback", api.userOAuth2Github)
})
})
r.Route("/oidc/callback", func(r chi.Router) {
r.Use(
httpmw.ExtractOAuth2(options.OIDCConfig, options.HTTPClient, codersdk.HTTPCookieConfig{}, oidcAuthURLParams),
httpmw.ExtractOAuth2(options.OIDCConfig, options.HTTPClient, options.Cookies, oidcAuthURLParams),
)
r.Get("/", api.userOIDC)
})
Expand Down