Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

enhancement: block banned users (#594)

Guilherme Oenninge09400b6cf0a
diff --git a/app/middlewares/user.go b/app/middlewares/user.go
index e34339506..320d67d90 100644
--- a/app/middlewares/user.go
+++ b/app/middlewares/user.go
@@ -88,6 +88,12 @@ func User() web.MiddlewareFunc {
}
if user != nil && c.Tenant() != nil && user.Tenant.ID == c.Tenant().ID {
+
+ if user.Status == models.UserBanned {
+ c.RemoveCookie(web.CookieAuthName)
+ return c.Unauthorized()
+ }
+
c.SetUser(user)
}
diff --git a/app/middlewares/user_test.go b/app/middlewares/user_test.go
index e890020c6..3420b0856 100644
--- a/app/middlewares/user_test.go
+++ b/app/middlewares/user_test.go
@@ -54,6 +54,28 @@ func TestUser_WithCookie(t *testing.T) {
Expect(response.HeaderMap["Set-Cookie"]).HasLen(0)
}
+func TestUser_Banned(t *testing.T) {
+ RegisterT(t)
+
+ server, _ := mock.NewServer()
+ mock.JonSnow.Status = models.UserBanned
+ token, _ := jwt.Encode(jwt.FiderClaims{
+ UserID: mock.JonSnow.ID,
+ UserName: mock.JonSnow.Name,
+ })
+
+ server.Use(middlewares.User())
+ status, _ := server.
+ OnTenant(mock.DemoTenant).
+ AddHeader("Accept", "application/json").
+ AddCookie(web.CookieAuthName, token).
+ Execute(func(c web.Context) error {
+ return c.String(http.StatusOK, c.User().Name)
+ })
+
+ Expect(status).Equals(http.StatusForbidden)
+}
+
func TestUser_WithCookie_InvalidUser(t *testing.T) {
RegisterT(t)
diff --git a/app/models/identity.go b/app/models/identity.go
index c41b52663..408ba2753 100644
--- a/app/models/identity.go
+++ b/app/models/identity.go
@@ -51,6 +51,8 @@ var (
UserActive = 1
//UserDeleted is used for users that chose to delete their accounts
UserDeleted = 2
+ //UserBanned is used for users that have been banned by staff members
+ UserBanned = 3
)
//Role is the role of a user inside a tenant
diff --git a/app/pkg/mock/setup.go b/app/pkg/mock/setup.go
index 6d626fef2..f8abdb0b1 100644
--- a/app/pkg/mock/setup.go
+++ b/app/pkg/mock/setup.go
@@ -65,6 +65,7 @@ func createServices(seed bool) *app.Services {
Name: "Jon Snow",
Tenant: DemoTenant,
+ Status: models.UserActive,
Role: models.RoleAdministrator,
Providers: []*models.UserProvider{
{UID: "FB1234", Name: oauth.FacebookProvider},
@@ -72,7 +73,13 @@ func createServices(seed bool) *app.Services {
}
services.Users.Register(JonSnow)
- AryaStark = &models.User{Name: "Arya Stark", Email: "[email protected]", Tenant: DemoTenant, Role: models.RoleVisitor}
+ AryaStark = &models.User{
+ Name: "Arya Stark",
+ Email: "[email protected]",
+ Tenant: DemoTenant,
+ Status: models.UserActive,
+ Role: models.RoleVisitor,
+ }
services.Users.Register(AryaStark)
}