Skip to content
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

[oauth2] export tests again #1212

Merged
merged 1 commit into from
Dec 12, 2018
+106 −69
Merged

[oauth2] export tests again #1212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
114 changes: 85 additions & 29 deletions oauth2/fosite_store_helpers_test.go → oauth2/fosite_store_helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,11 @@
* @license Apache-2.0
*/

package oauth2_test
package oauth2

import (
"context"
"fmt"
"net/url"
"testing"
"time"
Expand All @@ -36,7 +37,7 @@ import (
"github.com/ory/herodot"
"github.com/ory/hydra/client"
"github.com/ory/hydra/consent"
. "github.com/ory/hydra/oauth2"
"github.com/ory/hydra/pkg"
"github.com/ory/x/sqlcon"
)

Expand All @@ -52,28 +53,83 @@ var defaultRequest = fosite.Request{
Session: &Session{DefaultSession: &openid.DefaultSession{Subject: "bar"}},
}

func mockRequestForeignKey(t *testing.T, id string, x managerTestSetup, createClient bool) {
var lifespan = time.Hour
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I had to copy theses out since they're originally found in a _test.go file here: https://github.com/ory/hydra/blob/master/oauth2/handler_test.go#L55

var flushRequests = []*fosite.Request{
{
ID: "flush-1",
RequestedAt: time.Now().Round(time.Second),
Client: &client.Client{ClientID: "foobar"},
RequestedScope: fosite.Arguments{"fa", "ba"},
GrantedScope: fosite.Arguments{"fa", "ba"},
Form: url.Values{"foo": []string{"bar", "baz"}},
Session: &Session{DefaultSession: &openid.DefaultSession{Subject: "bar"}},
},
{
ID: "flush-2",
RequestedAt: time.Now().Round(time.Second).Add(-(lifespan + time.Minute)),
Client: &client.Client{ClientID: "foobar"},
RequestedScope: fosite.Arguments{"fa", "ba"},
GrantedScope: fosite.Arguments{"fa", "ba"},
Form: url.Values{"foo": []string{"bar", "baz"}},
Session: &Session{DefaultSession: &openid.DefaultSession{Subject: "bar"}},
},
{
ID: "flush-3",
RequestedAt: time.Now().Round(time.Second).Add(-(lifespan + time.Hour)),
Client: &client.Client{ClientID: "foobar"},
RequestedScope: fosite.Arguments{"fa", "ba"},
GrantedScope: fosite.Arguments{"fa", "ba"},
Form: url.Values{"foo": []string{"bar", "baz"}},
Session: &Session{DefaultSession: &openid.DefaultSession{Subject: "bar"}},
},
}

func mockRequestForeignKey(t *testing.T, id string, x ManagerTestSetup, createClient bool) {
cl := &client.Client{ClientID: "foobar"}
cr := &consent.ConsentRequest{
Client: cl, OpenIDConnectContext: new(consent.OpenIDConnectContext), LoginChallenge: id,
Challenge: id, Verifier: id, AuthenticatedAt: time.Now(), RequestedAt: time.Now(),
}

if createClient {
require.NoError(t, x.cl.CreateClient(context.Background(), cl))
require.NoError(t, x.Cl.CreateClient(context.Background(), cl))
}

require.NoError(t, x.co.CreateAuthenticationRequest(context.Background(), &consent.AuthenticationRequest{Client: cl, OpenIDConnectContext: new(consent.OpenIDConnectContext), Challenge: id, Verifier: id, AuthenticatedAt: time.Now(), RequestedAt: time.Now()}))
require.NoError(t, x.co.CreateConsentRequest(context.Background(), cr))
_, err := x.co.HandleConsentRequest(context.Background(), id, &consent.HandledConsentRequest{
require.NoError(t, x.Co.CreateAuthenticationRequest(context.Background(), &consent.AuthenticationRequest{Client: cl, OpenIDConnectContext: new(consent.OpenIDConnectContext), Challenge: id, Verifier: id, AuthenticatedAt: time.Now(), RequestedAt: time.Now()}))
require.NoError(t, x.Co.CreateConsentRequest(context.Background(), cr))
_, err := x.Co.HandleConsentRequest(context.Background(), id, &consent.HandledConsentRequest{
ConsentRequest: cr, Session: new(consent.ConsentRequestSessionData), AuthenticatedAt: time.Now(),
Challenge: id,
RequestedAt: time.Now(),
})
require.NoError(t, err)
}

func testHelperUniqueConstraints(m managerTestSetup, storageType string) func(t *testing.T) {
// KEEP EXPORTED AND AVAILABLE FOR THIRD PARTIES TO TEST PLUGINS!
type ManagerTestSetup struct {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I didn't bother properly naming the exported fields although I could if desired

F pkg.FositeStorer
Cl client.Manager
Co consent.Manager
}

// TestHelperRunner is used to run the database suite of tests in this package.
// KEEP EXPORTED AND AVAILABLE FOR THIRD PARTIES TO TEST PLUGINS!
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Perfect :D

func TestHelperRunner(t *testing.T, store ManagerTestSetup, k string) {
t.Helper()
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Marked this function as a Helper since its function name would be useless in any stack output when running tests.

if k != "memory" {
t.Run(fmt.Sprintf("case=testHelperCreateGetDeleteAuthorizeCodes/db=%s", k), testHelperUniqueConstraints(store, k))
}
t.Run(fmt.Sprintf("case=testHelperCreateGetDeleteAuthorizeCodes/db=%s", k), testHelperCreateGetDeleteAuthorizeCodes(store))
t.Run(fmt.Sprintf("case=testHelperCreateGetDeleteAccessTokenSession/db=%s", k), testHelperCreateGetDeleteAccessTokenSession(store))
t.Run(fmt.Sprintf("case=testHelperNilAccessToken/db=%s", k), testHelperNilAccessToken(store))
t.Run(fmt.Sprintf("case=testHelperCreateGetDeleteOpenIDConnectSession/db=%s", k), testHelperCreateGetDeleteOpenIDConnectSession(store))
t.Run(fmt.Sprintf("case=testHelperCreateGetDeleteRefreshTokenSession/db=%s", k), testHelperCreateGetDeleteRefreshTokenSession(store))
t.Run(fmt.Sprintf("case=testHelperRevokeRefreshToken/db=%s", k), testHelperRevokeRefreshToken(store))
t.Run(fmt.Sprintf("case=testHelperCreateGetDeletePKCERequestSession/db=%s", k), testHelperCreateGetDeletePKCERequestSession(store))
t.Run(fmt.Sprintf("case=testHelperFlushTokens/db=%s", k), testHelperFlushTokens(store, time.Hour))
}

func testHelperUniqueConstraints(m ManagerTestSetup, storageType string) func(t *testing.T) {
return func(t *testing.T) {
dbErrorIsConstraintError := func(dbErr error) {
assert.Error(t, dbErr)
Expand All @@ -98,24 +154,24 @@ func testHelperUniqueConstraints(m managerTestSetup, storageType string) func(t
Session: &Session{},
}

err := m.f.CreateRefreshTokenSession(context.TODO(), signatureOne, fositeRequest)
err := m.F.CreateRefreshTokenSession(context.TODO(), signatureOne, fositeRequest)
assert.NoError(t, err)
err = m.f.CreateAccessTokenSession(context.TODO(), signatureOne, fositeRequest)
err = m.F.CreateAccessTokenSession(context.TODO(), signatureOne, fositeRequest)
assert.NoError(t, err)

// attempting to insert new records with the SAME requestID should fail as there is a unique index
// on the request_id column

err = m.f.CreateRefreshTokenSession(context.TODO(), signatureTwo, fositeRequest)
err = m.F.CreateRefreshTokenSession(context.TODO(), signatureTwo, fositeRequest)
dbErrorIsConstraintError(err)
err = m.f.CreateAccessTokenSession(context.TODO(), signatureTwo, fositeRequest)
err = m.F.CreateAccessTokenSession(context.TODO(), signatureTwo, fositeRequest)
dbErrorIsConstraintError(err)
}
}

func testHelperCreateGetDeleteOpenIDConnectSession(x managerTestSetup) func(t *testing.T) {
func testHelperCreateGetDeleteOpenIDConnectSession(x ManagerTestSetup) func(t *testing.T) {
return func(t *testing.T) {
m := x.f
m := x.F

ctx := context.Background()
_, err := m.GetOpenIDConnectSession(ctx, "4321", &fosite.Request{})
Expand All @@ -136,9 +192,9 @@ func testHelperCreateGetDeleteOpenIDConnectSession(x managerTestSetup) func(t *t
}
}

func testHelperCreateGetDeleteRefreshTokenSession(x managerTestSetup) func(t *testing.T) {
func testHelperCreateGetDeleteRefreshTokenSession(x ManagerTestSetup) func(t *testing.T) {
return func(t *testing.T) {
m := x.f
m := x.F

ctx := context.Background()
_, err := m.GetRefreshTokenSession(ctx, "4321", &Session{})
Expand All @@ -159,9 +215,9 @@ func testHelperCreateGetDeleteRefreshTokenSession(x managerTestSetup) func(t *te
}
}

func testHelperRevokeRefreshToken(x managerTestSetup) func(t *testing.T) {
func testHelperRevokeRefreshToken(x ManagerTestSetup) func(t *testing.T) {
return func(t *testing.T) {
m := x.f
m := x.F

ctx := context.Background()
_, err := m.GetRefreshTokenSession(ctx, "1111", &Session{})
Expand Down Expand Up @@ -197,9 +253,9 @@ func testHelperRevokeRefreshToken(x managerTestSetup) func(t *testing.T) {
}
}

func testHelperCreateGetDeleteAuthorizeCodes(x managerTestSetup) func(t *testing.T) {
func testHelperCreateGetDeleteAuthorizeCodes(x ManagerTestSetup) func(t *testing.T) {
return func(t *testing.T) {
m := x.f
m := x.F

mockRequestForeignKey(t, "blank", x, false)

Expand All @@ -225,11 +281,11 @@ func testHelperCreateGetDeleteAuthorizeCodes(x managerTestSetup) func(t *testing
}
}

func testHelperNilAccessToken(x managerTestSetup) func(t *testing.T) {
func testHelperNilAccessToken(x ManagerTestSetup) func(t *testing.T) {
return func(t *testing.T) {
m := x.f
m := x.F
c := &client.Client{ClientID: "nil-request-client-id-123"}
require.NoError(t, x.cl.CreateClient(context.Background(), c))
require.NoError(t, x.Cl.CreateClient(context.Background(), c))
err := m.CreateAccessTokenSession(context.TODO(), "nil-request-id", &fosite.Request{
ID: "",
RequestedAt: time.Now().UTC().Round(time.Second),
Expand All @@ -245,9 +301,9 @@ func testHelperNilAccessToken(x managerTestSetup) func(t *testing.T) {
}
}

func testHelperCreateGetDeleteAccessTokenSession(x managerTestSetup) func(t *testing.T) {
func testHelperCreateGetDeleteAccessTokenSession(x ManagerTestSetup) func(t *testing.T) {
return func(t *testing.T) {
m := x.f
m := x.F

ctx := context.Background()
_, err := m.GetAccessTokenSession(ctx, "4321", &Session{})
Expand All @@ -268,9 +324,9 @@ func testHelperCreateGetDeleteAccessTokenSession(x managerTestSetup) func(t *tes
}
}

func testHelperCreateGetDeletePKCERequestSession(x managerTestSetup) func(t *testing.T) {
func testHelperCreateGetDeletePKCERequestSession(x ManagerTestSetup) func(t *testing.T) {
return func(t *testing.T) {
m := x.f
m := x.F

ctx := context.Background()
_, err := m.GetPKCERequestSession(ctx, "4321", &Session{})
Expand All @@ -291,8 +347,8 @@ func testHelperCreateGetDeletePKCERequestSession(x managerTestSetup) func(t *tes
}
}

func testHelperFlushTokens(x managerTestSetup, lifespan time.Duration) func(t *testing.T) {
m := x.f
func testHelperFlushTokens(x ManagerTestSetup, lifespan time.Duration) func(t *testing.T) {
m := x.F
ds := &Session{}

return func(t *testing.T) {
Expand Down
47 changes: 14 additions & 33 deletions oauth2/fosite_store_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ package oauth2_test

import (
"flag"
"fmt"
"sync"
"testing"
"time"
Expand All @@ -37,17 +36,10 @@ import (
"github.com/ory/hydra/client"
"github.com/ory/hydra/consent"
. "github.com/ory/hydra/oauth2"
"github.com/ory/hydra/pkg"
"github.com/ory/x/sqlcon/dockertest"
)

type managerTestSetup struct {
f pkg.FositeStorer
cl client.Manager
co consent.Manager
}

var fositeStores = map[string]managerTestSetup{}
var fositeStores = map[string]ManagerTestSetup{}
var clientManager = &client.MemoryManager{
Clients: []client.Client{{ClientID: "foobar"}},
Hasher: &fosite.BCrypt{},
Expand All @@ -57,13 +49,12 @@ var databases = make(map[string]*sqlx.DB)
var m sync.Mutex

func init() {
fositeStores["memory"] = managerTestSetup{
f: fm,
cl: clientManager,
co: consent.NewMemoryManager(fm),
fositeStores["memory"] = ManagerTestSetup{
F: fm,
Cl: clientManager,
Co: consent.NewMemoryManager(fm),
}
}

func TestMain(m *testing.M) {
flag.Parse()
runner := dockertest.Register()
Expand Down Expand Up @@ -91,10 +82,10 @@ func connectToPG(t *testing.T) {

m.Lock()
databases["postgres"] = db
fositeStores["postgres"] = managerTestSetup{
f: s,
co: cm,
cl: c,
fositeStores["postgres"] = ManagerTestSetup{
F: s,
Co: cm,
Cl: c,
}
m.Unlock()
}
Expand All @@ -120,10 +111,10 @@ func connectToMySQL(t *testing.T) {

m.Lock()
databases["mysql"] = db
fositeStores["mysql"] = managerTestSetup{
f: s,
co: cm,
cl: c,
fositeStores["mysql"] = ManagerTestSetup{
F: s,
Co: cm,
Cl: c,
}
m.Unlock()
}
Expand All @@ -141,17 +132,7 @@ func TestManagers(t *testing.T) {
}

for k, store := range fositeStores {
if k != "memory" {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Moved these to the exported package to make it easier to track changes to tests.

t.Run(fmt.Sprintf("case=testHelperCreateGetDeleteAuthorizeCodes/db=%s", k), testHelperUniqueConstraints(store, k))
}
t.Run(fmt.Sprintf("case=testHelperCreateGetDeleteAuthorizeCodes/db=%s", k), testHelperCreateGetDeleteAuthorizeCodes(store))
t.Run(fmt.Sprintf("case=testHelperCreateGetDeleteAccessTokenSession/db=%s", k), testHelperCreateGetDeleteAccessTokenSession(store))
t.Run(fmt.Sprintf("case=testHelperNilAccessToken/db=%s", k), testHelperNilAccessToken(store))
t.Run(fmt.Sprintf("case=testHelperCreateGetDeleteOpenIDConnectSession/db=%s", k), testHelperCreateGetDeleteOpenIDConnectSession(store))
t.Run(fmt.Sprintf("case=testHelperCreateGetDeleteRefreshTokenSession/db=%s", k), testHelperCreateGetDeleteRefreshTokenSession(store))
t.Run(fmt.Sprintf("case=testHelperRevokeRefreshToken/db=%s", k), testHelperRevokeRefreshToken(store))
t.Run(fmt.Sprintf("case=testHelperCreateGetDeletePKCERequestSession/db=%s", k), testHelperCreateGetDeletePKCERequestSession(store))
t.Run(fmt.Sprintf("case=testHelperFlushTokens/db=%s", k), testHelperFlushTokens(store, time.Hour))
TestHelperRunner(t, store, k)
}

for _, m := range databases {
Expand Down
14 changes: 7 additions & 7 deletions oauth2/oauth2_auth_code_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,22 +103,22 @@ func TestAuthCodeWithDefaultStrategy(t *testing.T) {
var cm consent.Manager
switch km {
case "memory":
cm = consent.NewMemoryManager(fs.f)
fs.f.(*FositeMemoryStore).Manager = hc.NewMemoryManager(hasher)
cm = consent.NewMemoryManager(fs.F)
fs.F.(*FositeMemoryStore).Manager = hc.NewMemoryManager(hasher)
case "mysql":
fallthrough
case "postgres":
db := databases[km]
cleanDB(t, db)

_, err := fs.cl.(*client.SQLManager).CreateSchemas()
_, err := fs.Cl.(*client.SQLManager).CreateSchemas()
require.NoError(t, err)

scm := consent.NewSQLManager(databases[km], fs.cl, fs.f)
scm := consent.NewSQLManager(databases[km], fs.Cl, fs.F)
_, err = scm.CreateSchemas()
require.NoError(t, err)

_, err = (fs.f.(*FositeSQLStore)).CreateSchemas()
_, err = (fs.F.(*FositeSQLStore)).CreateSchemas()
require.NoError(t, err)

cm = scm
Expand Down Expand Up @@ -184,7 +184,7 @@ func TestAuthCodeWithDefaultStrategy(t *testing.T) {
fc.AccessTokenLifespan = time.Second * 8
handler := &Handler{
OAuth2: compose.Compose(
fc, fs.f, strat.s, hasher,
fc, fs.F, strat.s, hasher,
compose.OAuth2AuthorizeExplicitFactory,
compose.OAuth2AuthorizeImplicitFactory,
compose.OAuth2ClientCredentialsGrantFactory,
Expand Down Expand Up @@ -225,7 +225,7 @@ func TestAuthCodeWithDefaultStrategy(t *testing.T) {
RedirectURL: client.RedirectURIs[0], Scopes: []string{"hydra", "offline", "openid"},
}

require.NoError(t, fs.f.(clientCreator).CreateClient(context.TODO(), &client))
require.NoError(t, fs.F.(clientCreator).CreateClient(context.TODO(), &client))
apiClient := swagger.NewAdminApiWithBasePath(api.URL)

var callbackHandler *httprouter.Handle
Expand Down