Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

fix: move disabled check to read tenant middleware

goenningcbc46fb20f56
diff --git a/app/middlewares/tenant.go b/app/middlewares/tenant.go
index 12f3a73a1..b62b5eead 100644
--- a/app/middlewares/tenant.go
+++ b/app/middlewares/tenant.go
@@ -31,7 +31,7 @@ func SingleTenant() web.MiddlewareFunc {
return c.Failure(err)
}
- if firstTenant.Result != nil {
+ if firstTenant.Result != nil && firstTenant.Result.Status != enum.TenantDisabled {
c.SetTenant(firstTenant.Result)
if c.Request.URL.Hostname() != env.Config.HostDomain {
@@ -65,7 +65,7 @@ func MultiTenant() web.MiddlewareFunc {
return c.Failure(err)
}
- if byDomain.Result != nil {
+ if byDomain.Result != nil && byDomain.Result.Status != enum.TenantDisabled {
c.SetTenant(byDomain.Result)
if byDomain.Result.CNAME != "" && !c.IsAjax() {
@@ -94,10 +94,6 @@ func RequireTenant() web.MiddlewareFunc {
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 a42f5075e..08213623b 100644
--- a/app/middlewares/tenant_test.go
+++ b/app/middlewares/tenant_test.go
@@ -113,6 +113,29 @@ func TestMultiTenant_UnknownDomain(t *testing.T) {
Expect(status).Equals(http.StatusOK)
}
+func TestMultiTenant_DisabledTenant_ShouldNotSetInContext(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.Ok(nil)
+ })
+
+ Expect(status).Equals(http.StatusNotFound)
+}
+
func TestMultiTenant_CanonicalHeader(t *testing.T) {
RegisterT(t)
@@ -365,29 +388,6 @@ 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)