Add OpenAPI OAuth support in guards

- Introduced guardOpenapiOauth function to handle OAuth token validation and session ID retrieval.
- Updated guardCookieJWT and guardBearerJWT functions to integrate OpenAPI OAuth checks.
- Enhanced backward compatibility for existing cookie-based JWT handling.
- Added utility functions for access token and session ID extraction from requests.
This commit is contained in:
Max 2025-08-05 11:36:44 +08:00
parent 4a2106371e
commit f464638213

View file

@ -6,6 +6,8 @@ import (
"github.com/gin-gonic/gin"
"github.com/google/uuid"
"github.com/yaoapp/yao/helper"
"github.com/yaoapp/yao/openapi"
"github.com/yaoapp/yao/openapi/oauth"
"github.com/yaoapp/yao/widgets/chart"
"github.com/yaoapp/yao/widgets/dashboard"
@ -39,11 +41,18 @@ func guardCookieTrace(c *gin.Context) {
return
}
c.Set("__sid", sid)
return
}
// Cookie Cookie JWT
func guardCookieJWT(c *gin.Context) {
// OpenAPI OAuth
if openapi.Server != nil {
guardOpenapiOauth(c)
return
}
// Backward compatibility
tokenString, err := c.Cookie("__tk")
if err != nil {
c.JSON(403, gin.H{"code": 403, "message": "Not Authorized"})
@ -59,11 +68,18 @@ func guardCookieJWT(c *gin.Context) {
claims := helper.JwtValidate(tokenString)
c.Set("__sid", claims.SID)
return
}
// JWT Bearer JWT
func guardBearerJWT(c *gin.Context) {
// OpenAPI OAuth
if openapi.Server != nil {
guardOpenapiOauth(c)
return
}
// Backward compatibility
tokenString := c.Request.Header.Get("Authorization")
tokenString = strings.TrimSpace(strings.TrimPrefix(tokenString, "Bearer "))
if tokenString == "" {
@ -101,3 +117,52 @@ func guardCrossOrigin(c *gin.Context) {
}
c.Next()
}
// Openapi Oauth
func guardOpenapiOauth(c *gin.Context) {
s := oauth.OAuth
token := getAccessToken(c)
if token == "" {
c.JSON(403, gin.H{"code": 403, "message": "Not Authorized"})
c.Abort()
return
}
// Validate the token
_, err := s.VerifyToken(token)
if err != nil {
c.JSON(403, gin.H{"code": 403, "message": "Not Authorized"})
c.Abort()
return
}
// Get the session ID
sid := getSessionID(c)
if sid == "" {
c.JSON(403, gin.H{"code": 403, "message": "Not Authorized"})
c.Abort()
return
}
c.Set("__sid", sid)
}
func getAccessToken(c *gin.Context) string {
token := c.GetHeader("Authorization")
if token == "" || token == "Bearer undefined" {
cookie, err := c.Cookie("__Host-access_token")
if err != nil {
return ""
}
token = cookie
}
return strings.TrimPrefix(token, "Bearer ")
}
func getSessionID(c *gin.Context) string {
sid, err := c.Cookie("__Host-session_id")
if err != nil {
return ""
}
return sid
}