verify that reg-service returns 403 when user is banned #1141
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
MatousJobanek
requested review from
xcoulon,
alexeykazakov,
rajivnathan,
mfrancisc,
rsoaresd,
fbm3307,
metlos and
jrosental
as code owners
|
MatousJobanek
commented
Mar 27, 2025
Comment on lines
-559
to
-590
| s.Run("ban provisioned usersignup", func() { | ||
| hostAwait := s.Host() | ||
| memberAwait := s.Member1() | ||
| hostAwait.UpdateToolchainConfig(s.T(), testconfig.AutomaticApproval().Enabled(false)) | ||
|
|
||
| // Create a new UserSignup and approve it manually | ||
| user := NewSignupRequest(s.Awaitilities). | ||
| Username("banprovisioned"). | ||
| Email("banprovisioned@test.com"). | ||
| ManuallyApprove(). | ||
| TargetCluster(memberAwait). | ||
| RequireConditions(wait.ConditionSet(wait.Default(), wait.ApprovedByAdmin())...). | ||
| Execute(s.T()) | ||
| userSignup := user.UserSignup | ||
|
|
||
| // Create the BannedUser | ||
| CreateBannedUser(s.T(), s.Host(), userSignup.Spec.IdentityClaims.Email) | ||
|
|
||
| // Confirm the user is banned | ||
| _, err := hostAwait.WithRetryOptions(wait.TimeoutOption(time.Second*15)).WaitForUserSignup(s.T(), userSignup.Name, | ||
| wait.UntilUserSignupHasConditions(wait.ConditionSet(wait.Default(), wait.ApprovedByAdmin(), wait.Banned())...)) | ||
| require.NoError(s.T(), err) | ||
|
|
||
| // Confirm that a MasterUserRecord is deleted | ||
| _, err = hostAwait.WithRetryOptions(wait.TimeoutOption(time.Second*10)).WaitForMasterUserRecord(s.T(), userSignup.Spec.IdentityClaims.PreferredUsername) | ||
| require.Error(s.T(), err) | ||
| // confirm usersignup | ||
| _, err = hostAwait.WaitForUserSignup(s.T(), userSignup.Name, | ||
| wait.UntilUserSignupHasConditions(wait.ConditionSet(wait.Default(), wait.ApprovedByAdmin(), wait.Banned())...), | ||
| wait.UntilUserSignupHasStateLabel(toolchainv1alpha1.UserSignupStateLabelValueBanned)) | ||
| require.NoError(s.T(), err) | ||
| }) |
There was a problem hiding this comment.
this was a complete duplication of the first test of "ban provisioned usersignup" below
MatousJobanek
commented
Mar 27, 2025
Comment on lines
-592
to
-618
| s.Run("manually created usersignup with preexisting banneduser", func() { | ||
| hostAwait := s.Host() | ||
| memberAwait := s.Member1() | ||
| hostAwait.UpdateToolchainConfig(s.T(), testconfig.AutomaticApproval().Enabled(true)) | ||
|
|
||
| id := uuid.Must(uuid.NewV4()).String() | ||
| email := "testuser" + id + "@test.com" | ||
| CreateBannedUser(s.T(), s.Host(), email) | ||
|
|
||
| // For this test, we don't want to create the UserSignup via the registration service (the next test does this) | ||
| // Instead, we want to confirm the behaviour when a UserSignup with a banned email address is created manually | ||
| userSignup := NewUserSignup(hostAwait.Namespace, "testuser"+id, email) | ||
| userSignup.Spec.TargetCluster = memberAwait.ClusterName | ||
|
|
||
| // Create the UserSignup via the Kubernetes API | ||
| err := hostAwait.CreateWithCleanup(s.T(), userSignup) | ||
| require.NoError(s.T(), err) | ||
| s.T().Logf("user signup '%s' created", userSignup.Name) | ||
|
|
||
| // Check the UserSignup is created and confirm that the user is banned | ||
| _, err = hostAwait.WaitForUserSignup(s.T(), userSignup.Name, wait.UntilUserSignupHasStateLabel(toolchainv1alpha1.UserSignupStateLabelValueBanned)) | ||
| require.NoError(s.T(), err) | ||
|
|
||
| err = hostAwait.WaitUntilSpaceAndSpaceBindingsDeleted(s.T(), "testuser"+id) | ||
| require.NoError(s.T(), err) | ||
| }) | ||
|
|
There was a problem hiding this comment.
this didn't test a real scenario (we don't create UserSignups manually), thus it's better to remove it to not bring any confusion in the future.
mfrancisc
approved these changes
Mar 27, 2025
|
/retest |
rajivnathan
approved these changes
Mar 27, 2025
metlos
approved these changes
Mar 27, 2025
alexeykazakov
approved these changes
Mar 27, 2025
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: alexeykazakov, MatousJobanek, metlos, mfrancisc, rajivnathan The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
MatousJobanek
merged commit 1ae278a
into
codeready-toolchain:master
9 of 10 checks passed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
paired PR codeready-toolchain/registration-service#520
KUBESAW-267