Open platform to collect and prioritize feedback
fixes #25, no need for json message for now
goenning1104c2b741bc
diff --git a/app/identity/middleware.go b/app/identity/middleware.goindex c826026c0..77aeaf880 100644--- a/app/identity/middleware.go+++ b/app/identity/middleware.go@@ -2,10 +2,8 @@ package identityimport ("net/http"- "net/url""github.com/WeCanHearYou/wechy/app"- "github.com/WeCanHearYou/wechy/app/infra")// MultiTenant extract tenant information from hostname and inject it into current context@@ -24,77 +22,3 @@ func MultiTenant(tenantService TenantService) app.MiddlewareFunc {}}}--// JwtGetter gets JWT token from cookie and add into context-func JwtGetter() app.MiddlewareFunc {- return func(next app.HandlerFunc) app.HandlerFunc {- return func(c app.Context) error {-- if cookie, err := c.Cookie("auth"); err == nil {- if claims, err := infra.Decode(cookie.Value); err == nil {- c.SetClaims(claims)- } else {- c.Logger().Error(err)- }- }-- return next(c)- }- }-}--// JwtSetter sets JWT token into cookie-func JwtSetter() app.MiddlewareFunc {- return func(next app.HandlerFunc) app.HandlerFunc {- return func(c app.Context) error {-- query := c.Request().URL.Query()-- jwt := query.Get("jwt")- if jwt != "" {- c.SetCookie(&http.Cookie{- Name: "auth",- Value: jwt,- HttpOnly: true,- Path: "/",- })-- scheme := "http"- if c.Request().TLS != nil {- scheme = "https"- }-- query.Del("jwt")-- url := scheme + "://" + c.Request().Host + c.Request().URL.Path- querystring := query.Encode()- if querystring != "" {- url += "?" + querystring- }-- return c.Redirect(http.StatusTemporaryRedirect, url)- }-- return next(c)- }- }-}--// HostChecker checks for a specific host-func HostChecker(baseURL string) app.MiddlewareFunc {- return func(next app.HandlerFunc) app.HandlerFunc {- return func(c app.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/identity/middleware_test.go b/app/identity/middleware_test.goindex c119c16b8..3b2be0a08 100644--- a/app/identity/middleware_test.go+++ b/app/identity/middleware_test.go@@ -7,7 +7,6 @@ import ("github.com/WeCanHearYou/wechy/app""github.com/WeCanHearYou/wechy/app/identity"- "github.com/WeCanHearYou/wechy/app/infra""github.com/WeCanHearYou/wechy/app/mock""github.com/labstack/echo". "github.com/onsi/gomega"@@ -87,143 +86,3 @@ func TestMultiTenant_UnknownDomain(t *testing.T) {Expect(rec.Code).To(Equal(404))}--func TestJwtGetter_NoCookie(t *testing.T) {- RegisterTestingT(t)-- server := mock.NewServer()- req, _ := http.NewRequest(echo.GET, "/", nil)- rec := httptest.NewRecorder()- c := server.NewContext(req, rec)-- mw := identity.JwtGetter()- mw(func(c app.Context) error {- if c.IsAuthenticated() {- return c.NoContent(http.StatusOK)- } else {- return c.NoContent(http.StatusNoContent)- }- })(c)-- Expect(rec.Code).To(Equal(http.StatusNoContent))-}--func TestJwtGetter_WithCookie(t *testing.T) {- RegisterTestingT(t)-- token, _ := infra.Encode(&app.WechyClaims{- UserName: "Jon Snow",- })-- server := mock.NewServer()- req, _ := http.NewRequest(echo.GET, "/", nil)- rec := httptest.NewRecorder()- c := server.NewContext(req, rec)- c.Request().AddCookie(&http.Cookie{- Name: "auth",- Value: token,- })-- mw := identity.JwtGetter()- mw(func(c app.Context) error {- return c.String(http.StatusOK, c.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)-- server := mock.NewServer()- req, _ := http.NewRequest(echo.GET, "/abc", nil)- rec := httptest.NewRecorder()- c := server.NewContext(req, rec)- c.Request().Host = "orange.test.canhearyou.com"-- mw := identity.JwtSetter()- mw(func(c app.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, _ := infra.Encode(&app.WechyClaims{- UserName: "Jon Snow",- })-- server := mock.NewServer()- req, _ := http.NewRequest(echo.GET, "/abc?jwt="+token, nil)- rec := httptest.NewRecorder()- c := server.NewContext(req, rec)- c.Request().Host = "orange.test.canhearyou.com"-- mw := identity.JwtSetter()- mw(func(c app.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, _ := infra.Encode(&app.WechyClaims{- UserName: "Jon Snow",- })-- server := mock.NewServer()- req, _ := http.NewRequest(echo.GET, "/abc?jwt="+token+"&foo=bar", nil)- rec := httptest.NewRecorder()- c := server.NewContext(req, rec)- c.Request().Host = "orange.test.canhearyou.com"-- mw := identity.JwtSetter()- mw(func(c app.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"))-}--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 := identity.HostChecker("http://login.test.canhearyou.com")- mw(func(c app.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 := identity.HostChecker("login.test.canhearyou.com")- mw(app.HandlerFunc(func(c app.Context) error {- return c.NoContent(http.StatusOK)- }))(c)-- Expect(rec.Code).To(Equal(http.StatusBadRequest))-}diff --git a/app/infra/middleware.go b/app/infra/middleware.gonew file mode 100644index 000000000..ba9b9f143--- /dev/null+++ b/app/infra/middleware.go@@ -0,0 +1,95 @@+package infra++import (+ "net/http"+ "net/url"++ "github.com/WeCanHearYou/wechy/app"+)++// IsAuthenticated blocks non-authenticated requests+func IsAuthenticated() app.MiddlewareFunc {+ return func(next app.HandlerFunc) app.HandlerFunc {+ return func(c app.Context) error {+ _, err := c.Cookie("auth")+ if err != nil {+ return c.NoContent(http.StatusForbidden)+ }+ return next(c)+ }+ }+}++// JwtGetter gets JWT token from cookie and add into context+func JwtGetter() app.MiddlewareFunc {+ return func(next app.HandlerFunc) app.HandlerFunc {+ return func(c app.Context) error {++ if cookie, err := c.Cookie("auth"); err == nil {+ if claims, err := Decode(cookie.Value); err == nil {+ c.SetClaims(claims)+ } else {+ c.Logger().Error(err)+ }+ }++ return next(c)+ }+ }+}++// JwtSetter sets JWT token into cookie+func JwtSetter() app.MiddlewareFunc {+ return func(next app.HandlerFunc) app.HandlerFunc {+ return func(c app.Context) error {++ query := c.Request().URL.Query()++ jwt := query.Get("jwt")+ if jwt != "" {+ c.SetCookie(&http.Cookie{+ Name: "auth",+ Value: jwt,+ HttpOnly: true,+ Path: "/",+ })++ scheme := "http"+ if c.Request().TLS != nil {+ scheme = "https"+ }++ query.Del("jwt")++ url := scheme + "://" + c.Request().Host + c.Request().URL.Path+ querystring := query.Encode()+ if querystring != "" {+ url += "?" + querystring+ }++ return c.Redirect(http.StatusTemporaryRedirect, url)+ }++ return next(c)+ }+ }+}++// HostChecker checks for a specific host+func HostChecker(baseURL string) app.MiddlewareFunc {+ return func(next app.HandlerFunc) app.HandlerFunc {+ return func(c app.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/infra/middleware_test.go b/app/infra/middleware_test.gonew file mode 100644index 000000000..2b096b210--- /dev/null+++ b/app/infra/middleware_test.go@@ -0,0 +1,194 @@+package infra_test++import (+ "net/http"+ "net/http/httptest"+ "testing"++ "github.com/WeCanHearYou/wechy/app"+ "github.com/WeCanHearYou/wechy/app/identity"+ "github.com/WeCanHearYou/wechy/app/infra"+ "github.com/WeCanHearYou/wechy/app/mock"+ "github.com/labstack/echo"+ . "github.com/onsi/gomega"+)++func TestIsAuthenticated_WithToken(t *testing.T) {+ RegisterTestingT(t)++ token, _ := infra.Encode(&app.WechyClaims{+ UserName: "Jon Snow",+ })++ server := mock.NewServer()+ req, _ := http.NewRequest(echo.GET, "/", nil)+ rec := httptest.NewRecorder()+ c := server.NewContext(req, rec)+ c.Request().AddCookie(&http.Cookie{+ Name: "auth",+ Value: token,+ })++ mw := infra.IsAuthenticated()+ mw(func(c app.Context) error {+ return c.NoContent(http.StatusOK)+ })(c)++ Expect(rec.Code).To(Equal(http.StatusOK))+}++func TestIsAuthenticated_WithoutToken(t *testing.T) {+ RegisterTestingT(t)++ server := mock.NewServer()+ req, _ := http.NewRequest(echo.GET, "/", nil)+ rec := httptest.NewRecorder()+ c := server.NewContext(req, rec)++ mw := infra.IsAuthenticated()+ mw(func(c app.Context) error {+ return c.NoContent(http.StatusOK)+ })(c)++ Expect(rec.Code).To(Equal(http.StatusForbidden))+}++func TestJwtGetter_NoCookie(t *testing.T) {+ RegisterTestingT(t)++ server := mock.NewServer()+ req, _ := http.NewRequest(echo.GET, "/", nil)+ rec := httptest.NewRecorder()+ c := server.NewContext(req, rec)++ mw := identity.JwtGetter()+ mw(func(c app.Context) error {+ if c.IsAuthenticated() {+ return c.NoContent(http.StatusOK)+ } else {+ return c.NoContent(http.StatusNoContent)+ }+ })(c)++ Expect(rec.Code).To(Equal(http.StatusNoContent))+}++func TestJwtGetter_WithCookie(t *testing.T) {+ RegisterTestingT(t)++ token, _ := infra.Encode(&app.WechyClaims{+ UserName: "Jon Snow",+ })++ server := mock.NewServer()+ req, _ := http.NewRequest(echo.GET, "/", nil)+ rec := httptest.NewRecorder()+ c := server.NewContext(req, rec)+ c.Request().AddCookie(&http.Cookie{+ Name: "auth",+ Value: token,+ })++ mw := identity.JwtGetter()+ mw(func(c app.Context) error {+ return c.String(http.StatusOK, c.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)++ server := mock.NewServer()+ req, _ := http.NewRequest(echo.GET, "/abc", nil)+ rec := httptest.NewRecorder()+ c := server.NewContext(req, rec)+ c.Request().Host = "orange.test.canhearyou.com"++ mw := identity.JwtSetter()+ mw(func(c app.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, _ := infra.Encode(&app.WechyClaims{+ UserName: "Jon Snow",+ })++ server := mock.NewServer()+ req, _ := http.NewRequest(echo.GET, "/abc?jwt="+token, nil)+ rec := httptest.NewRecorder()+ c := server.NewContext(req, rec)+ c.Request().Host = "orange.test.canhearyou.com"++ mw := identity.JwtSetter()+ mw(func(c app.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, _ := infra.Encode(&app.WechyClaims{+ UserName: "Jon Snow",+ })++ server := mock.NewServer()+ req, _ := http.NewRequest(echo.GET, "/abc?jwt="+token+"&foo=bar", nil)+ rec := httptest.NewRecorder()+ c := server.NewContext(req, rec)+ c.Request().Host = "orange.test.canhearyou.com"++ mw := identity.JwtSetter()+ mw(func(c app.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"))+}++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 := identity.HostChecker("http://login.test.canhearyou.com")+ mw(func(c app.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 := identity.HostChecker("login.test.canhearyou.com")+ mw(app.HandlerFunc(func(c app.Context) error {+ return c.NoContent(http.StatusOK)+ }))(c)++ Expect(rec.Code).To(Equal(http.StatusBadRequest))+}diff --git a/router.go b/router.goindex 494157a1d..cf0e8c890 100644--- a/router.go+++ b/router.go@@ -93,33 +93,41 @@ func GetMainEngine(ctx *WechyServices) *echo.Echo {router.Use(middleware.Gzip())router.Static("/favicon.ico", "favicon.ico")-assetsGroup := group(router, "/assets", app.OneYearCache()){assetsGroup.Static("/", "dist")}- authGroup := group(router, "/oauth", identity.HostChecker(env.MustGet("AUTH_ENDPOINT")))+ oauthHandlers := identity.OAuth(ctx.Tenant, ctx.OAuth, ctx.User)+ authGroup := group(router, "/oauth", infra.HostChecker(env.MustGet("AUTH_ENDPOINT"))){- get(authGroup, "/facebook", identity.OAuth(ctx.Tenant, ctx.OAuth, ctx.User).Login(identity.OAuthFacebookProvider))- get(authGroup, "/facebook/callback", identity.OAuth(ctx.Tenant, ctx.OAuth, ctx.User).Callback(identity.OAuthFacebookProvider))- get(authGroup, "/google", identity.OAuth(ctx.Tenant, ctx.OAuth, ctx.User).Login(identity.OAuthGoogleProvider))- get(authGroup, "/google/callback", identity.OAuth(ctx.Tenant, ctx.OAuth, ctx.User).Callback(identity.OAuthGoogleProvider))+ get(authGroup, "/facebook", oauthHandlers.Login(identity.OAuthFacebookProvider))+ get(authGroup, "/facebook/callback", oauthHandlers.Callback(identity.OAuthFacebookProvider))+ get(authGroup, "/google", oauthHandlers.Login(identity.OAuthGoogleProvider))+ get(authGroup, "/google/callback", oauthHandlers.Callback(identity.OAuthGoogleProvider))}appGroup := group(router, ""){- use(appGroup, identity.JwtGetter())- use(appGroup, identity.JwtSetter())+ use(appGroup, infra.JwtGetter())+ use(appGroup, infra.JwtSetter())use(appGroup, identity.MultiTenant(ctx.Tenant))get(appGroup, "/", feedback.Handlers(ctx.Idea).List())get(appGroup, "/ideas/:id", feedback.Handlers(ctx.Idea).Details())- get(appGroup, "/logout", identity.OAuth(ctx.Tenant, ctx.OAuth, ctx.User).Logout())-+ get(appGroup, "/logout", oauthHandlers.Logout())get(appGroup, "/api/status", infra.Status(ctx.Health, ctx.Settings))- post(appGroup, "/api/ideas", feedback.Handlers(ctx.Idea).PostIdea())- post(appGroup, "/api/ideas/:id/comments", feedback.Handlers(ctx.Idea).PostComment())+ }++ securedGroup := group(router, "")+ {+ use(securedGroup, infra.JwtGetter())+ use(securedGroup, infra.JwtSetter())+ use(securedGroup, identity.MultiTenant(ctx.Tenant))+ use(securedGroup, infra.IsAuthenticated())++ post(securedGroup, "/api/ideas", feedback.Handlers(ctx.Idea).PostIdea())+ post(securedGroup, "/api/ideas/:id/comments", feedback.Handlers(ctx.Idea).PostComment())}return router