mirror of
https://github.com/zitadel/zitadel.git
synced 2024-12-14 03:54:21 +00:00
19a8ab02ad
# Which Problems Are Solved TOTP remove endpoint available in management API, not in user v2 API. # How the Problems Are Solved Add endpoint RemoveTOTP to user v2 API. # Additional Changes None # Additional Context close #6605 --------- Co-authored-by: Livio Spring <livio.a@gmail.com>
285 lines
6.9 KiB
Go
285 lines
6.9 KiB
Go
//go:build integration
|
|
|
|
package user_test
|
|
|
|
import (
|
|
"context"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/pquerna/otp/totp"
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
"google.golang.org/protobuf/types/known/timestamppb"
|
|
|
|
"github.com/zitadel/zitadel/internal/integration"
|
|
object "github.com/zitadel/zitadel/pkg/grpc/object/v2beta"
|
|
user "github.com/zitadel/zitadel/pkg/grpc/user/v2beta"
|
|
)
|
|
|
|
func TestServer_RegisterTOTP(t *testing.T) {
|
|
userID := Tester.CreateHumanUser(CTX).GetUserId()
|
|
Tester.RegisterUserPasskey(CTX, userID)
|
|
_, sessionToken, _, _ := Tester.CreateVerifiedWebAuthNSession(t, CTX, userID)
|
|
ctx := Tester.WithAuthorizationToken(CTX, sessionToken)
|
|
|
|
otherUser := Tester.CreateHumanUser(CTX).GetUserId()
|
|
Tester.RegisterUserPasskey(CTX, otherUser)
|
|
_, sessionTokenOtherUser, _, _ := Tester.CreateVerifiedWebAuthNSession(t, CTX, otherUser)
|
|
ctxOtherUser := Tester.WithAuthorizationToken(CTX, sessionTokenOtherUser)
|
|
|
|
type args struct {
|
|
ctx context.Context
|
|
req *user.RegisterTOTPRequest
|
|
}
|
|
tests := []struct {
|
|
name string
|
|
args args
|
|
want *user.RegisterTOTPResponse
|
|
wantErr bool
|
|
}{
|
|
{
|
|
name: "missing user id",
|
|
args: args{
|
|
ctx: ctx,
|
|
req: &user.RegisterTOTPRequest{},
|
|
},
|
|
wantErr: true,
|
|
},
|
|
{
|
|
name: "user mismatch",
|
|
args: args{
|
|
ctx: ctxOtherUser,
|
|
req: &user.RegisterTOTPRequest{
|
|
UserId: userID,
|
|
},
|
|
},
|
|
wantErr: true,
|
|
},
|
|
{
|
|
name: "admin",
|
|
args: args{
|
|
ctx: CTX,
|
|
req: &user.RegisterTOTPRequest{
|
|
UserId: userID,
|
|
},
|
|
},
|
|
want: &user.RegisterTOTPResponse{
|
|
Details: &object.Details{
|
|
ChangeDate: timestamppb.Now(),
|
|
ResourceOwner: Tester.Organisation.ID,
|
|
},
|
|
},
|
|
},
|
|
{
|
|
name: "success",
|
|
args: args{
|
|
ctx: ctx,
|
|
req: &user.RegisterTOTPRequest{
|
|
UserId: userID,
|
|
},
|
|
},
|
|
want: &user.RegisterTOTPResponse{
|
|
Details: &object.Details{
|
|
ChangeDate: timestamppb.Now(),
|
|
ResourceOwner: Tester.Organisation.ID,
|
|
},
|
|
},
|
|
},
|
|
}
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
got, err := Client.RegisterTOTP(tt.args.ctx, tt.args.req)
|
|
if tt.wantErr {
|
|
require.Error(t, err)
|
|
return
|
|
}
|
|
require.NoError(t, err)
|
|
require.NotNil(t, got)
|
|
integration.AssertDetails(t, tt.want, got)
|
|
assert.NotEmpty(t, got.GetUri())
|
|
assert.NotEmpty(t, got.GetSecret())
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestServer_VerifyTOTPRegistration(t *testing.T) {
|
|
userID := Tester.CreateHumanUser(CTX).GetUserId()
|
|
Tester.RegisterUserPasskey(CTX, userID)
|
|
_, sessionToken, _, _ := Tester.CreateVerifiedWebAuthNSession(t, CTX, userID)
|
|
ctx := Tester.WithAuthorizationToken(CTX, sessionToken)
|
|
|
|
reg, err := Client.RegisterTOTP(ctx, &user.RegisterTOTPRequest{
|
|
UserId: userID,
|
|
})
|
|
require.NoError(t, err)
|
|
code, err := totp.GenerateCode(reg.Secret, time.Now())
|
|
require.NoError(t, err)
|
|
|
|
otherUser := Tester.CreateHumanUser(CTX).GetUserId()
|
|
Tester.RegisterUserPasskey(CTX, otherUser)
|
|
_, sessionTokenOtherUser, _, _ := Tester.CreateVerifiedWebAuthNSession(t, CTX, otherUser)
|
|
ctxOtherUser := Tester.WithAuthorizationToken(CTX, sessionTokenOtherUser)
|
|
|
|
regOtherUser, err := Client.RegisterTOTP(CTX, &user.RegisterTOTPRequest{
|
|
UserId: otherUser,
|
|
})
|
|
require.NoError(t, err)
|
|
codeOtherUser, err := totp.GenerateCode(regOtherUser.Secret, time.Now())
|
|
require.NoError(t, err)
|
|
|
|
type args struct {
|
|
ctx context.Context
|
|
req *user.VerifyTOTPRegistrationRequest
|
|
}
|
|
tests := []struct {
|
|
name string
|
|
args args
|
|
want *user.VerifyTOTPRegistrationResponse
|
|
wantErr bool
|
|
}{
|
|
{
|
|
name: "user mismatch",
|
|
args: args{
|
|
ctx: ctxOtherUser,
|
|
req: &user.VerifyTOTPRegistrationRequest{
|
|
UserId: userID,
|
|
},
|
|
},
|
|
wantErr: true,
|
|
},
|
|
{
|
|
name: "wrong code",
|
|
args: args{
|
|
ctx: ctx,
|
|
req: &user.VerifyTOTPRegistrationRequest{
|
|
UserId: userID,
|
|
Code: "123",
|
|
},
|
|
},
|
|
wantErr: true,
|
|
},
|
|
{
|
|
name: "success",
|
|
args: args{
|
|
ctx: ctx,
|
|
req: &user.VerifyTOTPRegistrationRequest{
|
|
UserId: userID,
|
|
Code: code,
|
|
},
|
|
},
|
|
want: &user.VerifyTOTPRegistrationResponse{
|
|
Details: &object.Details{
|
|
ChangeDate: timestamppb.Now(),
|
|
ResourceOwner: Tester.Organisation.ResourceOwner,
|
|
},
|
|
},
|
|
},
|
|
{
|
|
name: "success, admin",
|
|
args: args{
|
|
ctx: CTX,
|
|
req: &user.VerifyTOTPRegistrationRequest{
|
|
UserId: otherUser,
|
|
Code: codeOtherUser,
|
|
},
|
|
},
|
|
want: &user.VerifyTOTPRegistrationResponse{
|
|
Details: &object.Details{
|
|
ChangeDate: timestamppb.Now(),
|
|
ResourceOwner: Tester.Organisation.ResourceOwner,
|
|
},
|
|
},
|
|
},
|
|
}
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
got, err := Client.VerifyTOTPRegistration(tt.args.ctx, tt.args.req)
|
|
if tt.wantErr {
|
|
require.Error(t, err)
|
|
return
|
|
}
|
|
require.NoError(t, err)
|
|
require.NotNil(t, got)
|
|
integration.AssertDetails(t, tt.want, got)
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestServer_RemoveTOTP(t *testing.T) {
|
|
userID := Tester.CreateHumanUser(CTX).GetUserId()
|
|
Tester.RegisterUserPasskey(CTX, userID)
|
|
_, sessionToken, _, _ := Tester.CreateVerifiedWebAuthNSession(t, CTX, userID)
|
|
|
|
userVerified := Tester.CreateHumanUser(CTX)
|
|
Tester.RegisterUserPasskey(CTX, userVerified.GetUserId())
|
|
_, sessionTokenVerified, _, _ := Tester.CreateVerifiedWebAuthNSession(t, CTX, userVerified.GetUserId())
|
|
userVerifiedCtx := Tester.WithAuthorizationToken(context.Background(), sessionTokenVerified)
|
|
_, err := Tester.Client.UserV2.VerifyPhone(userVerifiedCtx, &user.VerifyPhoneRequest{
|
|
UserId: userVerified.GetUserId(),
|
|
VerificationCode: userVerified.GetPhoneCode(),
|
|
})
|
|
require.NoError(t, err)
|
|
|
|
regOtherUser, err := Client.RegisterTOTP(CTX, &user.RegisterTOTPRequest{
|
|
UserId: userVerified.GetUserId(),
|
|
})
|
|
require.NoError(t, err)
|
|
codeOtherUser, err := totp.GenerateCode(regOtherUser.Secret, time.Now())
|
|
require.NoError(t, err)
|
|
_, err = Client.VerifyTOTPRegistration(userVerifiedCtx, &user.VerifyTOTPRegistrationRequest{
|
|
UserId: userVerified.GetUserId(),
|
|
Code: codeOtherUser,
|
|
},
|
|
)
|
|
require.NoError(t, err)
|
|
|
|
type args struct {
|
|
ctx context.Context
|
|
req *user.RemoveTOTPRequest
|
|
}
|
|
tests := []struct {
|
|
name string
|
|
args args
|
|
want *user.RemoveTOTPResponse
|
|
wantErr bool
|
|
}{
|
|
{
|
|
name: "not added",
|
|
args: args{
|
|
ctx: Tester.WithAuthorizationToken(context.Background(), sessionToken),
|
|
req: &user.RemoveTOTPRequest{
|
|
UserId: userID,
|
|
},
|
|
},
|
|
wantErr: true,
|
|
},
|
|
{
|
|
name: "success",
|
|
args: args{
|
|
ctx: userVerifiedCtx,
|
|
req: &user.RemoveTOTPRequest{
|
|
UserId: userVerified.GetUserId(),
|
|
},
|
|
},
|
|
want: &user.RemoveTOTPResponse{
|
|
Details: &object.Details{
|
|
ResourceOwner: Tester.Organisation.ResourceOwner,
|
|
},
|
|
},
|
|
},
|
|
}
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
got, err := Client.RemoveTOTP(tt.args.ctx, tt.args.req)
|
|
if tt.wantErr {
|
|
require.Error(t, err)
|
|
return
|
|
}
|
|
require.NoError(t, err)
|
|
require.NotNil(t, got)
|
|
integration.AssertDetails(t, tt.want, got)
|
|
})
|
|
}
|
|
}
|