Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

tests for middlewares

goenning32491219a7eb
diff --git a/Makefile b/Makefile
index bf805f3e2..8bc743975 100644
--- a/Makefile
+++ b/Makefile
@@ -12,6 +12,7 @@ endef
test:
AUTH_ENDPOINT=http://login.test.canhearyou.com:3000 \
GO_ENV=test \
+ JWT_SECRET=some.dummy.secret \
go test $$(go list ./... | grep -v /vendor/) -cover
setup-ci:
@@ -22,6 +23,7 @@ setup-ci:
run-ci:
AUTH_ENDPOINT=http://login.test.canhearyou.com:3000 \
GO_ENV=test \
+ JWT_SECRET=some.dummy.secret \
goveralls -service=travis-ci
ifeq ($(TRAVIS_PULL_REQUEST), false)
CGO_ENABLED=0 GOOS=linux GOARCH=amd64 make build
diff --git a/auth/jwt.go b/auth/jwt.go
index 5d3770bc3..4b6463fcf 100644
--- a/auth/jwt.go
+++ b/auth/jwt.go
@@ -1,8 +1,7 @@
package auth
import (
- "os"
-
+ "github.com/WeCanHearYou/wchy/env"
jwt "github.com/dgrijalva/jwt-go"
)
@@ -14,7 +13,7 @@ type WchyClaims struct {
jwt.StandardClaims
}
-var jwtSecret = os.Getenv("JWT_SECRET")
+var jwtSecret = env.MustGet("JWT_SECRET")
//Encode creates new JWT tokens with given claims
func Encode(claims *WchyClaims) (string, error) {
diff --git a/router/middleware/hostchecker.go b/router/middleware/hostchecker.go
index 13abfc274..f801045fe 100644
--- a/router/middleware/hostchecker.go
+++ b/router/middleware/hostchecker.go
@@ -2,26 +2,20 @@ package middleware
import (
"net/http"
- "strings"
"github.com/labstack/echo"
)
// HostChecker checks for a specific host
-func HostChecker(baseURL string) echo.MiddlewareFunc {
+func HostChecker(host string) echo.MiddlewareFunc {
return func(next echo.HandlerFunc) echo.HandlerFunc {
return func(c echo.Context) error {
- scheme := "http"
- if c.Request().TLS != nil {
- scheme = "https"
- }
- url := scheme + "://" + c.Request().Host
-
- if strings.Index(url, baseURL) < 0 {
- c.Logger().Errorf("%s is not valid for this operation", url)
+ if c.Request().Host != host {
+ c.Logger().Errorf("%s is not valid for this operation. Only %s is allowed.", c.Request().Host, host)
return c.NoContent(http.StatusBadRequest)
}
+
return next(c)
}
}
diff --git a/router/middleware/hostchecker_test.go b/router/middleware/hostchecker_test.go
new file mode 100644
index 000000000..ece718f3c
--- /dev/null
+++ b/router/middleware/hostchecker_test.go
@@ -0,0 +1,45 @@
+package middleware_test
+
+import (
+ "net/http"
+ "net/http/httptest"
+ "testing"
+
+ "github.com/WeCanHearYou/wchy/router/middleware"
+ "github.com/labstack/echo"
+ . "github.com/onsi/gomega"
+)
+
+func TestHostChecker(t *testing.T) {
+ RegisterTestingT(t)
+
+ e := echo.New()
+ req, _ := http.NewRequest(echo.GET, "/", nil)
+ rec := httptest.NewRecorder()
+ c := e.NewContext(req, rec)
+ c.Request().Host = "login.test.canhearyou.com"
+
+ mw := middleware.HostChecker("login.test.canhearyou.com")
+ mw(echo.HandlerFunc(func(c echo.Context) error {
+ return c.NoContent(http.StatusOK)
+ }))(c)
+
+ Expect(rec.Code).To(Equal(http.StatusOK))
+}
+
+func TestHostChecker_DifferentHost(t *testing.T) {
+ RegisterTestingT(t)
+
+ e := echo.New()
+ req, _ := http.NewRequest(echo.GET, "/", nil)
+ rec := httptest.NewRecorder()
+ c := e.NewContext(req, rec)
+ c.Request().Host = "orange.test.canhearyou.com"
+
+ mw := middleware.HostChecker("login.test.canhearyou.com")
+ mw(echo.HandlerFunc(func(c echo.Context) error {
+ return c.NoContent(http.StatusOK)
+ }))(c)
+
+ Expect(rec.Code).To(Equal(http.StatusBadRequest))
+}
diff --git a/router/middleware/jwt.go b/router/middleware/jwt.go
index 3b6351309..a8271a492 100644
--- a/router/middleware/jwt.go
+++ b/router/middleware/jwt.go
@@ -47,7 +47,12 @@ func JwtSetter() echo.MiddlewareFunc {
query.Del("jwt")
- url := scheme + "://" + c.Request().Host + c.Request().URL.Path + "?" + query.Encode()
+ url := scheme + "://" + c.Request().Host + c.Request().URL.Path
+ querystring := query.Encode()
+ if querystring != "" {
+ url += "?" + querystring
+ }
+
return c.Redirect(http.StatusTemporaryRedirect, url)
}
diff --git a/router/middleware/jwt_test.go b/router/middleware/jwt_test.go
index 0ac2f18d2..2d326189e 100644
--- a/router/middleware/jwt_test.go
+++ b/router/middleware/jwt_test.go
@@ -1 +1,119 @@
package middleware_test
+
+import (
+ "net/http"
+ "net/http/httptest"
+ "testing"
+
+ "github.com/WeCanHearYou/wchy/auth"
+ "github.com/WeCanHearYou/wchy/router/middleware"
+ "github.com/labstack/echo"
+ . "github.com/onsi/gomega"
+)
+
+func TestJwtGetter_NoCookie(t *testing.T) {
+ RegisterTestingT(t)
+
+ e := echo.New()
+ req, _ := http.NewRequest(echo.GET, "/", nil)
+ rec := httptest.NewRecorder()
+ c := e.NewContext(req, rec)
+
+ mw := middleware.JwtGetter()
+ mw(echo.HandlerFunc(func(c echo.Context) error {
+ if c.Get("Claims") == nil {
+ return c.NoContent(http.StatusNoContent)
+ } else {
+ return c.NoContent(http.StatusOK)
+ }
+ }))(c)
+
+ Expect(rec.Code).To(Equal(http.StatusNoContent))
+}
+
+func TestJwtGetter_WithCookie(t *testing.T) {
+ RegisterTestingT(t)
+
+ token, _ := auth.Encode(&auth.WchyClaims{
+ UserName: "Jon Snow",
+ })
+
+ e := echo.New()
+ req, _ := http.NewRequest(echo.GET, "/", nil)
+ rec := httptest.NewRecorder()
+ c := e.NewContext(req, rec)
+ c.Request().AddCookie(&http.Cookie{
+ Name: "auth",
+ Value: token,
+ })
+
+ mw := middleware.JwtGetter()
+ mw(echo.HandlerFunc(func(c echo.Context) error {
+ claims := c.Get("Claims").(*auth.WchyClaims)
+ return c.String(http.StatusOK, claims.UserName)
+ }))(c)
+
+ Expect(rec.Code).To(Equal(http.StatusOK))
+ Expect(rec.Body.String()).To(Equal("Jon Snow"))
+}
+
+func TestJwtSetter_WithoutJwt(t *testing.T) {
+ RegisterTestingT(t)
+
+ e := echo.New()
+ req, _ := http.NewRequest(echo.GET, "/abc", nil)
+ rec := httptest.NewRecorder()
+ c := e.NewContext(req, rec)
+ c.Request().Host = "orange.test.canhearyou.com"
+
+ mw := middleware.JwtSetter()
+ mw(echo.HandlerFunc(func(c echo.Context) error {
+ return c.NoContent(http.StatusOK)
+ }))(c)
+
+ Expect(rec.Code).To(Equal(http.StatusOK))
+}
+
+func TestJwtSetter_WithJwt_WithoutParameter(t *testing.T) {
+ RegisterTestingT(t)
+
+ token, _ := auth.Encode(&auth.WchyClaims{
+ UserName: "Jon Snow",
+ })
+
+ e := echo.New()
+ req, _ := http.NewRequest(echo.GET, "/abc?jwt="+token, nil)
+ rec := httptest.NewRecorder()
+ c := e.NewContext(req, rec)
+ c.Request().Host = "orange.test.canhearyou.com"
+
+ mw := middleware.JwtSetter()
+ mw(echo.HandlerFunc(func(c echo.Context) error {
+ return c.NoContent(http.StatusOK)
+ }))(c)
+
+ Expect(rec.Code).To(Equal(http.StatusTemporaryRedirect))
+ Expect(rec.Header().Get("Location")).To(Equal("http://orange.test.canhearyou.com/abc"))
+}
+
+func TestJwtSetter_WithJwt_WithParameter(t *testing.T) {
+ RegisterTestingT(t)
+
+ token, _ := auth.Encode(&auth.WchyClaims{
+ UserName: "Jon Snow",
+ })
+
+ e := echo.New()
+ req, _ := http.NewRequest(echo.GET, "/abc?jwt="+token+"&foo=bar", nil)
+ rec := httptest.NewRecorder()
+ c := e.NewContext(req, rec)
+ c.Request().Host = "orange.test.canhearyou.com"
+
+ mw := middleware.JwtSetter()
+ mw(echo.HandlerFunc(func(c echo.Context) error {
+ return c.NoContent(http.StatusOK)
+ }))(c)
+
+ Expect(rec.Code).To(Equal(http.StatusTemporaryRedirect))
+ Expect(rec.Header().Get("Location")).To(Equal("http://orange.test.canhearyou.com/abc?foo=bar"))
+}
diff --git a/router/middleware/multitenant_test.go b/router/middleware/multitenant_test.go
index 886e95397..ff758356a 100644
--- a/router/middleware/multitenant_test.go
+++ b/router/middleware/multitenant_test.go
@@ -64,8 +64,8 @@ func TestMultiTenant(t *testing.T) {
c := e.NewContext(req, rec)
c.Request().Host = host
- cors := middleware.MultiTenant(ctx)
- cors(echo.HandlerFunc(func(c echo.Context) error {
+ mw := middleware.MultiTenant(ctx)
+ mw(echo.HandlerFunc(func(c echo.Context) error {
return c.String(http.StatusOK, c.Get("Tenant").(*model.Tenant).Name)
}))(c)
@@ -74,7 +74,6 @@ func TestMultiTenant(t *testing.T) {
}
}
-
}
func TestMultiTenant_UnknownDomain(t *testing.T) {