mirror of
https://github.com/andwati/zitadel.git
synced 2026-11-15 18:25:13 +00:00
# Which Problems Are Solved This PR extends `StartIdentityProviderIntent` and `RetrieveIdentityProviderIntent` for the new Zitadel provider. # How the Problems Are Solved - Added `domain.IDPTypeZitadel` cases to both the instance and org switches in `NewAllIDPWriteModel` to return Zitadel provider when `GetProvider` is called - Added Zitadel provider to RetrieveIdentityProviderIntent's provider type-switch - Added new `zitadel.go` provider, an OIDC wrapper with forced PKCE - Added unit/integration tests # Additional Changes # Additional Context - Closes https://github.com/zitadel/zitadel/issues/12050 --------- Co-authored-by: Copilot Autofix powered by AI <[email protected]>
263 lines
6.9 KiB
Go
263 lines
6.9 KiB
Go
package zitadel
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
"errors"
|
|
"net/http"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/h2non/gock"
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
"github.com/zitadel/oidc/v3/pkg/client/rp"
|
|
openid "github.com/zitadel/oidc/v3/pkg/oidc"
|
|
"golang.org/x/oauth2"
|
|
"golang.org/x/text/language"
|
|
|
|
"github.com/zitadel/zitadel/internal/domain"
|
|
"github.com/zitadel/zitadel/internal/idp/providers/oidc"
|
|
)
|
|
|
|
func TestSession_FetchUser(t *testing.T) {
|
|
type fields struct {
|
|
httpMock func()
|
|
authURL string
|
|
code string
|
|
tokens *openid.Tokens[*openid.IDTokenClaims]
|
|
}
|
|
type want struct {
|
|
err error
|
|
id string
|
|
firstName string
|
|
lastName string
|
|
displayName string
|
|
nickName string
|
|
preferredUsername string
|
|
email string
|
|
isEmailVerified bool
|
|
phone string
|
|
isPhoneVerified bool
|
|
preferredLanguage language.Tag
|
|
rawClaims map[string]any
|
|
}
|
|
const rolesClaim = "urn:zitadel:iam:org:project:roles"
|
|
projectRoles := map[string]any{
|
|
"admin": map[string]any{"orgID": "orgDomain"},
|
|
"viewer": map[string]any{"orgID": "orgDomain"},
|
|
}
|
|
tests := []struct {
|
|
name string
|
|
fields fields
|
|
want want
|
|
}{
|
|
{
|
|
name: "unauthenticated session, error",
|
|
fields: fields{
|
|
httpMock: func() {
|
|
discoveryMock(issuer)
|
|
},
|
|
authURL: issuer + "/authorize?client_id=clientID&redirect_uri=redirectURI&response_type=code&scope=openid&state=testState",
|
|
tokens: nil,
|
|
},
|
|
want: want{
|
|
err: oidc.ErrCodeMissing,
|
|
},
|
|
},
|
|
{
|
|
name: "userinfo error, subject not matching",
|
|
fields: fields{
|
|
httpMock: func() {
|
|
discoveryMock(issuer)
|
|
gock.New(issuer).
|
|
Get("/userinfo").
|
|
Reply(200).
|
|
JSON(userinfo())
|
|
},
|
|
authURL: issuer + "/authorize?client_id=clientID&redirect_uri=redirectURI&response_type=code&scope=openid&state=testState",
|
|
tokens: &openid.Tokens[*openid.IDTokenClaims]{
|
|
Token: &oauth2.Token{
|
|
AccessToken: "accessToken",
|
|
TokenType: openid.BearerToken,
|
|
},
|
|
IDTokenClaims: openid.NewIDTokenClaims(
|
|
issuer,
|
|
"sub2",
|
|
[]string{"clientID"},
|
|
time.Now().Add(1*time.Hour),
|
|
time.Now().Add(-1*time.Second),
|
|
"nonce",
|
|
"",
|
|
nil,
|
|
"clientID",
|
|
0,
|
|
),
|
|
},
|
|
},
|
|
want: want{
|
|
err: rp.ErrUserInfoSubNotMatching,
|
|
},
|
|
},
|
|
{
|
|
name: "successful fetch",
|
|
fields: fields{
|
|
httpMock: func() {
|
|
discoveryMock(issuer)
|
|
gock.New(issuer).
|
|
Get("/userinfo").
|
|
Reply(200).
|
|
JSON(userinfo())
|
|
},
|
|
authURL: issuer + "/authorize?client_id=clientID&redirect_uri=redirectURI&response_type=code&scope=openid&state=testState",
|
|
tokens: &openid.Tokens[*openid.IDTokenClaims]{
|
|
Token: &oauth2.Token{
|
|
AccessToken: "accessToken",
|
|
TokenType: openid.BearerToken,
|
|
},
|
|
IDTokenClaims: openid.NewIDTokenClaims(
|
|
issuer,
|
|
"sub",
|
|
[]string{"clientID"},
|
|
time.Now().Add(1*time.Hour),
|
|
time.Now().Add(-1*time.Second),
|
|
"nonce",
|
|
"",
|
|
nil,
|
|
"clientID",
|
|
0,
|
|
),
|
|
},
|
|
},
|
|
want: want{
|
|
id: "sub",
|
|
firstName: "firstname",
|
|
lastName: "lastname",
|
|
displayName: "firstname lastname",
|
|
nickName: "nickname",
|
|
preferredUsername: "username",
|
|
email: "email",
|
|
isEmailVerified: true,
|
|
phone: "phone",
|
|
isPhoneVerified: true,
|
|
preferredLanguage: language.English,
|
|
},
|
|
},
|
|
{
|
|
name: "successful fetch with project roles",
|
|
fields: fields{
|
|
httpMock: func() {
|
|
discoveryMock(issuer)
|
|
info := userinfo()
|
|
info.AppendClaims(rolesClaim, projectRoles)
|
|
gock.New(issuer).
|
|
Get("/userinfo").
|
|
Reply(200).
|
|
JSON(info)
|
|
},
|
|
authURL: issuer + "/authorize?client_id=clientID&redirect_uri=redirectURI&response_type=code&scope=openid&state=testState",
|
|
tokens: &openid.Tokens[*openid.IDTokenClaims]{
|
|
Token: &oauth2.Token{
|
|
AccessToken: "accessToken",
|
|
TokenType: openid.BearerToken,
|
|
},
|
|
IDTokenClaims: openid.NewIDTokenClaims(
|
|
issuer,
|
|
"sub",
|
|
[]string{"clientID"},
|
|
time.Now().Add(1*time.Hour),
|
|
time.Now().Add(-1*time.Second),
|
|
"nonce",
|
|
"",
|
|
nil,
|
|
"clientID",
|
|
0,
|
|
),
|
|
},
|
|
},
|
|
want: want{
|
|
id: "sub",
|
|
firstName: "firstname",
|
|
lastName: "lastname",
|
|
displayName: "firstname lastname",
|
|
nickName: "nickname",
|
|
preferredUsername: "username",
|
|
email: "email",
|
|
isEmailVerified: true,
|
|
phone: "phone",
|
|
isPhoneVerified: true,
|
|
preferredLanguage: language.English,
|
|
rawClaims: map[string]any{rolesClaim: projectRoles},
|
|
},
|
|
},
|
|
}
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
defer gock.Off()
|
|
tt.fields.httpMock()
|
|
a := assert.New(t)
|
|
|
|
provider, err := New(issuer, "clientID", "clientSecret", "redirectURI", []string{"openid"}, http.DefaultClient)
|
|
require.NoError(t, err)
|
|
|
|
session := &oidc.Session{
|
|
Provider: provider.Provider,
|
|
AuthURL: tt.fields.authURL,
|
|
Code: tt.fields.code,
|
|
Tokens: tt.fields.tokens,
|
|
}
|
|
|
|
user, err := session.FetchUser(context.Background())
|
|
if tt.want.err != nil && !errors.Is(err, tt.want.err) {
|
|
a.Fail("invalid error", "expected %v, got %v", tt.want.err, err)
|
|
}
|
|
if tt.want.err == nil {
|
|
a.NoError(err)
|
|
a.Equal(tt.want.id, user.GetID())
|
|
a.Equal(tt.want.firstName, user.GetFirstName())
|
|
a.Equal(tt.want.lastName, user.GetLastName())
|
|
a.Equal(tt.want.displayName, user.GetDisplayName())
|
|
a.Equal(tt.want.nickName, user.GetNickname())
|
|
a.Equal(tt.want.preferredUsername, user.GetPreferredUsername())
|
|
a.Equal(domain.EmailAddress(tt.want.email), user.GetEmail())
|
|
a.Equal(tt.want.isEmailVerified, user.IsEmailVerified())
|
|
a.Equal(domain.PhoneNumber(tt.want.phone), user.GetPhone())
|
|
a.Equal(tt.want.isPhoneVerified, user.IsPhoneVerified())
|
|
a.Equal(tt.want.preferredLanguage, user.GetPreferredLanguage())
|
|
|
|
if tt.want.rawClaims != nil {
|
|
idpInfo, err := json.Marshal(user)
|
|
require.NoError(t, err)
|
|
var rawInfo map[string]any
|
|
require.NoError(t, json.Unmarshal(idpInfo, &rawInfo))
|
|
for claim, value := range tt.want.rawClaims {
|
|
a.Equal(value, rawInfo[claim])
|
|
}
|
|
}
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
func userinfo() *openid.UserInfo {
|
|
return &openid.UserInfo{
|
|
Subject: "sub",
|
|
UserInfoProfile: openid.UserInfoProfile{
|
|
GivenName: "firstname",
|
|
FamilyName: "lastname",
|
|
Name: "firstname lastname",
|
|
Nickname: "nickname",
|
|
PreferredUsername: "username",
|
|
Locale: openid.NewLocale(language.English),
|
|
},
|
|
UserInfoEmail: openid.UserInfoEmail{
|
|
Email: "email",
|
|
EmailVerified: openid.Bool(true),
|
|
},
|
|
UserInfoPhone: openid.UserInfoPhone{
|
|
PhoneNumber: "phone",
|
|
PhoneNumberVerified: true,
|
|
},
|
|
}
|
|
}
|