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

8
pkg/routes/rate_limit.go
View File

@ -20,8 +20,8 @@ package routes
import (
"code.vikunja.io/api/pkg/config"
"code.vikunja.io/api/pkg/log"
"code.vikunja.io/api/pkg/models"
"code.vikunja.io/api/pkg/red"
apiv1 "code.vikunja.io/api/pkg/routes/api/v1"
"github.com/labstack/echo/v4"
"github.com/ulule/limiter/v3"
"github.com/ulule/limiter/v3/drivers/store/memory"
@ -40,11 +40,11 @@ func RateLimit(rateLimiter *limiter.Limiter) echo.MiddlewareFunc {
case "ip":
rateLimitKey = c.RealIP()
case "user":
user, err := models.GetCurrentUser(c)
auth, err := apiv1.GetAuthFromClaims(c)
if err != nil {
log.Errorf("Error while getting the current user for rate limiting: %s", err)
log.Errorf("Error getting auth from jwt claims: %v", err)
}
rateLimitKey = "user_" + strconv.FormatInt(user.ID, 10)
rateLimitKey = "user_" + strconv.FormatInt(auth.GetID(), 10)
default:
log.Errorf("Unknown rate limit kind configured: %s", config.RateLimitKind.GetString())
}