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

fix: rename in init.go (#2179)

Browse Source 
* fix: rename in init.go

* fix: remove blank line

* fix: remove blank line

* Update init.go

---------

Co-authored-by: hsluoyz <hsluoyz@qq.com>
This commit is contained in:
Yaodong Yu 2023-08-06 13:07:30 +08:00 committed by GitHub
parent 9df7de5f27
commit f06a4990bd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 41 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
object/adapter.go
View File

@ -153,7 +153,7 @@ func (adapter *Adapter) initAdapter() error {
if adapter.Adapter == nil { if adapter.Adapter == nil {
var dataSourceName string var dataSourceName string
if adapter.buildInAdapter() { if adapter.builtInAdapter() {
dataSourceName = conf.GetConfigString("dataSourceName") dataSourceName = conf.GetConfigString("dataSourceName")
} else { } else {
switch adapter.DatabaseType { switch adapter.DatabaseType {
@ -308,7 +308,7 @@ func RemovePolicy(policy []string, adapter *Adapter) (bool, error) {
return affected, nil return affected, nil
} }
func (adapter *Adapter) buildInAdapter() bool { func (adapter *Adapter) builtInAdapter() bool {
if adapter.Owner != "built-in" { if adapter.Owner != "built-in" {
return false return false
} }

71
object/init.go
View File

@ -37,11 +37,11 @@ func InitDb() {
existed = initBuiltInApiModel() existed = initBuiltInApiModel()
if !existed { if !existed {
initBuildInApiAdapter() initBuiltInApiAdapter()
initBuiltInApiEnforcer() initBuiltInApiEnforcer()
initBuiltInPermissionModel() initBuiltInUserModel()
initBuildInPermissionAdapter() initBuiltInUserAdapter()
initBuiltInPermissionEnforcer() initBuiltInUserEnforcer()
} }
initWebAuthn() initWebAuthn()
@ -303,8 +303,8 @@ func initWebAuthn() {
gob.Register(webauthn.SessionData{}) gob.Register(webauthn.SessionData{})
} }
func initBuiltInPermissionModel() { func initBuiltInUserModel() {
model, err := GetModel("built-in/permission-model-built-in") model, err := GetModel("built-in/user-model-built-in")
if err != nil { if err != nil {
panic(err) panic(err)
} }
@ -315,7 +315,7 @@ func initBuiltInPermissionModel() {
model = &Model{ model = &Model{
Owner: "built-in", Owner: "built-in",
Name: "permission-model-built-in", Name: "user-model-built-in",
CreatedTime: util.GetCurrentTime(), CreatedTime: util.GetCurrentTime(),
DisplayName: "Built-in Model", DisplayName: "Built-in Model",
IsEnabled: true, IsEnabled: true,
@ -325,11 +325,14 @@ r = sub, obj, act
[policy_definition] [policy_definition]
p = sub, obj, act p = sub, obj, act
[role_definition]
g = _, _
[policy_effect] [policy_effect]
e = some(where (p.eft == allow)) e = some(where (p.eft == allow))
[matchers] [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) _, err = AddModel(model)
if err != nil { if err != nil {
@ -347,8 +350,7 @@ func initBuiltInApiModel() bool {
return true return true
} }
modelText := ` modelText := `[request_definition]
[request_definition]
r = subOwner, subName, method, urlPath, objOwner, objName r = subOwner, subName, method, urlPath, objOwner, objName
[policy_definition] [policy_definition]
@ -367,8 +369,7 @@ m = (r.subOwner == p.subOwner || p.subOwner == "*") && \
(r.urlPath == p.urlPath || p.urlPath == "*") && \ (r.urlPath == p.urlPath || p.urlPath == "*") && \
(r.objOwner == p.objOwner || p.objOwner == "*") && \ (r.objOwner == p.objOwner || p.objOwner == "*") && \
(r.objName == p.objName || p.objName == "*") || \ (r.objName == p.objName || p.objName == "*") || \
(r.subOwner == r.objOwner && r.subName == r.objName) (r.subOwner == r.objOwner && r.subName == r.objName)`
`
model = &Model{ model = &Model{
Owner: "built-in", Owner: "built-in",
@ -415,19 +416,19 @@ func initBuiltInPermission() {
} }
} }
func initBuildInPermissionAdapter() { func initBuiltInUserAdapter() {
permissionAdapter, err := GetAdapter("built-in/permission-adapter-built-in") adapter, err := GetAdapter("built-in/user-adapter-built-in")
if err != nil { if err != nil {
panic(err) panic(err)
} }
if permissionAdapter != nil { if adapter != nil {
return return
} }
permissionAdapter = &Adapter{ adapter = &Adapter{
Owner: "built-in", Owner: "built-in",
Name: "permission-adapter-built-in", Name: "user-adapter-built-in",
CreatedTime: util.GetCurrentTime(), CreatedTime: util.GetCurrentTime(),
Type: "Database", Type: "Database",
DatabaseType: conf.GetConfigString("driverName"), DatabaseType: conf.GetConfigString("driverName"),
@ -436,23 +437,23 @@ func initBuildInPermissionAdapter() {
Table: "casbin_user_rule", Table: "casbin_user_rule",
IsEnabled: true, IsEnabled: true,
} }
_, err = AddAdapter(permissionAdapter) _, err = AddAdapter(adapter)
if err != nil { if err != nil {
panic(err) panic(err)
} }
} }
func initBuildInApiAdapter() { func initBuiltInApiAdapter() {
apiAdapter, err := GetAdapter("built-in/api-adapter-built-in") adapter, err := GetAdapter("built-in/api-adapter-built-in")
if err != nil { if err != nil {
panic(err) panic(err)
} }
if apiAdapter != nil { if adapter != nil {
return return
} }
apiAdapter = &Adapter{ adapter = &Adapter{
Owner: "built-in", Owner: "built-in",
Name: "api-adapter-built-in", Name: "api-adapter-built-in",
CreatedTime: util.GetCurrentTime(), CreatedTime: util.GetCurrentTime(),
@ -463,49 +464,49 @@ func initBuildInApiAdapter() {
Table: "casbin_api_rule", Table: "casbin_api_rule",
IsEnabled: true, IsEnabled: true,
} }
_, err = AddAdapter(apiAdapter) _, err = AddAdapter(adapter)
if err != nil { if err != nil {
panic(err) panic(err)
} }
} }
func initBuiltInPermissionEnforcer() { func initBuiltInUserEnforcer() {
permissionEnforcer, err := GetEnforcer("built-in/permission-enforcer-built-in") enforcer, err := GetEnforcer("built-in/user-enforcer-built-in")
if err != nil { if err != nil {
panic(err) panic(err)
} }
if permissionEnforcer != nil { if enforcer != nil {
return return
} }
permissionEnforcer = &Enforcer{ enforcer = &Enforcer{
Owner: "built-in", Owner: "built-in",
Name: "permission-enforcer-built-in", Name: "user-enforcer-built-in",
CreatedTime: util.GetCurrentTime(), CreatedTime: util.GetCurrentTime(),
DisplayName: "Permission Enforcer", DisplayName: "Permission Enforcer",
Model: "built-in/permission-model-built-in", Model: "built-in/user-model-built-in",
Adapter: "built-in/permission-adapter-built-in", Adapter: "built-in/user-adapter-built-in",
IsEnabled: true, IsEnabled: true,
} }
_, err = AddEnforcer(permissionEnforcer) _, err = AddEnforcer(enforcer)
if err != nil { if err != nil {
panic(err) panic(err)
} }
} }
func initBuiltInApiEnforcer() { func initBuiltInApiEnforcer() {
apiEnforcer, err := GetEnforcer("built-in/api-enforcer-built-in") enforcer, err := GetEnforcer("built-in/api-enforcer-built-in")
if err != nil { if err != nil {
panic(err) panic(err)
} }
if apiEnforcer != nil { if enforcer != nil {
return return
} }
apiEnforcer = &Enforcer{ enforcer = &Enforcer{
Owner: "built-in", Owner: "built-in",
Name: "api-enforcer-built-in", Name: "api-enforcer-built-in",
CreatedTime: util.GetCurrentTime(), CreatedTime: util.GetCurrentTime(),
@ -515,7 +516,7 @@ func initBuiltInApiEnforcer() {
IsEnabled: true, IsEnabled: true,
} }
_, err = AddEnforcer(apiEnforcer) _, err = AddEnforcer(enforcer)
if err != nil { if err != nil {
panic(err) panic(err)
} }

6
web/src/Setting.js
View File

@ -1173,11 +1173,11 @@ export function isDefaultOrganizationSelected(account) {
const BuiltInObjects = [ const BuiltInObjects = [
"api-enforcer-built-in", "api-enforcer-built-in",
"permission-enforcer-built-in", "user-enforcer-built-in",
"api-model-built-in", "api-model-built-in",
"permission-model-built-in", "user-model-built-in",
"api-adapter-built-in", "api-adapter-built-in",
"permission-adapter-built-in", "user-adapter-built-in",
]; ];
export function builtInObject(obj) { export function builtInObject(obj) {