generated from TrueCloudLab/basic
[#90] engine: Fix ruleFound return value
It can be false if the first targets allows operation and the last one returns NoRuleFound. Found by @mbiryukova. Introduced in #86. Signed-off-by: Evgenii Stratonikov <e.stratonikov@yadro.com>
This commit is contained in:
parent
2300995af2
commit
a1386f6d25
2 changed files with 47 additions and 6 deletions
|
@ -52,11 +52,10 @@ func (dr *defaultChainRouter) checkLocal(name chain.Name, rt RequestTarget, r re
|
||||||
hasAllow = hasAllow || ruleFound
|
hasAllow = hasAllow || ruleFound
|
||||||
}
|
}
|
||||||
|
|
||||||
status = chain.NoRuleFound
|
|
||||||
if hasAllow {
|
if hasAllow {
|
||||||
status = chain.Allow
|
return chain.Allow, true, nil
|
||||||
}
|
}
|
||||||
return
|
return chain.NoRuleFound, false, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (dr *defaultChainRouter) checkMorph(name chain.Name, rt RequestTarget, r resource.Request) (status chain.Status, ruleFound bool, err error) {
|
func (dr *defaultChainRouter) checkMorph(name chain.Name, rt RequestTarget, r resource.Request) (status chain.Status, ruleFound bool, err error) {
|
||||||
|
@ -69,11 +68,10 @@ func (dr *defaultChainRouter) checkMorph(name chain.Name, rt RequestTarget, r re
|
||||||
hasAllow = hasAllow || ruleFound
|
hasAllow = hasAllow || ruleFound
|
||||||
}
|
}
|
||||||
|
|
||||||
status = chain.NoRuleFound
|
|
||||||
if hasAllow {
|
if hasAllow {
|
||||||
status = chain.Allow
|
return chain.Allow, true, nil
|
||||||
}
|
}
|
||||||
return
|
return chain.NoRuleFound, false, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (dr *defaultChainRouter) matchLocalOverrides(name chain.Name, target Target, r resource.Request) (status chain.Status, ruleFound bool, err error) {
|
func (dr *defaultChainRouter) matchLocalOverrides(name chain.Name, target Target, r resource.Request) (status chain.Status, ruleFound bool, err error) {
|
||||||
|
|
|
@ -31,6 +31,49 @@ func TestAddRootOverrides(t *testing.T) {
|
||||||
require.Equal(t, string(id), string(res[0].ID))
|
require.Equal(t, string(id), string(res[0].ID))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestInmemory_MultipleTargets(t *testing.T) {
|
||||||
|
const op = "ape::test::op"
|
||||||
|
|
||||||
|
targets := []engine.Target{
|
||||||
|
engine.NamespaceTarget("ns1"),
|
||||||
|
engine.ContainerTarget("cnr1"),
|
||||||
|
engine.GroupTarget("group1"),
|
||||||
|
engine.UserTarget("user1"),
|
||||||
|
}
|
||||||
|
req := resourcetest.NewRequest(op, resourcetest.NewResource("r", nil), nil)
|
||||||
|
target := engine.NewRequestTargetExtended("ns1", "cnr1", "user1", []string{"group1"})
|
||||||
|
for _, tt := range targets {
|
||||||
|
t.Run("morph", func(t *testing.T) {
|
||||||
|
s := NewInMemoryLocalOverrides()
|
||||||
|
s.MorphRuleChainStorage().AddMorphRuleChain(chain.Ingress, tt, &chain.Chain{
|
||||||
|
Rules: []chain.Rule{{
|
||||||
|
Status: chain.Allow,
|
||||||
|
Actions: chain.Actions{Names: []string{op}},
|
||||||
|
}},
|
||||||
|
})
|
||||||
|
|
||||||
|
status, found, err := s.IsAllowed(chain.Ingress, target, req)
|
||||||
|
require.NoError(t, err)
|
||||||
|
require.True(t, found)
|
||||||
|
require.Equal(t, chain.Allow, status)
|
||||||
|
})
|
||||||
|
t.Run("override", func(t *testing.T) {
|
||||||
|
s := NewInMemoryLocalOverrides()
|
||||||
|
s.LocalStorage().AddOverride(chain.Ingress, tt, &chain.Chain{
|
||||||
|
Rules: []chain.Rule{{
|
||||||
|
Status: chain.Allow,
|
||||||
|
Actions: chain.Actions{Names: []string{op}},
|
||||||
|
}},
|
||||||
|
})
|
||||||
|
|
||||||
|
status, found, err := s.IsAllowed(chain.Ingress, target, req)
|
||||||
|
require.NoError(t, err)
|
||||||
|
require.True(t, found)
|
||||||
|
require.Equal(t, chain.Allow, status)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func TestInmemory(t *testing.T) {
|
func TestInmemory(t *testing.T) {
|
||||||
const (
|
const (
|
||||||
object = "native::object::abc/xyz"
|
object = "native::object::abc/xyz"
|
||||||
|
|
Loading…
Reference in a new issue