Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

Reject API keys owned by blocked users before impersonation

Matt Robertsaf744d14e1c1
diff --git a/app/middlewares/user.go b/app/middlewares/user.go
index 02ff8dad5..6a68edee1 100644
--- a/app/middlewares/user.go
+++ b/app/middlewares/user.go
@@ -100,6 +100,11 @@ func User() web.MiddlewareFunc {
user = getUserByAPIKey.Result
fromAPIKey = true
+ // Check the key owner before impersonation replaces user below.
+ if user.Status == enum.UserBlocked {
+ return c.Unauthorized()
+ }
+
if !user.IsCollaborator() {
return c.HandleValidation(validate.Failed("API Key is invalid"))
}
diff --git a/app/middlewares/user_test.go b/app/middlewares/user_test.go
index 69739f937..5516e450d 100644
--- a/app/middlewares/user_test.go
+++ b/app/middlewares/user_test.go
@@ -603,6 +603,41 @@ func TestUser_Impersonation_ValidUser(t *testing.T) {
Expect(response.Body.String()).Equals("Arya Stark")
}
+func TestUser_Impersonation_BlockedKeyOwner(t *testing.T) {
+ RegisterT(t)
+
+ bus.AddHandler(func(ctx context.Context, q *query.GetUserByID) error {
+ if q.UserID == mock.AryaStark.ID {
+ q.Result = mock.AryaStark
+ return nil
+ }
+ return app.ErrNotFound
+ })
+
+ bus.AddHandler(func(ctx context.Context, q *query.GetUserByAPIKey) error {
+ if q.APIKey == "1234567890" {
+ q.Result = mock.JonSnow
+ return nil
+ }
+ return app.ErrNotFound
+ })
+
+ server := mock.NewServer()
+ mock.JonSnow.Status = enum.UserBlocked
+
+ server.Use(middlewares.User())
+ status, _ := server.
+ OnTenant(mock.DemoTenant).
+ WithURL("http://example.com/api/v1").
+ AddHeader("Authorization", "Bearer 1234567890").
+ AddHeader("X-Fider-UserID", strconv.Itoa(mock.AryaStark.ID)).
+ Execute(func(c *web.Context) error {
+ return c.NoContent(http.StatusOK)
+ })
+
+ Expect(status).Equals(http.StatusUnauthorized)
+}
+
// TestUser_SecurityStamp_Match verifies that a token whose security stamp
// matches the DB value grants access normally.
func TestUser_SecurityStamp_Match(t *testing.T) {