Skip to content

verify that reg-service returns 403 when user is banned #1141

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

Merged
merged 1 commit into from
Mar 28, 2025
Merged

verify that reg-service returns 403 when user is banned #1141

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
111 changes: 28 additions & 83 deletions test/e2e/user_management_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -556,66 +556,6 @@ func (s *userManagementTestSuite) TestUserDeactivation() {
}

func (s *userManagementTestSuite) TestUserBanning() {
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)
})
Comment on lines -559 to -590
Copy link
Collaborator Author

@MatousJobanek MatousJobanek Mar 27, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

this was a complete duplication of the first test of "ban provisioned usersignup" below


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)
})

Comment on lines -592 to -618
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

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.

s.Run("register new user with preexisting ban", func() {
hostAwait := s.Host()
hostAwait.UpdateToolchainConfig(s.T(), testconfig.AutomaticApproval().Enabled(true))
Expand All @@ -628,29 +568,7 @@ func (s *userManagementTestSuite) TestUserBanning() {
// to avoid token used before issued error.
_, token0, err := authsupport.NewToken(authsupport.WithEmail(email))
require.NoError(s.T(), err)

route := hostAwait.RegistrationServiceURL

// Call signup endpoint with a valid token to initiate a signup process
req, err := http.NewRequest("POST", route+"/api/v1/signup", nil)
require.NoError(s.T(), err)
req.Header.Set("Authorization", "Bearer "+token0)
req.Header.Set("content-type", "application/json")

resp, err := httpClient.Do(req) // nolint:bodyclose // see `defer Close(t, resp)`
require.NoError(s.T(), err)
defer Close(s.T(), resp)

body, err := io.ReadAll(resp.Body)
require.NoError(s.T(), err)
require.NotNil(s.T(), body)
assert.Equal(s.T(), http.StatusForbidden, resp.StatusCode)

// Check the error.
statusErr := make(map[string]interface{})
err = json.Unmarshal([]byte(body), &statusErr)
require.NoError(s.T(), err)
require.Equal(s.T(), "forbidden: user has been banned", statusErr["message"])
s.verifyRegServiceForBannedUser(http.MethodPost, token0)
})

s.Run("ban provisioned usersignup", func() {
Expand Down Expand Up @@ -687,6 +605,8 @@ func (s *userManagementTestSuite) TestUserBanning() {
require.NoError(s.T(), err)
require.NoError(s.T(), hostAwait.WaitUntilSpaceAndSpaceBindingsDeleted(s.T(), user.Space.Name))

s.verifyRegServiceForBannedUser(http.MethodGet, user.Token)

s.Run("unban the banned user", func() {
// Unban the user
err = hostAwait.Client.Delete(context.TODO(), bannedUser)
Expand All @@ -709,6 +629,31 @@ func (s *userManagementTestSuite) TestUserBanning() {
})
}

func (s *userManagementTestSuite) verifyRegServiceForBannedUser(method, token string) {
hostAwait := s.Host()
route := hostAwait.RegistrationServiceURL
// Call signup endpoint with a valid token to initiate a signup process
req, err := http.NewRequest(method, route+"/api/v1/signup", nil)
require.NoError(s.T(), err)
req.Header.Set("Authorization", "Bearer "+token)
req.Header.Set("content-type", "application/json")

resp, err := httpClient.Do(req) // nolint:bodyclose // see `defer Close(t, resp)`
require.NoError(s.T(), err)
defer Close(s.T(), resp)

body, err := io.ReadAll(resp.Body)
require.NoError(s.T(), err)
require.NotNil(s.T(), body)
assert.Equal(s.T(), http.StatusForbidden, resp.StatusCode)

// Check the error.
statusErr := make(map[string]interface{})
err = json.Unmarshal(body, &statusErr)
require.NoError(s.T(), err)
require.Equal(s.T(), "forbidden: Access to the Developer Sandbox has been suspended due to suspicious activity or detected abuse.", statusErr["message"])
}

func (s *userManagementTestSuite) TestUserDisabled() {
hostAwait := s.Host()
memberAwait := s.Member1()
Expand Down
Loading