diff --git a/common/middleware/permission.go b/common/middleware/permission.go index 766f254..00d1b1f 100644 --- a/common/middleware/permission.go +++ b/common/middleware/permission.go @@ -1,6 +1,7 @@ package middleware import ( + "github.com/casbin/casbin/v2/util" "net/http" "github.com/gin-gonic/gin" @@ -17,19 +18,31 @@ func AuthCheckRole() gin.HandlerFunc { data, _ := c.Get(jwtauth.JwtPayloadKey) v := data.(jwtauth.MapClaims) e := sdk.Runtime.GetCasbinKey(c.Request.Host) - var res bool + var res, casbinExclude bool var err error //检查权限 if v["rolekey"] == "admin" { res = true - } else { - res, err = e.Enforce(v["rolekey"], c.Request.URL.Path, c.Request.Method) - if err != nil { - log.Errorf("AuthCheckRole error:%s method:%s path:%s", err, c.Request.Method, c.Request.URL.Path) - response.Error(c, 500, err, "") - return + c.Next() + return + } + for _, i := range CasbinExclude { + if util.KeyMatch2(c.Request.URL.Path, i.Url) && c.Request.Method == i.Method { + casbinExclude = true + break } } + if casbinExclude { + log.Infof("Casbin exclusion, no validation method:%s path:%s", c.Request.Method, c.Request.URL.Path) + c.Next() + return + } + res, err = e.Enforce(v["rolekey"], c.Request.URL.Path, c.Request.Method) + if err != nil { + log.Errorf("AuthCheckRole error:%s method:%s path:%s", err, c.Request.Method, c.Request.URL.Path) + response.Error(c, 500, err, "") + return + } if res { log.Infof("isTrue: %v role: %s method: %s path: %s", res, v["rolekey"], c.Request.Method, c.Request.URL.Path) @@ -43,5 +56,6 @@ func AuthCheckRole() gin.HandlerFunc { c.Abort() return } + } }