From 979f43638db2aa54b014c566b1e26776a72d4dcc Mon Sep 17 00:00:00 2001 From: Yang Luo Date: Thu, 3 Aug 2023 18:17:15 +0800 Subject: [PATCH] Change builtInAvailableField to 10 --- object/permission.go | 5 +---- object/permission_enforcer.go | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/object/permission.go b/object/permission.go index bac99799..f5218121 100644 --- a/object/permission.go +++ b/object/permission.go @@ -58,10 +58,7 @@ type PermissionRule struct { Id string `xorm:"varchar(100) index not null default ''" json:"id"` } -const ( - builtInAvailableField = 5 // Casdoor built-in adapter, use V5 to filter permission, so has 5 available field - builtInAdapter = "permission_rule" -) +const builtInAvailableField = 10 func (p *Permission) GetId() string { return util.GetId(p.Owner, p.Name) diff --git a/object/permission_enforcer.go b/object/permission_enforcer.go index c2b686b5..7f1ac6d5 100644 --- a/object/permission_enforcer.go +++ b/object/permission_enforcer.go @@ -335,7 +335,7 @@ m = g(r.sub, p.sub) && r.obj == p.obj && r.act == p.act` policyDefinition := strings.Split(cfg.String("policy_definition::p"), ",") fieldsNum := len(policyDefinition) if fieldsNum > builtInAvailableField { - panic(fmt.Errorf("the maximum policy_definition field number cannot exceed %d", builtInAvailableField)) + panic(fmt.Errorf("the maximum policy_definition field number cannot exceed %d, got %d", builtInAvailableField, fieldsNum)) } // filled empty field with "" and V5 with "permissionId" for i := builtInAvailableField - fieldsNum; i > 0; i-- {