From f06a4990bd12c46b9e366122972744e7e9334791 Mon Sep 17 00:00:00 2001 From: Yaodong Yu <2814461814@qq.com> Date: Sun, 6 Aug 2023 13:07:30 +0800 Subject: [PATCH] fix: rename in init.go (#2179) * fix: rename in init.go * fix: remove blank line * fix: remove blank line * Update init.go --------- Co-authored-by: hsluoyz --- object/adapter.go | 4 +-- object/init.go | 71 +++++++++++++++++++++++----------------------- web/src/Setting.js | 6 ++-- 3 files changed, 41 insertions(+), 40 deletions(-) diff --git a/object/adapter.go b/object/adapter.go index ac73d7be..3238ea41 100644 --- a/object/adapter.go +++ b/object/adapter.go @@ -153,7 +153,7 @@ func (adapter *Adapter) initAdapter() error { if adapter.Adapter == nil { var dataSourceName string - if adapter.buildInAdapter() { + if adapter.builtInAdapter() { dataSourceName = conf.GetConfigString("dataSourceName") } else { switch adapter.DatabaseType { @@ -308,7 +308,7 @@ func RemovePolicy(policy []string, adapter *Adapter) (bool, error) { return affected, nil } -func (adapter *Adapter) buildInAdapter() bool { +func (adapter *Adapter) builtInAdapter() bool { if adapter.Owner != "built-in" { return false } diff --git a/object/init.go b/object/init.go index 1f984154..c72c4aa3 100644 --- a/object/init.go +++ b/object/init.go @@ -37,11 +37,11 @@ func InitDb() { existed = initBuiltInApiModel() if !existed { - initBuildInApiAdapter() + initBuiltInApiAdapter() initBuiltInApiEnforcer() - initBuiltInPermissionModel() - initBuildInPermissionAdapter() - initBuiltInPermissionEnforcer() + initBuiltInUserModel() + initBuiltInUserAdapter() + initBuiltInUserEnforcer() } initWebAuthn() @@ -303,8 +303,8 @@ func initWebAuthn() { gob.Register(webauthn.SessionData{}) } -func initBuiltInPermissionModel() { - model, err := GetModel("built-in/permission-model-built-in") +func initBuiltInUserModel() { + model, err := GetModel("built-in/user-model-built-in") if err != nil { panic(err) } @@ -315,7 +315,7 @@ func initBuiltInPermissionModel() { model = &Model{ Owner: "built-in", - Name: "permission-model-built-in", + Name: "user-model-built-in", CreatedTime: util.GetCurrentTime(), DisplayName: "Built-in Model", IsEnabled: true, @@ -325,11 +325,14 @@ r = sub, obj, act [policy_definition] p = sub, obj, act +[role_definition] +g = _, _ + [policy_effect] e = some(where (p.eft == allow)) [matchers] -m = r.sub == p.sub && r.obj == p.obj && r.act == p.act`, +m = g(r.sub, p.sub) && r.obj == p.obj && r.act == p.act`, } _, err = AddModel(model) if err != nil { @@ -347,8 +350,7 @@ func initBuiltInApiModel() bool { return true } - modelText := ` -[request_definition] + modelText := `[request_definition] r = subOwner, subName, method, urlPath, objOwner, objName [policy_definition] @@ -367,8 +369,7 @@ m = (r.subOwner == p.subOwner || p.subOwner == "*") && \ (r.urlPath == p.urlPath || p.urlPath == "*") && \ (r.objOwner == p.objOwner || p.objOwner == "*") && \ (r.objName == p.objName || p.objName == "*") || \ - (r.subOwner == r.objOwner && r.subName == r.objName) -` + (r.subOwner == r.objOwner && r.subName == r.objName)` model = &Model{ Owner: "built-in", @@ -415,19 +416,19 @@ func initBuiltInPermission() { } } -func initBuildInPermissionAdapter() { - permissionAdapter, err := GetAdapter("built-in/permission-adapter-built-in") +func initBuiltInUserAdapter() { + adapter, err := GetAdapter("built-in/user-adapter-built-in") if err != nil { panic(err) } - if permissionAdapter != nil { + if adapter != nil { return } - permissionAdapter = &Adapter{ + adapter = &Adapter{ Owner: "built-in", - Name: "permission-adapter-built-in", + Name: "user-adapter-built-in", CreatedTime: util.GetCurrentTime(), Type: "Database", DatabaseType: conf.GetConfigString("driverName"), @@ -436,23 +437,23 @@ func initBuildInPermissionAdapter() { Table: "casbin_user_rule", IsEnabled: true, } - _, err = AddAdapter(permissionAdapter) + _, err = AddAdapter(adapter) if err != nil { panic(err) } } -func initBuildInApiAdapter() { - apiAdapter, err := GetAdapter("built-in/api-adapter-built-in") +func initBuiltInApiAdapter() { + adapter, err := GetAdapter("built-in/api-adapter-built-in") if err != nil { panic(err) } - if apiAdapter != nil { + if adapter != nil { return } - apiAdapter = &Adapter{ + adapter = &Adapter{ Owner: "built-in", Name: "api-adapter-built-in", CreatedTime: util.GetCurrentTime(), @@ -463,49 +464,49 @@ func initBuildInApiAdapter() { Table: "casbin_api_rule", IsEnabled: true, } - _, err = AddAdapter(apiAdapter) + _, err = AddAdapter(adapter) if err != nil { panic(err) } } -func initBuiltInPermissionEnforcer() { - permissionEnforcer, err := GetEnforcer("built-in/permission-enforcer-built-in") +func initBuiltInUserEnforcer() { + enforcer, err := GetEnforcer("built-in/user-enforcer-built-in") if err != nil { panic(err) } - if permissionEnforcer != nil { + if enforcer != nil { return } - permissionEnforcer = &Enforcer{ + enforcer = &Enforcer{ Owner: "built-in", - Name: "permission-enforcer-built-in", + Name: "user-enforcer-built-in", CreatedTime: util.GetCurrentTime(), DisplayName: "Permission Enforcer", - Model: "built-in/permission-model-built-in", - Adapter: "built-in/permission-adapter-built-in", + Model: "built-in/user-model-built-in", + Adapter: "built-in/user-adapter-built-in", IsEnabled: true, } - _, err = AddEnforcer(permissionEnforcer) + _, err = AddEnforcer(enforcer) if err != nil { panic(err) } } func initBuiltInApiEnforcer() { - apiEnforcer, err := GetEnforcer("built-in/api-enforcer-built-in") + enforcer, err := GetEnforcer("built-in/api-enforcer-built-in") if err != nil { panic(err) } - if apiEnforcer != nil { + if enforcer != nil { return } - apiEnforcer = &Enforcer{ + enforcer = &Enforcer{ Owner: "built-in", Name: "api-enforcer-built-in", CreatedTime: util.GetCurrentTime(), @@ -515,7 +516,7 @@ func initBuiltInApiEnforcer() { IsEnabled: true, } - _, err = AddEnforcer(apiEnforcer) + _, err = AddEnforcer(enforcer) if err != nil { panic(err) } diff --git a/web/src/Setting.js b/web/src/Setting.js index 594e85b2..9fa714f0 100644 --- a/web/src/Setting.js +++ b/web/src/Setting.js @@ -1173,11 +1173,11 @@ export function isDefaultOrganizationSelected(account) { const BuiltInObjects = [ "api-enforcer-built-in", - "permission-enforcer-built-in", + "user-enforcer-built-in", "api-model-built-in", - "permission-model-built-in", + "user-model-built-in", "api-adapter-built-in", - "permission-adapter-built-in", + "user-adapter-built-in", ]; export function builtInObject(obj) {