CyberCoveLLC/threshold
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(perms): Tests use action.List in resource action set (#3188)

Browse Source 
`action.List` is a collection action, that is, it is not part of the set
of actions that can be executed against a single instance of any given
resource.

As part of the `ListPermissions` call, `idActions` is expected, that is,
all the actions that can be executed against a resource instance.
`action.List` will never be part of this. This commit updates the tests
to reflect this fact.
This commit is contained in:
Hugo authored and GitHub committed 2023-04-27 17:48:11 +01:00
1 parent d28ea130ee
commit 5f45fb620b
1 file changed
+17 -17
Download Patch File Download Diff File Expand all files Collapse all files
internal/perms/acl_test.go
+17 -17
View File
@@ -404,7 +404,7 @@ func TestACL_ListPermissions(t *testing.T) {
"o_this_one_too": nil,
},
resourceType: resource.Session,
actionSet: action.ActionSet{action.List, action.Read},
actionSet: action.ActionSet{action.Read},
expPermissions: []Permission{},
},
{
@@ -417,7 +417,7 @@ func TestACL_ListPermissions(t *testing.T) {
},
scopes: map[string]*scopes.ScopeInfo{"o_1": nil},
resourceType: resource.Session, // We're requesting sessions.
actionSet: action.ActionSet{action.List, action.Read},
actionSet: action.ActionSet{action.Read},
expPermissions: []Permission{},
},
{
@@ -430,7 +430,7 @@ func TestACL_ListPermissions(t *testing.T) {
},
scopes: map[string]*scopes.ScopeInfo{"o_1": nil},
resourceType: resource.Session,
actionSet: action.ActionSet{action.List, action.Read},
actionSet: action.ActionSet{action.Read},
expPermissions: []Permission{},
},
{
@@ -443,7 +443,7 @@ func TestACL_ListPermissions(t *testing.T) {
},
scopes: map[string]*scopes.ScopeInfo{"o_1": nil},
resourceType: resource.Session,
actionSet: action.ActionSet{action.List, action.Read},
actionSet: action.ActionSet{action.Read},
expPermissions: []Permission{},
skipGrantValidationChecking: true,
},
@@ -457,7 +457,7 @@ func TestACL_ListPermissions(t *testing.T) {
},
scopes: map[string]*scopes.ScopeInfo{"o_1": nil},
resourceType: resource.Session,
actionSet: action.ActionSet{action.List, action.Read},
actionSet: action.ActionSet{action.Read},
expPermissions: []Permission{
{
ScopeId: "o_1",
@@ -479,7 +479,7 @@ func TestACL_ListPermissions(t *testing.T) {
},
scopes: map[string]*scopes.ScopeInfo{"o_1": nil},
resourceType: resource.Session,
actionSet: action.ActionSet{action.List, action.Read},
actionSet: action.ActionSet{action.ReadSelf},
expPermissions: []Permission{
{
ScopeId: "o_1",
@@ -505,7 +505,7 @@ func TestACL_ListPermissions(t *testing.T) {
},
scopes: map[string]*scopes.ScopeInfo{"o_1": nil},
resourceType: resource.Session,
actionSet: action.ActionSet{action.List, action.Read},
actionSet: action.ActionSet{action.Read},
expPermissions: []Permission{
{
ScopeId: "o_1",
@@ -527,7 +527,7 @@ func TestACL_ListPermissions(t *testing.T) {
},
scopes: map[string]*scopes.ScopeInfo{"o_1": nil},
resourceType: resource.Session,
actionSet: action.ActionSet{action.List, action.Read},
actionSet: action.ActionSet{action.ReadSelf},
expPermissions: []Permission{
{
ScopeId: "o_1",
@@ -549,7 +549,7 @@ func TestACL_ListPermissions(t *testing.T) {
},
scopes: map[string]*scopes.ScopeInfo{"o_1": nil},
resourceType: resource.Session,
actionSet: action.ActionSet{action.List},
actionSet: action.ActionSet{action.NoOp},
expPermissions: []Permission{
{
ScopeId: "o_1",
@@ -562,7 +562,7 @@ func TestACL_ListPermissions(t *testing.T) {
},
},
{
name: "List + No-op action with id wildcard, read requested",
name: "List + No-op action with id wildcard, read present",
aclGrants: []scopeGrant{
{
scope: "o_1",
@@ -588,7 +588,7 @@ func TestACL_ListPermissions(t *testing.T) {
},
scopes: map[string]*scopes.ScopeInfo{"o_1": nil},
resourceType: resource.Session,
actionSet: action.ActionSet{action.List},
actionSet: action.ActionSet{action.NoOp},
expPermissions: []Permission{
{
ScopeId: "o_1",
@@ -610,7 +610,7 @@ func TestACL_ListPermissions(t *testing.T) {
},
scopes: map[string]*scopes.ScopeInfo{"o_1": nil},
resourceType: resource.Host,
actionSet: action.ActionSet{action.List, action.Read},
actionSet: action.ActionSet{action.ReadSelf},
expPermissions: []Permission{
{
ScopeId: "o_1",
@@ -657,7 +657,7 @@ func TestACL_ListPermissions(t *testing.T) {
},
scopes: map[string]*scopes.ScopeInfo{"o_1": nil},
resourceType: resource.Session,
actionSet: action.ActionSet{action.List, action.Read, action.Create, action.Delete},
actionSet: action.ActionSet{action.Read, action.Create, action.Delete},
expPermissions: []Permission{
{
ScopeId: "o_1",
@@ -679,7 +679,7 @@ func TestACL_ListPermissions(t *testing.T) {
},
scopes: map[string]*scopes.ScopeInfo{"o_1": nil},
resourceType: resource.Host,
actionSet: action.ActionSet{action.List, action.Read, action.Create, action.Delete},
actionSet: action.ActionSet{action.Read, action.Create, action.Delete},
expPermissions: []Permission{
{
ScopeId: "o_1",
@@ -709,7 +709,7 @@ func TestACL_ListPermissions(t *testing.T) {
},
scopes: map[string]*scopes.ScopeInfo{"o_1": nil, "o_2": nil},
resourceType: resource.Session,
actionSet: action.ActionSet{action.List, action.Read},
actionSet: action.ActionSet{action.Read, action.ReadSelf},
expPermissions: []Permission{
{
ScopeId: "o_1",
@@ -734,7 +734,7 @@ func TestACL_ListPermissions(t *testing.T) {
userId: globals.RecoveryUserId,
scopes: map[string]*scopes.ScopeInfo{"o_1": nil, "o_2": nil},
resourceType: resource.Session,
actionSet: action.ActionSet{action.List, action.Read, action.Create, action.Delete},
actionSet: action.ActionSet{action.Read, action.Create, action.Delete},
expPermissions: []Permission{
{
ScopeId: "o_1",
@@ -759,7 +759,7 @@ func TestACL_ListPermissions(t *testing.T) {
userId: globals.RecoveryUserId,
scopes: map[string]*scopes.ScopeInfo{"o_1": nil, "o_2": nil},
resourceType: resource.Target,
actionSet: action.ActionSet{action.List, action.Read, action.Create, action.Delete},
actionSet: action.ActionSet{action.Read, action.Create, action.Delete},
expPermissions: []Permission{
{
ScopeId: "o_1",