gitlab-com-seaweedfs/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2024-01-19 02:48:24 +00:00
Code Issues Projects Releases Wiki Activity

change from deprecated jwt.StandardClaims to new jwt.RegisteredClaims

Browse source
This commit is contained in:
chrislu 2023-08-21 23:42:39 -07:00
parent 3d5ecc627e
commit c49caff5a1
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
weed/security/jwt.go
View file

@ -17,14 +17,14 @@ type SigningKey []byte
// restricting the access this JWT allows to only a single file. // restricting the access this JWT allows to only a single file.
type SeaweedFileIdClaims struct { type SeaweedFileIdClaims struct {
Fid string `json:"fid"` Fid string `json:"fid"`
jwt.StandardClaims jwt.RegisteredClaims
} }
// SeaweedFilerClaims is created e.g. by S3 proxy server and consumed by Filer server. // SeaweedFilerClaims is created e.g. by S3 proxy server and consumed by Filer server.
// Right now, it only contains the standard claims; but this might be extended later // Right now, it only contains the standard claims; but this might be extended later
// for more fine-grained permissions. // for more fine-grained permissions.
type SeaweedFilerClaims struct { type SeaweedFilerClaims struct {
jwt.StandardClaims jwt.RegisteredClaims
} }
func GenJwtForVolumeServer(signingKey SigningKey, expiresAfterSec int, fileId string) EncodedJwt { func GenJwtForVolumeServer(signingKey SigningKey, expiresAfterSec int, fileId string) EncodedJwt {
@ -34,10 +34,10 @@ func GenJwtForVolumeServer(signingKey SigningKey, expiresAfterSec int, fileId st
claims := SeaweedFileIdClaims{ claims := SeaweedFileIdClaims{
fileId, fileId,
jwt.StandardClaims{}, jwt.RegisteredClaims{},
} }
if expiresAfterSec > 0 { if expiresAfterSec > 0 {
claims.ExpiresAt = time.Now().Add(time.Second * time.Duration(expiresAfterSec)).Unix() claims.ExpiresAt = jwt.NewNumericDate(time.Now().Add(time.Second * time.Duration(expiresAfterSec)))
} }
t := jwt.NewWithClaims(jwt.SigningMethodHS256, claims) t := jwt.NewWithClaims(jwt.SigningMethodHS256, claims)
encoded, e := t.SignedString([]byte(signingKey)) encoded, e := t.SignedString([]byte(signingKey))
@ -56,10 +56,10 @@ func GenJwtForFilerServer(signingKey SigningKey, expiresAfterSec int) EncodedJwt
} }
claims := SeaweedFilerClaims{ claims := SeaweedFilerClaims{
jwt.StandardClaims{}, jwt.RegisteredClaims{},
} }
if expiresAfterSec > 0 { if expiresAfterSec > 0 {
claims.ExpiresAt = time.Now().Add(time.Second * time.Duration(expiresAfterSec)).Unix() claims.ExpiresAt = jwt.NewNumericDate(time.Now().Add(time.Second * time.Duration(expiresAfterSec)))
} }
t := jwt.NewWithClaims(jwt.SigningMethodHS256, claims) t := jwt.NewWithClaims(jwt.SigningMethodHS256, claims)
encoded, e := t.SignedString([]byte(signingKey)) encoded, e := t.SignedString([]byte(signingKey))