generated from TrueCloudLab/basic
[#46] iam: Error if policy doesn't have actions
Signed-off-by: Denis Kirillov <d.kirillov@yadro.com>
This commit is contained in:
parent
8d21ab2d99
commit
2af381ae81
4 changed files with 26 additions and 4 deletions
|
@ -71,6 +71,9 @@ var (
|
||||||
|
|
||||||
// ErrInvalidActionFormat occurs when action has unknown/unsupported format.
|
// ErrInvalidActionFormat occurs when action has unknown/unsupported format.
|
||||||
ErrInvalidActionFormat = errors.New("invalid action format")
|
ErrInvalidActionFormat = errors.New("invalid action format")
|
||||||
|
|
||||||
|
// ErrActionsNotApplicable occurs when failed to convert any actions.
|
||||||
|
ErrActionsNotApplicable = errors.New("actions not applicable")
|
||||||
)
|
)
|
||||||
|
|
||||||
type formPrincipalConditionFunc func(string) chain.Condition
|
type formPrincipalConditionFunc func(string) chain.Condition
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
package iam
|
package iam
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"errors"
|
|
||||||
"fmt"
|
"fmt"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
|
@ -11,9 +10,6 @@ import (
|
||||||
|
|
||||||
const PropertyKeyFilePath = "FilePath"
|
const PropertyKeyFilePath = "FilePath"
|
||||||
|
|
||||||
// ErrActionsNotApplicable occurs when failed to convert any actions.
|
|
||||||
var ErrActionsNotApplicable = errors.New("actions not applicable")
|
|
||||||
|
|
||||||
var actionToOpMap = map[string][]string{
|
var actionToOpMap = map[string][]string{
|
||||||
supportedS3ActionDeleteObject: {native.MethodDeleteObject},
|
supportedS3ActionDeleteObject: {native.MethodDeleteObject},
|
||||||
supportedS3ActionGetObject: {native.MethodGetObject, native.MethodHeadObject, native.MethodSearchObject, native.MethodRangeObject, native.MethodHashObject},
|
supportedS3ActionGetObject: {native.MethodGetObject, native.MethodHeadObject, native.MethodSearchObject, native.MethodRangeObject, native.MethodHashObject},
|
||||||
|
|
|
@ -26,6 +26,9 @@ func ConvertToS3Chain(p Policy, resolver S3Resolver) (*chain.Chain, error) {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
ruleAction := chain.Actions{Inverted: actionInverted, Names: actions}
|
ruleAction := chain.Actions{Inverted: actionInverted, Names: actions}
|
||||||
|
if len(ruleAction.Names) == 0 {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
resources, resourceInverted := statement.resource()
|
resources, resourceInverted := statement.resource()
|
||||||
if err := validateS3ResourceNames(resources); err != nil {
|
if err := validateS3ResourceNames(resources); err != nil {
|
||||||
|
@ -57,6 +60,10 @@ func ConvertToS3Chain(p Policy, resolver S3Resolver) (*chain.Chain, error) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if len(engineChain.Rules) == 0 {
|
||||||
|
return nil, ErrActionsNotApplicable
|
||||||
|
}
|
||||||
|
|
||||||
return &engineChain, nil
|
return &engineChain, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -279,6 +279,22 @@ func TestConverters(t *testing.T) {
|
||||||
require.Error(t, err)
|
require.Error(t, err)
|
||||||
})
|
})
|
||||||
|
|
||||||
|
t.Run("invalid policy (missing s3 actions)", func(t *testing.T) {
|
||||||
|
p := Policy{
|
||||||
|
Version: "2012-10-17",
|
||||||
|
Statement: []Statement{{
|
||||||
|
Principal: map[PrincipalType][]string{
|
||||||
|
AWSPrincipalType: {principal},
|
||||||
|
},
|
||||||
|
Effect: AllowEffect,
|
||||||
|
Resource: []string{"arn:aws:s3:::" + resource},
|
||||||
|
}},
|
||||||
|
}
|
||||||
|
|
||||||
|
_, err := ConvertToS3Chain(p, mockResolver)
|
||||||
|
require.Error(t, err)
|
||||||
|
})
|
||||||
|
|
||||||
t.Run("valid mixed iam/s3 actions", func(t *testing.T) {
|
t.Run("valid mixed iam/s3 actions", func(t *testing.T) {
|
||||||
p := Policy{
|
p := Policy{
|
||||||
Statement: []Statement{{
|
Statement: []Statement{{
|
||||||
|
|
Loading…
Reference in a new issue