Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-08-02 12:25:22 +02:00
Code Issues Releases Activity

feat(logging): replace all the loggers with zerolog EE-4186 (#7663)

Browse source
This commit is contained in:
andres-portainer 2022-09-16 13:18:44 -03:00 • committed by GitHub
parent 53025178ef
commit 36e7981ab7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
109 changed files with 1101 additions and 662 deletions
Download patch file Download diff file Expand all files Collapse all files

11
api/jwt/jwt.go
View file

@ -6,11 +6,12 @@ import (
"os"
"time"
"github.com/golang-jwt/jwt"
"github.com/gorilla/securecookie"
portainer "github.com/portainer/portainer/api"
"github.com/portainer/portainer/api/dataservices"
log "github.com/sirupsen/logrus"
"github.com/golang-jwt/jwt"
"github.com/gorilla/securecookie"
"github.com/rs/zerolog/log"
)
// scope represents JWT scopes that are supported in JWT claims.
@ -132,6 +133,7 @@ func (service *Service) ParseAndVerifyToken(token string) (*portainer.TokenData,
if user.TokenIssueAt > cl.StandardClaims.IssuedAt {
return nil, errInvalidJWTToken
}
return &portainer.TokenData{
ID: portainer.UserID(cl.UserID),
Username: cl.Username,
@ -152,6 +154,7 @@ func parseScope(token string) scope {
}
}
}
return defaultScope
}
@ -168,7 +171,7 @@ func (service *Service) generateSignedToken(data *portainer.TokenData, expiresAt
if _, ok := os.LookupEnv("DOCKER_EXTENSION"); ok {
// Set expiration to 99 years for docker desktop extension.
log.Infof("[message: detected docker desktop extension mode]")
log.Info().Msg("detected docker desktop extension mode")
expiresAt = time.Now().Add(time.Hour * 8760 * 99).Unix()
}