This commit is contained in:
vipg
2026-02-09 17:50:39 +08:00
parent c7b11dca35
commit 2ae47c5049
4 changed files with 51 additions and 3 deletions

View File

@@ -5,6 +5,7 @@ import (
"time" "time"
"common/utils" "common/utils"
"common/logger"
"github.com/golang-jwt/jwt/v5" "github.com/golang-jwt/jwt/v5"
) )
@@ -27,7 +28,11 @@ func GenerateToken(userID string) (string, error) {
ExpiresAt: jwt.NewNumericDate(now.Add(ttl)), ExpiresAt: jwt.NewNumericDate(now.Add(ttl)),
} }
token := jwt.NewWithClaims(jwt.SigningMethodHS256, claims) token := jwt.NewWithClaims(jwt.SigningMethodHS256, claims)
return token.SignedString([]byte(secret)) signed, err := token.SignedString([]byte(secret))
if err == nil {
logger.L().Printf("jwt generate success user=%s exp=%s", userID, claims.ExpiresAt.Time.Format(time.RFC3339))
}
return signed, err
} }
func ParseToken(tokenStr string) (string, error) { func ParseToken(tokenStr string) (string, error) {
@@ -40,10 +45,13 @@ func ParseToken(tokenStr string) (string, error) {
return []byte(secret), nil return []byte(secret), nil
}) })
if err != nil { if err != nil {
logger.L().Printf("jwt parse error: %v", err)
return "", err return "", err
} }
if !tkn.Valid { if !tkn.Valid {
logger.L().Printf("jwt invalid")
return "", errors.New("token_invalid") return "", errors.New("token_invalid")
} }
logger.L().Printf("jwt parse success user=%s exp=%s", claims.Subject, claims.ExpiresAt.Time.Format(time.RFC3339))
return claims.Subject, nil return claims.Subject, nil
} }

View File

@@ -0,0 +1,39 @@
package httpx
import (
"context"
"net/http"
"strings"
"common/auth"
)
type userIDKey struct{}
func AuthRequired() func(http.Handler) http.Handler {
return func(next http.Handler) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
ah := r.Header.Get("Authorization")
if ah == "" || !strings.HasPrefix(ah, "Bearer ") {
Unauthorized(w, "unauthorized")
return
}
token := strings.TrimSpace(strings.TrimPrefix(ah, "Bearer "))
sub, err := auth.ParseToken(token)
if err != nil || sub == "" {
Unauthorized(w, "unauthorized")
return
}
ctx := context.WithValue(r.Context(), userIDKey{}, sub)
next.ServeHTTP(w, r.WithContext(ctx))
})
}
}
func UserID(r *http.Request) string {
v := r.Context().Value(userIDKey{})
if id, ok := v.(string); ok {
return id
}
return ""
}

View File

@@ -89,5 +89,5 @@ func (h *Handler) Root(w http.ResponseWriter, r *http.Request) {
httpx.MethodNotAllowed(w, string(codes.MethodNotAllowed)) httpx.MethodNotAllowed(w, string(codes.MethodNotAllowed))
return return
} }
httpx.OK(w, map[string]string{"service": "user"}) httpx.OK(w, map[string]string{"service": "user", "user_id": httpx.UserID(r)})
} }

View File

@@ -3,6 +3,7 @@ package router
import ( import (
"net/http" "net/http"
"common/httpx"
"user/internal/handler" "user/internal/handler"
) )
@@ -10,7 +11,7 @@ func New(h *handler.Handler) http.Handler {
mux := http.NewServeMux() mux := http.NewServeMux()
mux.HandleFunc("/healthz", h.Healthz) mux.HandleFunc("/healthz", h.Healthz)
mux.HandleFunc("/version", h.Version) mux.HandleFunc("/version", h.Version)
mux.HandleFunc("/", h.Root) mux.Handle("/", httpx.AuthRequired()(http.HandlerFunc(h.Root)))
mux.HandleFunc("/register", h.Register) mux.HandleFunc("/register", h.Register)
mux.HandleFunc("/login", h.Login) mux.HandleFunc("/login", h.Login)
return mux return mux