mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-06-22 06:49:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

go where no man has gone before ...

Browse Source 
Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>
This commit is contained in:
Jörn Friedrich Dreyer
2020-06-19 14:48:36 +02:00
parent 823832ff8f
commit 39508bd7b6
2 changed files with 14 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/middleware/openidconnect.go
View File

@@ -6,6 +6,7 @@ import (
"net/http"
"strings"
"github.com/coreos/go-oidc"
ocisoidc "github.com/owncloud/ocis-pkg/v2/oidc"
"github.com/owncloud/ocis-proxy/pkg/cache"
"golang.org/x/oauth2"
@@ -23,12 +24,7 @@ var (
// OIDCProvider used to mock the oidc provider during tests
type OIDCProvider interface {
UserInfo(ctx context.Context, ts oauth2.TokenSource) (OIDCUserInfo, error)
}
// OIDCUserInfo used to mock the oidc user info during tests
type OIDCUserInfo interface {
Claims(v interface{}) error
UserInfo(ctx context.Context, ts oauth2.TokenSource) (*oidc.UserInfo, error)
}
// OpenIDConnect provides a middleware to check access secured by a static token.

50
pkg/middleware/openidconnect_test.go
View File

@@ -7,6 +7,7 @@ import (
"net/http/httptest"
"testing"
"github.com/coreos/go-oidc"
"github.com/micro/go-micro/v2/client"
"github.com/owncloud/ocis-accounts/pkg/proto/v0"
"github.com/owncloud/ocis-pkg/v2/log"
@@ -20,7 +21,7 @@ func TestOpenIDConnectMiddleware(t *testing.T) {
m := OpenIDConnect(
Logger(log.NewLogger()),
OIDCProviderFunc(func() (OIDCProvider, error) {
return mockOP(false, mockUI(false)), nil
return mockOP(false), nil
}),
)(next)
@@ -29,17 +30,17 @@ func TestOpenIDConnectMiddleware(t *testing.T) {
w := httptest.NewRecorder()
m.ServeHTTP(w, r)
if r.Header.Get("x-access-token") == "" {
t.Errorf("expected a token")
if w.Code != http.StatusInternalServerError {
t.Errorf("expected an internal server error")
}
}
type mockOIDCProvider struct {
UserInfoFunc func(ctx context.Context, ts oauth2.TokenSource) (OIDCUserInfo, error)
UserInfoFunc func(ctx context.Context, ts oauth2.TokenSource) (*oidc.UserInfo, error)
}
// UserInfo will panic if the function has been called, but not mocked
func (m mockOIDCProvider) UserInfo(ctx context.Context, ts oauth2.TokenSource) (OIDCUserInfo, error) {
func (m mockOIDCProvider) UserInfo(ctx context.Context, ts oauth2.TokenSource) (*oidc.UserInfo, error) {
if m.UserInfoFunc != nil {
return m.UserInfoFunc(ctx, ts)
}
@@ -47,53 +48,26 @@ func (m mockOIDCProvider) UserInfo(ctx context.Context, ts oauth2.TokenSource) (
panic("UserInfo was called in test but not mocked")
}
func mockOP(retErr bool, ui OIDCUserInfo) OIDCProvider {
func mockOP(retErr bool) OIDCProvider {
if retErr {
return &mockOIDCProvider{
UserInfoFunc: func(ctx context.Context, ts oauth2.TokenSource) (OIDCUserInfo, error) {
UserInfoFunc: func(ctx context.Context, ts oauth2.TokenSource) (*oidc.UserInfo, error) {
return nil, fmt.Errorf("error returned by mockOIDCProvider UserInfo")
},
}
}
return &mockOIDCProvider{
UserInfoFunc: func(ctx context.Context, ts oauth2.TokenSource) (OIDCUserInfo, error) {
UserInfoFunc: func(ctx context.Context, ts oauth2.TokenSource) (*oidc.UserInfo, error) {
ui := &oidc.UserInfo{
// claims: private ...
}
return ui, nil
},
}
}
type mockOIDCUserInfo struct {
ClaimsFunc func(v interface{}) error
}
// UserInfo will panic if the function has been called, but not mocked
func (m mockOIDCUserInfo) Claims(v interface{}) error {
if m.ClaimsFunc != nil {
return m.ClaimsFunc(v)
}
panic("ClaimsFunc was called in test but not mocked")
}
func mockUI(retErr bool) OIDCUserInfo {
if retErr {
return &mockOIDCUserInfo{
ClaimsFunc: func(v interface{}) error {
return fmt.Errorf("error returned by mockOIDCProvider UserInfo")
},
}
}
return &mockOIDCUserInfo{
ClaimsFunc: func(v interface{}) error {
// TODO fill in claims
return nil
},
}
}
func mockOpenidConnectMiddlewareAccSvc(retErr bool) proto.AccountsService {
if retErr {
return &proto.MockAccountsService{