llvy.ltd/casdoor
1
0
Fork 0
mirror of https://github.com/casdoor/casdoor.git synced 2025-07-08 00:50:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: check enforcer should not be nil (#2199)

Browse Source 
* fix: check enforcer should not be nil

* fix: check enforcer should not be nil

* Update user.go

---------

Co-authored-by: hsluoyz <hsluoyz@qq.com>
This commit is contained in:
Yaodong Yu
2023-08-11 12:31:49 +08:00
committed by GitHub
parent 1a9d02be46
commit 9899022bcd
4 changed files with 19 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
authz/authz.go
View File

@ -29,11 +29,7 @@ var Enforcer *casbin.Enforcer
func InitApi() { func InitApi() {
var err error var err error
e, err := object.GetEnforcer(util.GetId("built-in", "api-enforcer-built-in")) e, err := object.GetInitializedEnforcer(util.GetId("built-in", "api-enforcer-built-in"))
if err != nil {
panic(err)
}
err = e.InitEnforcer()
if err != nil { if err != nil {
panic(err) panic(err)
} }

16
controllers/casbin_api.go
View File

@ -45,13 +45,7 @@ func (c *ApiController) Enforce() {
} }
if enforcerId != "" { if enforcerId != "" {
enforcer, err := object.GetEnforcer(enforcerId) enforcer, err := object.GetInitializedEnforcer(enforcerId)
if err != nil {
c.ResponseError(err.Error())
return
}
err = enforcer.InitEnforcer()
if err != nil { if err != nil {
c.ResponseError(err.Error()) c.ResponseError(err.Error())
return return
@ -155,13 +149,7 @@ func (c *ApiController) BatchEnforce() {
} }
if enforcerId != "" { if enforcerId != "" {
enforcer, err := object.GetEnforcer(enforcerId) enforcer, err := object.GetInitializedEnforcer(enforcerId)
if err != nil {
c.ResponseError(err.Error())
return
}
err = enforcer.InitEnforcer()
if err != nil { if err != nil {
c.ResponseError(err.Error()) c.ResponseError(err.Error())
return return

15
object/enforcer.go
View File

@ -167,3 +167,18 @@ func (enforcer *Enforcer) InitEnforcer() error {
enforcer.Enforcer = casbinEnforcer enforcer.Enforcer = casbinEnforcer
return nil return nil
} }
func GetInitializedEnforcer(enforcerId string) (*Enforcer, error) {
enforcer, err := GetEnforcer(enforcerId)
if err != nil {
return nil, err
} else if enforcer == nil {
return nil, fmt.Errorf("the enforcer: %s is not found", enforcerId)
}
err = enforcer.InitEnforcer()
if err != nil {
return nil, err
}
return enforcer, nil
}

6
object/user.go
View File

@ -34,11 +34,7 @@ const UserEnforcerId = "built-in/user-enforcer-built-in"
var userEnforcer *UserGroupEnforcer var userEnforcer *UserGroupEnforcer
func InitUserManager() { func InitUserManager() {
enforcer, err := GetEnforcer(UserEnforcerId) enforcer, err := GetInitializedEnforcer(UserEnforcerId)
if err != nil {
panic(err)
}
err = enforcer.InitEnforcer()
if err != nil { if err != nil {
panic(err) panic(err)
} }