feat: restrict the model of application type resource permission (#2394)

This commit is contained in:
Yaodong Yu
2023-10-12 00:05:53 +08:00
committed by GitHub
parent 4de716fef3
commit e4208d7fd9
3 changed files with 31 additions and 8 deletions

View File

@ -18,7 +18,6 @@ import (
"fmt"
"github.com/casbin/casbin/v2"
"github.com/casbin/casbin/v2/config"
"github.com/casdoor/casdoor/util"
xormadapter "github.com/casdoor/xorm-adapter/v3"
"github.com/xorm-io/core"
@ -254,16 +253,10 @@ func (enforcer *Enforcer) LoadModelCfg() error {
return fmt.Errorf("the model: %s for enforcer: %s is not found", enforcer.Model, enforcer.GetId())
}
cfg, err := config.NewConfigFromText(model.ModelText)
enforcer.ModelCfg, err = getModelCfg(model)
if err != nil {
return err
}
enforcer.ModelCfg = make(map[string]string)
enforcer.ModelCfg["p"] = cfg.String("policy_definition::p")
if cfg.String("role_definition::g") != "" {
enforcer.ModelCfg["g"] = cfg.String("role_definition::g")
}
return nil
}