ami/tl-vikunja
1
0
Fork 0
Code Activity

Fixed rate limit panic when authenticatin with a link share auth token (#97)

Browse Source
This commit is contained in:
konrad
2019-09-08 19:11:42 +00:00
committed by Gitea
parent fdd1624121
commit 6140920cb8
3 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/routes/routes.go
View File

@ -48,11 +48,9 @@ import (
"code.vikunja.io/web"
"code.vikunja.io/web/handler"
"github.com/asaskevich/govalidator"
"github.com/dgrijalva/jwt-go"
"github.com/labstack/echo/v4"
"github.com/labstack/echo/v4/middleware"
elog "github.com/labstack/gommon/log"
"net/http"
"strings"
)
@ -109,18 +107,7 @@ func NewEcho() *echo.Echo {
// Handler config
handler.SetAuthProvider(&web.Auths{
AuthObject: func(c echo.Context) (web.Auth, error) {
jwtinf := c.Get("user").(*jwt.Token)
claims := jwtinf.Claims.(jwt.MapClaims)
typ := int(claims["type"].(float64))
if typ == apiv1.AuthTypeLinkShare && config.ServiceEnableLinkSharing.GetBool() {
return models.GetLinkShareFromClaims(claims)
}
if typ == apiv1.AuthTypeUser {
return models.GetUserFromClaims(claims)
}
return nil, echo.NewHTTPError(http.StatusBadRequest, models.Message{Message: "Invalid JWT token."})
},
AuthObject: apiv1.GetAuthFromClaims,
})
handler.SetLoggingProvider(log.GetLogger())