From 7cc9d6f49a643b729fd39de9816f21543dd229a4 Mon Sep 17 00:00:00 2001
From: ko_oler <kooler89@gmail.com>
Date: Tue, 26 Dec 2023 17:48:31 +0300
Subject: [PATCH] =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B8=20=D0=BF?=
=?UTF-8?q?=D0=BE=D1=81=D0=BB=D0=B5=20=D0=BE=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB?=
=?UTF-8?q?=D0=B5=D0=BD=D0=B8=D1=8F=20perxis-proto?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pkg/permission/ruleset.go | 4 ++--
pkg/permission/ruleset_test.go | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/pkg/permission/ruleset.go b/pkg/permission/ruleset.go
index 63a0f1b8..2cf1eef0 100644
--- a/pkg/permission/ruleset.go
+++ b/pkg/permission/ruleset.go
@@ -127,10 +127,10 @@ func (r Rule) GetPermission(action Action) *Permission {
case ActionRead:
p.Filter = r.ReadFilter
p.UnallowedFields = append(p.UnallowedFields, r.HiddenFields...)
- p.UnallowedFields = append(p.UnallowedFields, r.DenyWriteFields...)
+ p.UnallowedFields = append(p.UnallowedFields, r.DenyReadFields...)
case ActionCreate, ActionUpdate, ActionDelete:
p.Filter = r.WriteFilter
- p.UnallowedFields = append(p.UnallowedFields, r.DenyReadFields...)
+ p.UnallowedFields = append(p.UnallowedFields, r.DenyWriteFields...)
}
p.UnallowedFields = data.SetFromSlice(p.UnallowedFields)
diff --git a/pkg/permission/ruleset_test.go b/pkg/permission/ruleset_test.go
index a38644b0..47cb622f 100644
--- a/pkg/permission/ruleset_test.go
+++ b/pkg/permission/ruleset_test.go
@@ -61,25 +61,25 @@ func TestRule_GetPermission(t *testing.T) {
{
name: "ActionRead",
action: ActionRead,
- rule: Rule{Actions: []Action{ActionRead, ActionUpdate}, DenyReadFields: []string{"f1"}, HiddenFields: []string{"f2"}, DenyWriteFields: []string{"f3"}},
+ rule: Rule{Actions: []Action{ActionRead, ActionUpdate}, DenyWriteFields: []string{"f1"}, HiddenFields: []string{"f2"}, DenyReadFields: []string{"f3"}},
unallowedFields: []string{"f2", "f3"},
},
{
name: "ActionRead readonly&writeonly",
action: ActionRead,
- rule: Rule{Actions: []Action{ActionRead, ActionUpdate}, DenyReadFields: []string{"f1"}, HiddenFields: []string{"f2"}, DenyWriteFields: []string{"f1"}},
+ rule: Rule{Actions: []Action{ActionRead, ActionUpdate}, DenyWriteFields: []string{"f1"}, HiddenFields: []string{"f2"}, DenyReadFields: []string{"f1"}},
unallowedFields: []string{"f1", "f2"},
},
{
name: "ActionUpdate",
action: ActionUpdate,
- rule: Rule{Actions: []Action{ActionRead, ActionUpdate}, DenyReadFields: []string{"f1"}, HiddenFields: []string{"f2"}, DenyWriteFields: []string{"f3"}},
+ rule: Rule{Actions: []Action{ActionRead, ActionUpdate}, DenyWriteFields: []string{"f1"}, HiddenFields: []string{"f2"}, DenyReadFields: []string{"f3"}},
unallowedFields: []string{"f1"},
},
{
name: "ActionUpdate readonly&writeonly",
action: ActionUpdate,
- rule: Rule{Actions: []Action{ActionRead, ActionUpdate}, DenyReadFields: []string{"f1"}, HiddenFields: []string{"f2"}, DenyWriteFields: []string{"f1"}},
+ rule: Rule{Actions: []Action{ActionRead, ActionUpdate}, DenyWriteFields: []string{"f1"}, HiddenFields: []string{"f2"}, DenyReadFields: []string{"f1"}},
unallowedFields: []string{"f1"},
},
}
--
GitLab