Skip to content
This repository was archived by the owner on Nov 11, 2024. It is now read-only.

gf upgrade & use unix timestamp #30

Open
stardemo wants to merge 2 commits into
base: v2
Choose a base branch
from
Open

gf upgrade & use unix timestamp #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fc37355
fix(timestamp): fix unix timestamp miss match jwt
Mar 31, 2024
44add8c
fix(timestamp): fix unix timestamp miss match jwt
Mar 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 23 additions & 24 deletions auth_jwt.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,15 @@ package jwt
import (
"context"
"crypto/rsa"
"github.com/golang-jwt/jwt/v4"
"io/ioutil"
"net/http"
"strings"
"time"

"github.com/gogf/gf/v2/crypto/gmd5"
"github.com/gogf/gf/v2/frame/g"
"github.com/gogf/gf/v2/net/ghttp"
"github.com/gogf/gf/v2/os/gcache"
"github.com/golang-jwt/jwt/v4"
)

// MapClaims type that uses the map[string]interface{} for JSON decoding
Expand Down Expand Up @@ -192,8 +191,8 @@ func New(mw *GfJWTMiddleware) *GfJWTMiddleware {

if mw.Unauthorized == nil {
mw.Unauthorized = func(ctx context.Context, code int, message string) {
r := g.RequestFromCtx(ctx)
r.Response.WriteJson(g.Map{
r := ghttp.RequestFromCtx(ctx)
r.Response.WriteJson(MapClaims{
"code": code,
"message": message,
})
Expand Down Expand Up @@ -264,7 +263,7 @@ func (mw *GfJWTMiddleware) MiddlewareFunc() ghttp.HandlerFunc {

// GetClaimsFromJWT get claims from JWT token
func (mw *GfJWTMiddleware) GetClaimsFromJWT(ctx context.Context) (MapClaims, string, error) {
r := g.RequestFromCtx(ctx)
r := ghttp.RequestFromCtx(ctx)

token, err := mw.parseToken(r)
if err != nil {
Expand Down Expand Up @@ -301,7 +300,7 @@ func (mw *GfJWTMiddleware) LoginHandler(ctx context.Context) (tokenString string
return
}

r := g.RequestFromCtx(ctx)
r := ghttp.RequestFromCtx(ctx)
// Create the token
token := jwt.New(jwt.GetSigningMethod(mw.SigningAlgorithm))
claims := token.Claims.(jwt.MapClaims)
Expand All @@ -318,8 +317,8 @@ func (mw *GfJWTMiddleware) LoginHandler(ctx context.Context) (tokenString string
}

expire = mw.TimeFunc().Add(mw.Timeout)
claims["exp"] = expire.UnixNano() / 1e6
claims["orig_iat"] = mw.TimeFunc().UnixNano() / 1e6
claims["exp"] = expire.Unix()
claims["orig_iat"] = mw.TimeFunc().Unix()

tokenString, err = mw.signedString(token)
if err != nil {
Expand All @@ -330,7 +329,7 @@ func (mw *GfJWTMiddleware) LoginHandler(ctx context.Context) (tokenString string
// set cookie
if mw.SendCookie {
expireCookie := mw.TimeFunc().Add(mw.CookieMaxAge)
maxAge := (expireCookie.UnixNano() - mw.TimeFunc().UnixNano()) / 1e6
maxAge := expireCookie.Unix() - mw.TimeFunc().Unix()
r.Cookie.SetCookie(mw.CookieName, tokenString, mw.CookieDomain, "/", time.Duration(maxAge)*time.Second)
}

Expand All @@ -339,7 +338,7 @@ func (mw *GfJWTMiddleware) LoginHandler(ctx context.Context) (tokenString string

// LogoutHandler can be used by clients to remove the jwt cookie (if set)
func (mw *GfJWTMiddleware) LogoutHandler(ctx context.Context) {
r := g.RequestFromCtx(ctx)
r := ghttp.RequestFromCtx(ctx)

// delete auth cookie
if mw.SendCookie {
Expand Down Expand Up @@ -382,7 +381,7 @@ func (mw *GfJWTMiddleware) RefreshToken(ctx context.Context) (string, time.Time,
return "", time.Now(), err
}

r := g.RequestFromCtx(ctx)
r := ghttp.RequestFromCtx(ctx)
// Create the token
newToken := jwt.New(jwt.GetSigningMethod(mw.SigningAlgorithm))
newClaims := newToken.Claims.(jwt.MapClaims)
Expand All @@ -392,8 +391,8 @@ func (mw *GfJWTMiddleware) RefreshToken(ctx context.Context) (string, time.Time,
}

expire := mw.TimeFunc().Add(mw.Timeout)
newClaims["exp"] = expire.UnixNano() / 1e6
newClaims["orig_iat"] = mw.TimeFunc().UnixNano() / 1e6
newClaims["exp"] = expire.Unix()
newClaims["orig_iat"] = mw.TimeFunc().Unix()
tokenString, err := mw.signedString(newToken)
if err != nil {
return "", time.Now(), err
Expand All @@ -417,7 +416,7 @@ func (mw *GfJWTMiddleware) RefreshToken(ctx context.Context) (string, time.Time,

// CheckIfTokenExpire check if token expire
func (mw *GfJWTMiddleware) CheckIfTokenExpire(ctx context.Context) (jwt.MapClaims, string, error) {
r := g.RequestFromCtx(ctx)
r := ghttp.RequestFromCtx(ctx)

token, err := mw.parseToken(r)
if err != nil {
Expand All @@ -444,7 +443,7 @@ func (mw *GfJWTMiddleware) CheckIfTokenExpire(ctx context.Context) (jwt.MapClaim

exp := int64(claims["exp"].(float64))

if exp < (mw.TimeFunc().Add(-mw.MaxRefresh).UnixNano() / 1e6) {
if exp < (mw.TimeFunc().Add(-mw.MaxRefresh).Unix()) {
return nil, "", ErrExpiredToken
}

Expand All @@ -463,8 +462,8 @@ func (mw *GfJWTMiddleware) TokenGenerator(data interface{}) (string, time.Time,
}

expire := mw.TimeFunc().UTC().Add(mw.Timeout)
claims["exp"] = expire.UnixNano() / 1e6
claims["orig_iat"] = mw.TimeFunc().UnixNano() / 1e6
claims["exp"] = expire.Unix()
claims["orig_iat"] = mw.TimeFunc().Unix()
tokenString, err := mw.signedString(token)
if err != nil {
return "", time.Time{}, err
Expand All @@ -475,7 +474,7 @@ func (mw *GfJWTMiddleware) TokenGenerator(data interface{}) (string, time.Time,

// GetToken help to get the JWT token string
func (mw *GfJWTMiddleware) GetToken(ctx context.Context) string {
r := g.RequestFromCtx(ctx)
r := ghttp.RequestFromCtx(ctx)
token := r.Get(TokenKey).String()
if len(token) == 0 {
return ""
Expand All @@ -485,7 +484,7 @@ func (mw *GfJWTMiddleware) GetToken(ctx context.Context) string {

// GetPayload help to get the payload map
func (mw *GfJWTMiddleware) GetPayload(ctx context.Context) string {
r := g.RequestFromCtx(ctx)
r := ghttp.RequestFromCtx(ctx)
token := r.Get(PayloadKey).String()
if len(token) == 0 {
return ""
Expand All @@ -495,13 +494,13 @@ func (mw *GfJWTMiddleware) GetPayload(ctx context.Context) string {

// GetIdentity help to get the identity
func (mw *GfJWTMiddleware) GetIdentity(ctx context.Context) interface{} {
r := g.RequestFromCtx(ctx)
r := ghttp.RequestFromCtx(ctx)
return r.Get(mw.IdentityKey)
}

// ExtractClaims help to extract the JWT claims
func ExtractClaims(ctx context.Context) MapClaims {
r := g.RequestFromCtx(ctx)
r := ghttp.RequestFromCtx(ctx)
claims := r.GetParam(PayloadKey).Interface()
return claims.(MapClaims)
}
Expand Down Expand Up @@ -712,7 +711,7 @@ func (mw *GfJWTMiddleware) parseTokenString(token string) (*jwt.Token, error) {
}

func (mw *GfJWTMiddleware) unauthorized(ctx context.Context, code int, message string) {
r := g.RequestFromCtx(ctx)
r := ghttp.RequestFromCtx(ctx)
r.Header.Set("WWW-Authenticate", "JWT realm="+mw.Realm)
mw.Unauthorized(ctx, code, message)
if !mw.DisabledAbort {
Expand All @@ -721,7 +720,7 @@ func (mw *GfJWTMiddleware) unauthorized(ctx context.Context, code int, message s
}

func (mw *GfJWTMiddleware) middlewareImpl(ctx context.Context) {
r := g.RequestFromCtx(ctx)
r := ghttp.RequestFromCtx(ctx)

claims, token, err := mw.GetClaimsFromJWT(ctx)
if err != nil {
Expand All @@ -739,7 +738,7 @@ func (mw *GfJWTMiddleware) middlewareImpl(ctx context.Context) {
return
}

if int64(claims["exp"].(float64)) < (mw.TimeFunc().UnixNano() / 1e6) {
if int64(claims["exp"].(float64)) < (mw.TimeFunc().Unix()) {
mw.unauthorized(ctx, http.StatusUnauthorized, mw.HTTPStatusMessageFunc(ErrExpiredToken, ctx))
return
}
Expand Down
6 changes: 3 additions & 3 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
module github.com/gogf/gf-jwt/v2

go 1.15
go 1.20

require (
github.com/gogf/gf/v2 v2.0.0-rc3
github.com/golang-jwt/jwt/v4 v4.3.0
github.com/gogf/gf/v2 v2.6.4
github.com/golang-jwt/jwt/v4 v4.5.0
)