From 61598cf8c8a2dbae368f3f8b15393c70d2e4fa9d Mon Sep 17 00:00:00 2001 From: mo khan Date: Wed, 7 May 2025 09:37:04 -0700 Subject: refactor: move test server to oidc package --- pkg/oidc/oidc_test.go | 3 +- pkg/oidc/test_server.go | 87 +++++++++++++++++++++++++++++++++++++++++++++++++ pkg/test/http.go | 68 -------------------------------------- pkg/test/oidc_server.go | 87 ------------------------------------------------- 4 files changed, 88 insertions(+), 157 deletions(-) create mode 100644 pkg/oidc/test_server.go delete mode 100644 pkg/test/http.go delete mode 100644 pkg/test/oidc_server.go (limited to 'pkg') diff --git a/pkg/oidc/oidc_test.go b/pkg/oidc/oidc_test.go index 3318f18..47a58ba 100644 --- a/pkg/oidc/oidc_test.go +++ b/pkg/oidc/oidc_test.go @@ -6,11 +6,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/software-supply-chain-security/authorization/sparkled/pkg/test" ) func TestOpenID(t *testing.T) { - srv := test.NewOIDCServer(t) + srv := NewTestServer(t) defer srv.Close() t.Run("GET /.well-known/openid-configuration", func(t *testing.T) { diff --git a/pkg/oidc/test_server.go b/pkg/oidc/test_server.go new file mode 100644 index 0000000..5a25549 --- /dev/null +++ b/pkg/oidc/test_server.go @@ -0,0 +1,87 @@ +package oidc + +import ( + "net/http" + "strconv" + "testing" + "time" + + "github.com/coreos/go-oidc/v3/oidc" + "github.com/oauth2-proxy/mockoidc" + "github.com/stretchr/testify/require" + "golang.org/x/oauth2" +) + +type TestServer struct { + *mockoidc.MockOIDC + *oauth2.Config + *oidc.Provider + *testing.T +} + +func NewTestServer(t *testing.T) *TestServer { + srv, err := mockoidc.Run() + require.NoError(t, err) + + srv.AddMiddleware(func(next http.Handler) http.Handler { + return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + t.Logf("%v %v %v\n", r.Method, r.URL.Path, r.URL.Query()) + next.ServeHTTP(w, r) + }) + }) + + provider, err := oidc.NewProvider(t.Context(), srv.Issuer()) + require.NoError(t, err) + + config := &oauth2.Config{ + ClientID: srv.Config().ClientID, + ClientSecret: srv.Config().ClientSecret, + RedirectURL: "https://example.com/oauth/callback", + Endpoint: provider.Endpoint(), + Scopes: []string{oidc.ScopeOpenID, "profile", "email"}, + } + + return &TestServer{ + srv, + config, + provider, + t, + } +} + +func (srv *TestServer) CreateAuthorizationCodeFor(user mockoidc.User) string { + code := strconv.FormatInt(time.Now().Unix(), 10) + srv.QueueUser(user) + srv.QueueCode(code) + + http.Get(srv.AuthCodeURL("state")) + + return code +} + +func (srv *TestServer) CreateTokenFor(user mockoidc.User) *oauth2.Token { + code := srv.CreateAuthorizationCodeFor(user) + token, err := srv.Exchange(srv.Context(), code) + require.NoError(srv, err) + return token +} + +func (srv *TestServer) CreateTokensFor(user mockoidc.User) (*oauth2.Token, string) { + token := srv.CreateTokenFor(user) + rawIDToken, ok := token.Extra("id_token").(string) + require.True(srv, ok) + return token, rawIDToken +} + +func (srv *TestServer) Verify(rawIDToken string) *oidc.IDToken { + idToken, err := srv. + Verifier(&oidc.Config{ClientID: srv.MockOIDC.Config().ClientID}). + Verify(srv.Context(), rawIDToken) + require.NoError(srv, err) + + return idToken +} + +func (s *TestServer) Close() { + s.Shutdown() +} diff --git a/pkg/test/http.go b/pkg/test/http.go deleted file mode 100644 index b65ccc9..0000000 --- a/pkg/test/http.go +++ /dev/null @@ -1,68 +0,0 @@ -package test - -import ( - "bytes" - "context" - "io" - "net/http" - "net/http/httptest" - - xcontext "github.com/xlgmokha/x/pkg/context" - "github.com/xlgmokha/x/pkg/serde" - "github.com/xlgmokha/x/pkg/x" -) - -type RequestOption x.Option[*http.Request] - -func Request(method, target string, options ...RequestOption) *http.Request { - request := httptest.NewRequest(method, target, nil) - for _, option := range options { - request = option(request) - } - return request -} - -func RequestResponse(method, target string, options ...RequestOption) (*http.Request, *httptest.ResponseRecorder) { - return Request(method, target, options...), httptest.NewRecorder() -} - -func WithAcceptHeader(value serde.MediaType) RequestOption { - return WithRequestHeader("Accept", string(value)) -} - -func WithRequestHeader(key, value string) RequestOption { - return func(r *http.Request) *http.Request { - r.Header.Set(key, value) - return r - } -} - -func WithContentType[T any](item T, mediaType serde.MediaType) RequestOption { - body := bytes.NewBuffer(nil) - x.Check(serde.To[T](body, item, mediaType)) - return WithRequestBody(io.NopCloser(body)) -} - -func WithRequestBody(body io.ReadCloser) RequestOption { - return func(r *http.Request) *http.Request { - r.Body = body - return r - } -} - -func WithContext(ctx context.Context) RequestOption { - return func(r *http.Request) *http.Request { - return r.WithContext(ctx) - } -} - -func WithContextKeyValue[T any](ctx context.Context, key xcontext.Key[T], item T) RequestOption { - return WithContext(key.With(ctx, item)) -} - -func WithCookie(cookie *http.Cookie) RequestOption { - return func(r *http.Request) *http.Request { - r.AddCookie(cookie) - return r - } -} diff --git a/pkg/test/oidc_server.go b/pkg/test/oidc_server.go deleted file mode 100644 index c635df0..0000000 --- a/pkg/test/oidc_server.go +++ /dev/null @@ -1,87 +0,0 @@ -package test - -import ( - "net/http" - "strconv" - "testing" - "time" - - "github.com/coreos/go-oidc/v3/oidc" - "github.com/oauth2-proxy/mockoidc" - "github.com/stretchr/testify/require" - "golang.org/x/oauth2" -) - -type TestServer struct { - *mockoidc.MockOIDC - *oauth2.Config - *oidc.Provider - *testing.T -} - -func NewOIDCServer(t *testing.T) *TestServer { - srv, err := mockoidc.Run() - require.NoError(t, err) - - srv.AddMiddleware(func(next http.Handler) http.Handler { - return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - t.Logf("%v %v %v\n", r.Method, r.URL.Path, r.URL.Query()) - next.ServeHTTP(w, r) - }) - }) - - provider, err := oidc.NewProvider(t.Context(), srv.Issuer()) - require.NoError(t, err) - - config := &oauth2.Config{ - ClientID: srv.Config().ClientID, - ClientSecret: srv.Config().ClientSecret, - RedirectURL: "https://example.com/oauth/callback", - Endpoint: provider.Endpoint(), - Scopes: []string{oidc.ScopeOpenID, "profile", "email"}, - } - - return &TestServer{ - srv, - config, - provider, - t, - } -} - -func (srv *TestServer) CreateAuthorizationCodeFor(user mockoidc.User) string { - code := strconv.FormatInt(time.Now().Unix(), 10) - srv.QueueUser(user) - srv.QueueCode(code) - - http.Get(srv.AuthCodeURL("state")) - - return code -} - -func (srv *TestServer) CreateTokenFor(user mockoidc.User) *oauth2.Token { - code := srv.CreateAuthorizationCodeFor(user) - token, err := srv.Exchange(srv.Context(), code) - require.NoError(srv, err) - return token -} - -func (srv *TestServer) CreateTokensFor(user mockoidc.User) (*oauth2.Token, string) { - token := srv.CreateTokenFor(user) - rawIDToken, ok := token.Extra("id_token").(string) - require.True(srv, ok) - return token, rawIDToken -} - -func (srv *TestServer) Verify(rawIDToken string) *oidc.IDToken { - idToken, err := srv. - Verifier(&oidc.Config{ClientID: srv.MockOIDC.Config().ClientID}). - Verify(srv.Context(), rawIDToken) - require.NoError(srv, err) - - return idToken -} - -func (s *TestServer) Close() { - s.Shutdown() -} -- cgit v1.2.3