Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

enhancement: block non-API resources for API-originated tokens (#490)

Guilherme Oenning236e6efb9efa
diff --git a/app/cmd/routes.go b/app/cmd/routes.go
index 0dc177d6e..2291a1276 100644
--- a/app/cmd/routes.go
+++ b/app/cmd/routes.go
@@ -69,10 +69,13 @@ func routes(r *web.Engine) *web.Engine {
r.Post("/_api/signin/complete", handlers.CompleteSignInProfile())
r.Post("/_api/signin", handlers.SignInByEmail())
- //From this step, the User might be available
+ //Extract user from cookie and inject it into web.Context (if available)
r.Use(middlewares.User())
- //From this step, block if it's private tenant with unauthenticated user
+ //Block if an API-originated AuthToken requests a non-API resource
+ r.Use(middlewares.CheckAuthTokenOrigin())
+
+ //Block if it's private tenant with unauthenticated user
r.Use(middlewares.CheckTenantPrivacy())
r.Get("/", handlers.Index())
diff --git a/app/middlewares/auth.go b/app/middlewares/auth.go
index fa9f68309..360322b39 100644
--- a/app/middlewares/auth.go
+++ b/app/middlewares/auth.go
@@ -2,6 +2,7 @@ package middlewares
import (
"github.com/getfider/fider/app/models"
+ "github.com/getfider/fider/app/pkg/jwt"
"github.com/getfider/fider/app/pkg/web"
)
@@ -17,6 +18,21 @@ func IsAuthenticated() web.MiddlewareFunc {
}
}
+// CheckAuthTokenOrigin blocks API-originated AuthToken requests a non-API resource
+func CheckAuthTokenOrigin() web.MiddlewareFunc {
+ return func(next web.HandlerFunc) web.HandlerFunc {
+ return func(c web.Context) error {
+ claims := c.Claims()
+ if claims != nil {
+ if !c.Request.IsAPI() && claims.Origin == jwt.FiderClaimsOriginAPI {
+ return c.Unauthorized()
+ }
+ }
+ return next(c)
+ }
+ }
+}
+
// IsAuthorized blocks non-authorized requests
func IsAuthorized(roles ...models.Role) web.MiddlewareFunc {
return func(next web.HandlerFunc) web.HandlerFunc {
diff --git a/app/middlewares/auth_test.go b/app/middlewares/auth_test.go
index 79b1185c6..a638d5ad0 100644
--- a/app/middlewares/auth_test.go
+++ b/app/middlewares/auth_test.go
@@ -7,6 +7,7 @@ import (
"github.com/getfider/fider/app/middlewares"
"github.com/getfider/fider/app/models"
. "github.com/getfider/fider/app/pkg/assert"
+ "github.com/getfider/fider/app/pkg/jwt"
"github.com/getfider/fider/app/pkg/mock"
"github.com/getfider/fider/app/pkg/web"
)
@@ -59,3 +60,64 @@ func TestIsAuthenticated_WithoutUser(t *testing.T) {
Expect(status).Equals(http.StatusForbidden)
}
+
+func TestCheckAuthTokenOrigin_WithoutClaims(t *testing.T) {
+ RegisterT(t)
+
+ server, _ := mock.NewServer()
+ server.Use(middlewares.CheckAuthTokenOrigin())
+
+ status, _ := server.Execute(func(c web.Context) error {
+ return c.NoContent(http.StatusOK)
+ })
+
+ Expect(status).Equals(http.StatusOK)
+}
+
+func TestCheckAuthTokenOrigin_WithUIClaims_OnAPIResource(t *testing.T) {
+ RegisterT(t)
+
+ server, _ := mock.NewServer()
+ server.Use(middlewares.CheckAuthTokenOrigin())
+
+ status, _ := server.
+ WithURL("http://example.com/api/echo").
+ WithClaims(&jwt.FiderClaims{Origin: jwt.FiderClaimsOriginUI}).
+ Execute(func(c web.Context) error {
+ return c.NoContent(http.StatusOK)
+ })
+
+ Expect(status).Equals(http.StatusOK)
+}
+
+func TestCheckAuthTokenOrigin_WithAPIClaims_OnAPIResource(t *testing.T) {
+ RegisterT(t)
+
+ server, _ := mock.NewServer()
+ server.Use(middlewares.CheckAuthTokenOrigin())
+
+ status, _ := server.
+ WithURL("http://example.com/api/echo").
+ WithClaims(&jwt.FiderClaims{Origin: jwt.FiderClaimsOriginAPI}).
+ Execute(func(c web.Context) error {
+ return c.NoContent(http.StatusOK)
+ })
+
+ Expect(status).Equals(http.StatusOK)
+}
+
+func TestCheckAuthTokenOrigin_WithAPIClaims_OnUIResource(t *testing.T) {
+ RegisterT(t)
+
+ server, _ := mock.NewServer()
+ server.Use(middlewares.CheckAuthTokenOrigin())
+
+ status, _ := server.
+ WithURL("http://example.com/").
+ WithClaims(&jwt.FiderClaims{Origin: jwt.FiderClaimsOriginAPI}).
+ Execute(func(c web.Context) error {
+ return c.NoContent(http.StatusOK)
+ })
+
+ Expect(status).Equals(http.StatusForbidden)
+}
diff --git a/app/middlewares/domain.go b/app/middlewares/domain.go
index 38e5321ec..69013987e 100644
--- a/app/middlewares/domain.go
+++ b/app/middlewares/domain.go
@@ -109,6 +109,7 @@ func User() web.MiddlewareFunc {
claims, err := jwt.DecodeFiderClaims(token)
if err != nil {
c.RemoveCookie(web.CookieAuthName)
+ c.SetClaims(claims)
return next(c)
}
diff --git a/app/pkg/jwt/jwt.go b/app/pkg/jwt/jwt.go
index dd0dd9094..1905ff6e6 100644
--- a/app/pkg/jwt/jwt.go
+++ b/app/pkg/jwt/jwt.go
@@ -11,11 +11,19 @@ var jwtSecret = env.MustGet("JWT_SECRET")
// Metadata is the basic JWT information
type Metadata = jwtgo.StandardClaims
+const (
+ //FiderClaimsOriginUI is assigned to Fider claims when the Auth Token is generated through the UI
+ FiderClaimsOriginUI = "ui"
+ //FiderClaimsOriginAPI is assigned to Fider claims when the Auth Token is generated through the API
+ FiderClaimsOriginAPI = "api"
+)
+
// FiderClaims represents what goes into JWT tokens
type FiderClaims struct {
UserID int `json:"user/id"`
UserName string `json:"user/name"`
UserEmail string `json:"user/email"`
+ Origin string `json:"origin"`
Metadata
}
diff --git a/app/pkg/mock/server.go b/app/pkg/mock/server.go
index 123c9bdf4..775fabdc8 100644
--- a/app/pkg/mock/server.go
+++ b/app/pkg/mock/server.go
@@ -10,6 +10,7 @@ import (
"github.com/getfider/fider/app"
"github.com/getfider/fider/app/models"
"github.com/getfider/fider/app/pkg/jsonq"
+ "github.com/getfider/fider/app/pkg/jwt"
"github.com/getfider/fider/app/pkg/web"
)
@@ -80,6 +81,12 @@ func (s *Server) AddCookie(name string, value string) *Server {
return s
}
+// WithClaims set current context user claims
+func (s *Server) WithClaims(claims *jwt.FiderClaims) *Server {
+ s.context.SetClaims(claims)
+ return s
+}
+
// WithURL set current context Request URL
func (s *Server) WithURL(fullURL string) *Server {
u, _ := url.Parse(fullURL)
diff --git a/app/pkg/web/context.go b/app/pkg/web/context.go
index 2f10a1246..c37fe893b 100644
--- a/app/pkg/web/context.go
+++ b/app/pkg/web/context.go
@@ -16,6 +16,7 @@ import (
"github.com/getfider/fider/app/pkg/dbx"
"github.com/getfider/fider/app/pkg/env"
"github.com/getfider/fider/app/pkg/errors"
+ "github.com/getfider/fider/app/pkg/jwt"
"github.com/getfider/fider/app/pkg/log"
"github.com/getfider/fider/app/pkg/validate"
"github.com/getfider/fider/app/pkg/worker"
@@ -57,6 +58,7 @@ var (
preffixKey = "__CTX_"
tenantContextKey = preffixKey + "TENANT"
userContextKey = preffixKey + "USER"
+ claimsContextKey = preffixKey + "CLAIMS"
transactionContextKey = preffixKey + "TRANSACTION"
servicesContextKey = preffixKey + "SERVICES"
tasksContextKey = preffixKey + "TASKS"
@@ -278,6 +280,20 @@ func (ctx *Context) AddParam(name, value string) {
ctx.params[name] = value
}
+//Claims returns current user claims
+func (ctx *Context) Claims() *jwt.FiderClaims {
+ claims, ok := ctx.Get(claimsContextKey).(*jwt.FiderClaims)
+ if ok {
+ return claims
+ }
+ return nil
+}
+
+//SetClaims update HTTP context with current user claims
+func (ctx *Context) SetClaims(claims *jwt.FiderClaims) {
+ ctx.Set(claimsContextKey, claims)
+}
+
//User returns authenticated user
func (ctx *Context) User() *models.User {
user, ok := ctx.Get(userContextKey).(*models.User)
diff --git a/app/pkg/web/request.go b/app/pkg/web/request.go
index 8466422ec..f0b002405 100644
--- a/app/pkg/web/request.go
+++ b/app/pkg/web/request.go
@@ -4,6 +4,7 @@ import (
"io/ioutil"
"net/http"
"net/url"
+ "strings"
"github.com/getfider/fider/app/pkg/errors"
)
@@ -77,3 +78,8 @@ func (r *Request) Cookie(name string) (*http.Cookie, error) {
func (r *Request) AddCookie(cookie *http.Cookie) {
r.instance.AddCookie(cookie)
}
+
+// IsAPI returns true if its a request for an API resource
+func (r *Request) IsAPI() bool {
+ return strings.HasPrefix(r.URL.Path, "/api/")
+}
diff --git a/app/pkg/web/request_test.go b/app/pkg/web/request_test.go
index 2140f8721..07395b4f5 100644
--- a/app/pkg/web/request_test.go
+++ b/app/pkg/web/request_test.go
@@ -75,6 +75,7 @@ func TestRequest_BehindTLSTerminationProxy(t *testing.T) {
Expect(req.URL.Hostname()).Equals("feedback.mycompany.com")
Expect(req.URL.Scheme).Equals("https")
Expect(req.IsSecure).Equals(true)
+ Expect(req.IsAPI()).IsFalse()
}
func TestRequest_FullURL(t *testing.T) {
@@ -84,13 +85,14 @@ func TestRequest_FullURL(t *testing.T) {
&http.Request{
TLS: &tls.ConnectionState{},
Host: "demo.test.fider.io",
- RequestURI: "/echo?value=Jon",
+ RequestURI: "/api/hello?value=Jon",
},
)
- Expect(req.URL.String()).Equals("https://demo.test.fider.io/echo?value=Jon")
- Expect(req.URL.Path).Equals("/echo")
+ Expect(req.URL.String()).Equals("https://demo.test.fider.io/api/hello?value=Jon")
+ Expect(req.URL.Path).Equals("/api/hello")
Expect(req.URL.Query().Get("value")).Equals("Jon")
- Expect(req.URL.RequestURI()).Equals("/echo?value=Jon")
+ Expect(req.URL.RequestURI()).Equals("/api/hello?value=Jon")
Expect(req.IsSecure).Equals(true)
+ Expect(req.IsAPI()).IsTrue()
}
diff --git a/app/pkg/web/util/webutil.go b/app/pkg/web/util/webutil.go
index 1afb9b0e9..83b3b0a52 100644
--- a/app/pkg/web/util/webutil.go
+++ b/app/pkg/web/util/webutil.go
@@ -16,6 +16,7 @@ func encode(user *models.User) string {
UserID: user.ID,
UserName: user.Name,
UserEmail: user.Email,
+ Origin: jwt.FiderClaimsOriginUI,
Metadata: jwt.Metadata{
ExpiresAt: time.Now().Add(365 * 24 * time.Hour).Unix(),
},