Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

enhancement: adding disabled status (#918)

Guilherme Oenningf3a8a93d49db
diff --git a/app/cmd/routes.go b/app/cmd/routes.go
index ca13df8a8..0d3c0abe5 100644
--- a/app/cmd/routes.go
+++ b/app/cmd/routes.go
@@ -58,7 +58,7 @@ func routes(r *web.Engine) *web.Engine {
r.Get("/oauth/:provider", handlers.SignInByOAuth())
r.Get("/oauth/:provider/callback", handlers.OAuthCallback())
- //From this step, a Tenant is required (regardless of status)
+ //Starting from this step, a Tenant is required
r.Use(middlewares.RequireTenant())
r.Get("/sitemap.xml", handlers.Sitemap())
diff --git a/app/middlewares/tenant.go b/app/middlewares/tenant.go
index 93ecb963d..12f3a73a1 100644
--- a/app/middlewares/tenant.go
+++ b/app/middlewares/tenant.go
@@ -86,12 +86,18 @@ func MultiTenant() web.MiddlewareFunc {
func RequireTenant() web.MiddlewareFunc {
return func(next web.HandlerFunc) web.HandlerFunc {
return func(c *web.Context) error {
- if c.Tenant() == nil {
+ tenant := c.Tenant()
+ if tenant == nil {
if env.IsSingleHostMode() {
return c.Redirect("/signup")
}
return c.NotFound()
}
+
+ if tenant.Status == enum.TenantDisabled {
+ return c.NotFound()
+ }
+
return next(c)
}
}
diff --git a/app/middlewares/tenant_test.go b/app/middlewares/tenant_test.go
index 727d221a2..a42f5075e 100644
--- a/app/middlewares/tenant_test.go
+++ b/app/middlewares/tenant_test.go
@@ -365,6 +365,29 @@ func TestRequireTenant_MultiHostMode_ValidTenant(t *testing.T) {
Expect(response.Body.String()).Equals("Avengers")
}
+func TestRequireTenant_MultiHostMode_BlockedTenant(t *testing.T) {
+ RegisterT(t)
+
+ bus.AddHandler(func(ctx context.Context, q *query.GetTenantByDomain) error {
+ if q.Domain == "avengers.test.fider.io" {
+ q.Result = mock.AvengersTenant
+ q.Result.Status = enum.TenantDisabled
+ return nil
+ }
+ return app.ErrNotFound
+ })
+
+ server := mock.NewServer()
+ server.Use(middlewares.MultiTenant())
+ server.Use(middlewares.RequireTenant())
+
+ status, _ := server.WithURL("http://avengers.test.fider.io").Execute(func(c *web.Context) error {
+ return c.String(http.StatusOK, c.Tenant().Name)
+ })
+
+ Expect(status).Equals(http.StatusNotFound)
+}
+
func TestRequireTenant_SingleHostMode_NoTenants_RedirectToSignUp(t *testing.T) {
RegisterT(t)
diff --git a/app/models/enum/tenant_status.go b/app/models/enum/tenant_status.go
index 0ca4bc307..066556b45 100644
--- a/app/models/enum/tenant_status.go
+++ b/app/models/enum/tenant_status.go
@@ -5,6 +5,8 @@ var (
TenantActive = 1
//TenantPending is used for signup via email that requires user confirmation
TenantPending = 2
- //TenantLocked is used when tenants are locked for various reasons
+ //TenantLocked is used to set tenant on a read-only mode
TenantLocked = 3
+ //TenantDisabled is used to block all access
+ TenantDisabled = 4
)