Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

much faster tests :)

goenning9b28d12ce9b5
diff --git a/app/middlewares/auth.go b/app/middlewares/auth.go
index b96e8bef1..24140bf4a 100644
--- a/app/middlewares/auth.go
+++ b/app/middlewares/auth.go
@@ -2,7 +2,6 @@ package middlewares
import (
"net/http"
- "net/url"
"github.com/WeCanHearYou/wechy/app/models"
"github.com/WeCanHearYou/wechy/app/pkg/web"
@@ -34,22 +33,3 @@ func IsAuthorized(roles ...models.Role) web.MiddlewareFunc {
}
}
}
-
-// HostChecker checks for a specific host
-func HostChecker(baseURL string) web.MiddlewareFunc {
- return func(next web.HandlerFunc) web.HandlerFunc {
- return func(c web.Context) error {
- u, err := url.Parse(baseURL)
- if err != nil {
- return c.Failure(err)
- }
-
- if c.Request().Host != u.Host {
- c.Logger().Errorf("%s is not valid for this operation. Only %s is allowed.", c.Request().Host, u.Host)
- return c.NoContent(http.StatusBadRequest)
- }
-
- return next(c)
- }
- }
-}
diff --git a/app/middlewares/auth_test.go b/app/middlewares/auth_test.go
index c29e97af3..a5cbdbfb6 100644
--- a/app/middlewares/auth_test.go
+++ b/app/middlewares/auth_test.go
@@ -87,37 +87,3 @@ func TestIsAuthenticated_WithoutUser(t *testing.T) {
Expect(rec.Code).To(Equal(http.StatusForbidden))
}
-
-func TestHostChecker(t *testing.T) {
- RegisterTestingT(t)
-
- server := mock.NewServer()
- req, _ := http.NewRequest(echo.GET, "/", nil)
- rec := httptest.NewRecorder()
- c := server.NewContext(req, rec)
- c.Request().Host = "login.test.canhearyou.com"
-
- mw := middlewares.HostChecker("http://login.test.canhearyou.com")
- mw(func(c web.Context) error {
- return c.NoContent(http.StatusOK)
- })(c)
-
- Expect(rec.Code).To(Equal(http.StatusOK))
-}
-
-func TestHostChecker_DifferentHost(t *testing.T) {
- RegisterTestingT(t)
-
- server := mock.NewServer()
- req, _ := http.NewRequest(echo.GET, "/", nil)
- rec := httptest.NewRecorder()
- c := server.NewContext(req, rec)
- c.Request().Host = "orange.test.canhearyou.com"
-
- mw := middlewares.HostChecker("login.test.canhearyou.com")
- mw(web.HandlerFunc(func(c web.Context) error {
- return c.NoContent(http.StatusOK)
- }))(c)
-
- Expect(rec.Code).To(Equal(http.StatusBadRequest))
-}
diff --git a/app/middlewares/domain.go b/app/middlewares/domain.go
new file mode 100644
index 000000000..15b945860
--- /dev/null
+++ b/app/middlewares/domain.go
@@ -0,0 +1,45 @@
+package middlewares
+
+import (
+ "net/http"
+ "net/url"
+
+ "github.com/WeCanHearYou/wechy/app/pkg/web"
+ "github.com/WeCanHearYou/wechy/app/storage"
+)
+
+// MultiTenant extract tenant information from hostname and inject it into current context
+func MultiTenant(tenants storage.Tenant) web.MiddlewareFunc {
+ return func(next web.HandlerFunc) web.HandlerFunc {
+ return func(c web.Context) error {
+ hostname := stripPort(c.Request().Host)
+ tenant, err := tenants.GetByDomain(hostname)
+ if err == nil {
+ c.SetTenant(tenant)
+ return next(c)
+ }
+
+ c.Logger().Infof("Tenant not found for '%s'.", hostname)
+ return c.NoContent(http.StatusNotFound)
+ }
+ }
+}
+
+// HostChecker checks for a specific host
+func HostChecker(baseURL string) web.MiddlewareFunc {
+ return func(next web.HandlerFunc) web.HandlerFunc {
+ return func(c web.Context) error {
+ u, err := url.Parse(baseURL)
+ if err != nil {
+ return c.Failure(err)
+ }
+
+ if c.Request().Host != u.Host {
+ c.Logger().Errorf("%s is not valid for this operation. Only %s is allowed.", c.Request().Host, u.Host)
+ return c.NoContent(http.StatusBadRequest)
+ }
+
+ return next(c)
+ }
+ }
+}
diff --git a/app/middlewares/domain_test.go b/app/middlewares/domain_test.go
new file mode 100644
index 000000000..50b60565d
--- /dev/null
+++ b/app/middlewares/domain_test.go
@@ -0,0 +1,114 @@
+package middlewares_test
+
+import (
+ "net/http"
+ "net/http/httptest"
+ "testing"
+
+ "github.com/WeCanHearYou/wechy/app/middlewares"
+ "github.com/WeCanHearYou/wechy/app/mock"
+ "github.com/WeCanHearYou/wechy/app/models"
+ "github.com/WeCanHearYou/wechy/app/pkg/web"
+ "github.com/WeCanHearYou/wechy/app/storage/inmemory"
+ "github.com/labstack/echo"
+ . "github.com/onsi/gomega"
+)
+
+var testCases = []struct {
+ expected string
+ hosts []string
+}{
+ {
+ "The Orange Inc.",
+ []string{
+ "orange.test.canhearyou.com",
+ "orange.test.canhearyou.com:3000",
+ },
+ },
+ {
+ "Demonstration",
+ []string{
+ "demo.test.canhearyou.com",
+ "demo.test.canhearyou.com:1231",
+ "demo.test.canhearyou.com:80",
+ },
+ },
+}
+
+func TestMultiTenant(t *testing.T) {
+ RegisterTestingT(t)
+
+ tenants := &inmemory.TenantStorage{}
+ tenants.Add(&models.Tenant{Name: "The Orange Inc.", Subdomain: "orange"})
+ tenants.Add(&models.Tenant{Name: "Demonstration", Subdomain: "demo"})
+
+ for _, testCase := range testCases {
+ for _, host := range testCase.hosts {
+
+ server := mock.NewServer()
+ req, _ := http.NewRequest(echo.GET, "/", nil)
+ rec := httptest.NewRecorder()
+ c := server.NewContext(req, rec)
+ c.Request().Host = host
+
+ mw := middlewares.MultiTenant(tenants)
+ mw(func(c web.Context) error {
+ return c.String(http.StatusOK, c.Tenant().Name)
+ })(c)
+
+ Expect(rec.Code).To(Equal(200))
+ Expect(rec.Body.String()).To(Equal(testCase.expected))
+ }
+ }
+}
+
+func TestMultiTenant_UnknownDomain(t *testing.T) {
+ RegisterTestingT(t)
+
+ server := mock.NewServer()
+ req, _ := http.NewRequest(echo.GET, "/", nil)
+ rec := httptest.NewRecorder()
+ c := server.NewContext(req, rec)
+ c.Request().Host = "somedomain.com"
+
+ mw := middlewares.MultiTenant(&inmemory.TenantStorage{})
+ mw(func(c web.Context) error {
+ return c.String(http.StatusOK, c.Tenant().Name)
+ })(c)
+
+ Expect(rec.Code).To(Equal(404))
+}
+
+func TestHostChecker(t *testing.T) {
+ RegisterTestingT(t)
+
+ server := mock.NewServer()
+ req, _ := http.NewRequest(echo.GET, "/", nil)
+ rec := httptest.NewRecorder()
+ c := server.NewContext(req, rec)
+ c.Request().Host = "login.test.canhearyou.com"
+
+ mw := middlewares.HostChecker("http://login.test.canhearyou.com")
+ mw(func(c web.Context) error {
+ return c.NoContent(http.StatusOK)
+ })(c)
+
+ Expect(rec.Code).To(Equal(http.StatusOK))
+}
+
+func TestHostChecker_DifferentHost(t *testing.T) {
+ RegisterTestingT(t)
+
+ server := mock.NewServer()
+ req, _ := http.NewRequest(echo.GET, "/", nil)
+ rec := httptest.NewRecorder()
+ c := server.NewContext(req, rec)
+ c.Request().Host = "orange.test.canhearyou.com"
+
+ mw := middlewares.HostChecker("login.test.canhearyou.com")
+ mw(web.HandlerFunc(func(c web.Context) error {
+ return c.NoContent(http.StatusOK)
+ }))(c)
+
+ Expect(rec.Code).To(Equal(http.StatusBadRequest))
+}
diff --git a/app/middlewares/jwt.go b/app/middlewares/jwt.go
index 352616276..1cd73f5e8 100644
--- a/app/middlewares/jwt.go
+++ b/app/middlewares/jwt.go
@@ -9,23 +9,6 @@ import (
"github.com/WeCanHearYou/wechy/app/storage"
)
-// MultiTenant extract tenant information from hostname and inject it into current context
-func MultiTenant(tenants storage.Tenant) web.MiddlewareFunc {
- return func(next web.HandlerFunc) web.HandlerFunc {
- return func(c web.Context) error {
- hostname := stripPort(c.Request().Host)
- tenant, err := tenants.GetByDomain(hostname)
- if err == nil {
- c.SetTenant(tenant)
- return next(c)
- }
-
- c.Logger().Infof("Tenant not found for '%s'.", hostname)
- return c.NoContent(http.StatusNotFound)
- }
- }
-}
-
// JwtGetter gets JWT token from cookie and add into context
func JwtGetter(users storage.User) web.MiddlewareFunc {
return func(next web.HandlerFunc) web.HandlerFunc {
diff --git a/app/middlewares/jwt_test.go b/app/middlewares/jwt_test.go
index e63341f4b..d35971af5 100644
--- a/app/middlewares/jwt_test.go
+++ b/app/middlewares/jwt_test.go
@@ -5,116 +5,25 @@ import (
"net/http/httptest"
"testing"
- "github.com/WeCanHearYou/wechy/app"
"github.com/WeCanHearYou/wechy/app/middlewares"
"github.com/WeCanHearYou/wechy/app/mock"
"github.com/WeCanHearYou/wechy/app/models"
- "github.com/WeCanHearYou/wechy/app/pkg/dbx"
"github.com/WeCanHearYou/wechy/app/pkg/jwt"
"github.com/WeCanHearYou/wechy/app/pkg/web"
- "github.com/WeCanHearYou/wechy/app/storage/postgres"
+ "github.com/WeCanHearYou/wechy/app/storage/inmemory"
"github.com/labstack/echo"
. "github.com/onsi/gomega"
)
-var testCases = []struct {
- domain string
- tenant *models.Tenant
- hosts []string
-}{
- {
- "orange.test.canhearyou.com",
- &models.Tenant{Name: "The Orange Inc."},
- []string{
- "orange.test.canhearyou.com",
- "orange.test.canhearyou.com:3000",
- },
- },
- {
- "trishop.test.canhearyou.com",
- &models.Tenant{Name: "The Triathlon Shop"},
- []string{
- "trishop.test.canhearyou.com",
- "trishop.test.canhearyou.com:1231",
- "trishop.test.canhearyou.com:80",
- },
- },
-}
-
-var (
- db *dbx.Database
- TenantStorage *postgres.TenantStorage
- UserStorage *postgres.UserStorage
-)
-
-func setup() {
- db, _ = dbx.New()
-
- TenantStorage = &postgres.TenantStorage{DB: db}
- UserStorage = &postgres.UserStorage{DB: db}
-}
-
-type mockTenantStorage struct{}
-
-func (svc mockTenantStorage) GetByDomain(domain string) (*models.Tenant, error) {
- for _, testCase := range testCases {
- if testCase.domain == domain {
- return testCase.tenant, nil
- }
- }
- return nil, app.ErrNotFound
-}
-
-func TestMultiTenant(t *testing.T) {
- RegisterTestingT(t)
-
- for _, testCase := range testCases {
- for _, host := range testCase.hosts {
-
- server := mock.NewServer()
- req, _ := http.NewRequest(echo.GET, "/", nil)
- rec := httptest.NewRecorder()
- c := server.NewContext(req, rec)
- c.Request().Host = host
-
- mw := middlewares.MultiTenant(&mockTenantStorage{})
- mw(func(c web.Context) error {
- return c.String(http.StatusOK, c.Tenant().Name)
- })(c)
-
- Expect(rec.Code).To(Equal(200))
- Expect(rec.Body.String()).To(Equal(testCase.tenant.Name))
- }
- }
-}
-
-func TestMultiTenant_UnknownDomain(t *testing.T) {
- RegisterTestingT(t)
-
- server := mock.NewServer()
- req, _ := http.NewRequest(echo.GET, "/", nil)
- rec := httptest.NewRecorder()
- c := server.NewContext(req, rec)
- c.Request().Host = "somedomain.com"
-
- mw := middlewares.MultiTenant(&mockTenantStorage{})
- mw(func(c web.Context) error {
- return c.String(http.StatusOK, c.Tenant().Name)
- })(c)
-
- Expect(rec.Code).To(Equal(404))
-}
-
func TestJwtGetter_NoCookie(t *testing.T) {
RegisterTestingT(t)
- setup()
server := mock.NewServer()
req, _ := http.NewRequest(echo.GET, "/", nil)
rec := httptest.NewRecorder()
c := server.NewContext(req, rec)
- mw := middlewares.JwtGetter(UserStorage)
+ mw := middlewares.JwtGetter(nil)
mw(func(c web.Context) error {
if c.IsAuthenticated() {
return c.NoContent(http.StatusOK)
@@ -128,24 +37,31 @@ func TestJwtGetter_NoCookie(t *testing.T) {
func TestJwtGetter_WithCookie(t *testing.T) {
RegisterTestingT(t)
- setup()
+ tenant := &models.Tenant{ID: 300}
+ user := &models.User{
+ ID: 300,
+ Name: "Jon Snow",
+ Tenant: tenant,
+ }
token, _ := jwt.Encode(&models.WechyClaims{
- UserID: 300,
- UserName: "Jon Snow",
+ UserID: user.ID,
+ UserName: user.Name,
})
+ users := &inmemory.UserStorage{}
+ users.Register(user)
server := mock.NewServer()
req, _ := http.NewRequest(echo.GET, "/", nil)
rec := httptest.NewRecorder()
c := server.NewContext(req, rec)
- c.SetTenant(&models.Tenant{ID: 300})
+ c.SetTenant(tenant)
c.Request().AddCookie(&http.Cookie{
Name: "auth",
Value: token,
})
- mw := middlewares.JwtGetter(UserStorage)
+ mw := middlewares.JwtGetter(users)
mw(func(c web.Context) error {
return c.String(http.StatusOK, c.User().Name)
})(c)
@@ -156,13 +72,13 @@ func TestJwtGetter_WithCookie(t *testing.T) {
func TestJwtGetter_WithCookie_DifferentTenant(t *testing.T) {
RegisterTestingT(t)
- setup()
token, _ := jwt.Encode(&models.WechyClaims{
UserID: 300,
UserName: "Jon Snow",
})
+ users := &inmemory.UserStorage{}
server := mock.NewServer()
req, _ := http.NewRequest(echo.GET, "/", nil)
rec := httptest.NewRecorder()
@@ -173,7 +89,7 @@ func TestJwtGetter_WithCookie_DifferentTenant(t *testing.T) {
Value: token,
})
- mw := middlewares.JwtGetter(UserStorage)
+ mw := middlewares.JwtGetter(users)
mw(func(c web.Context) error {
if c.User() == nil {
return c.NoContent(http.StatusNoContent)