upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor synced 2024-09-20 16:35:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

add valid for rule (#8846)

Browse Source 
Change-Id: I82215a0cf1ec32a253c8db9bfafe7e25b26c9ad9
Signed-off-by: Ziming Zhang <zziming@vmware.com>
This commit is contained in:
Ziming 2019-08-28 16:58:49 +08:00 committed by GitHub
parent 3f5ecd1f9c
commit 94138137d5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
19 changed files with 386 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/common/utils/utils.go
View File

@ -267,3 +267,15 @@ func IsContainIllegalChar(s string, illegalChar []string) bool {
func IsDigest(ref string) bool {
return strings.HasPrefix(ref, "sha256:") && len(ref) == 71
}
// ParseJSONInt ...
func ParseJSONInt(value interface{}) (int, bool) {
switch value.(type) {
case float64:
return int(value.(float64)), true
case int:
return value.(int), true
default:
return 0, false
}
}

32
src/core/api/retention_test.go
View File

@ -36,10 +36,10 @@ func TestCreatePolicy(t *testing.T) {
{
ID: 1,
Priority: 1,
Template: "recentXdays",
Template: "latestPushedK",
Action: "retain",
Parameters: rule.Parameters{
"num": 10,
"latestPushedK": 10,
},
TagSelectors: []*rule.Selector{
{
@ -99,10 +99,10 @@ func TestCreatePolicy(t *testing.T) {
{
ID: 1,
Priority: 1,
Template: "recentXdays",
Template: "latestPushedK",
Action: "retain",
Parameters: rule.Parameters{
"num": 10,
"latestPushedK": 10,
},
TagSelectors: []*rule.Selector{
{
@ -145,10 +145,10 @@ func TestCreatePolicy(t *testing.T) {
{
ID: 1,
Priority: 1,
Template: "recentXdays",
Template: "latestPushedK",
Action: "retain",
Parameters: rule.Parameters{
"num": 10,
"latestPushedK": 10,
},
TagSelectors: []*rule.Selector{
{
@ -170,10 +170,10 @@ func TestCreatePolicy(t *testing.T) {
{
ID: 2,
Priority: 1,
Template: "recentXdays",
Template: "latestPushedK",
Action: "retain",
Parameters: rule.Parameters{
"num": 10,
"latestPushedK": 10,
},
TagSelectors: []*rule.Selector{
{
@ -220,10 +220,10 @@ func TestPolicy(t *testing.T) {
{
ID: 1,
Priority: 1,
Template: "recentXdays",
Template: "latestPushedK",
Action: "retain",
Parameters: rule.Parameters{
"num": 10,
"latestPushedK": 10,
},
TagSelectors: []*rule.Selector{
{
@ -286,10 +286,10 @@ func TestPolicy(t *testing.T) {
{
ID: 1,
Priority: 1,
Template: "recentXdays",
Template: "latestPushedK",
Action: "retain",
Parameters: rule.Parameters{
"num": 10,
"latestPushedK": 10,
},
TagSelectors: []*rule.Selector{
{
@ -334,10 +334,10 @@ func TestPolicy(t *testing.T) {
{
ID: 1,
Priority: 1,
Template: "recentXdays",
Template: "latestPushedK",
Action: "retain",
Parameters: rule.Parameters{
"num": 10,
"latestPushedK": 10,
},
TagSelectors: []*rule.Selector{
{
@ -359,10 +359,10 @@ func TestPolicy(t *testing.T) {
{
ID: 2,
Priority: 1,
Template: "recentXdays",
Template: "latestPushedK",
Action: "retain",
Parameters: rule.Parameters{
"num": 10,
"latestPushedK": 10,
},
TagSelectors: []*rule.Selector{
{

30
src/pkg/retention/controller_test.go
View File

@ -39,18 +39,13 @@ func (s *ControllerTestSuite) TestPolicy() {
{
ID: 1,
Priority: 1,
Template: "recentXdays",
Template: "latestPushedK",
Parameters: rule.Parameters{
"num": 10,
"latestPushedK": 10,
},
TagSelectors: []*rule.Selector{
{
Kind: "label",
Decoration: "with",
Pattern: "latest",
},
{
Kind: "regularExpression",
Kind: "doublestar",
Decoration: "matches",
Pattern: "release-[\\d\\.]+",
},
@ -58,7 +53,7 @@ func (s *ControllerTestSuite) TestPolicy() {
ScopeSelectors: map[string][]*rule.Selector{
"repository": {
{
Kind: "regularExpression",
Kind: "doublestar",
Decoration: "matches",
Pattern: ".+",
},
@ -68,19 +63,14 @@ func (s *ControllerTestSuite) TestPolicy() {
{
ID: 2,
Priority: 1,
Template: "recentXdays",
Template: "latestPushedK",
Disabled: true,
Parameters: rule.Parameters{
"num": 3,
"latestPushedK": 3,
},
TagSelectors: []*rule.Selector{
{
Kind: "label",
Decoration: "with",
Pattern: "latest",
},
{
Kind: "regularExpression",
Kind: "doublestar",
Decoration: "matches",
Pattern: "release-[\\d\\.]+",
},
@ -88,7 +78,7 @@ func (s *ControllerTestSuite) TestPolicy() {
ScopeSelectors: map[string][]*rule.Selector{
"repository": {
{
Kind: "regularExpression",
Kind: "doublestar",
Decoration: "matches",
Pattern: ".+",
},
@ -146,9 +136,9 @@ func (s *ControllerTestSuite) TestExecution() {
{
ID: 1,
Priority: 1,
Template: "recentXdays",
Template: "latestPushedK",
Parameters: rule.Parameters{
"num": 10,
"latestPushedK": 10,
},
TagSelectors: []*rule.Selector{
{

8
src/pkg/retention/dao/retention_test.go
View File

@ -28,10 +28,10 @@ func TestPolicy(t *testing.T) {
{
ID: 1,
Priority: 1,
Template: "recentXdays",
Template: "latestPushedK",
Action: "retain",
Parameters: rule.Parameters{
"num": 10,
"latestPushedK": 10,
},
TagSelectors: []*rule.Selector{
{
@ -102,10 +102,10 @@ func TestExecution(t *testing.T) {
{
ID: 1,
Priority: 1,
Template: "recentXdays",
Template: "latestPushedK",
Action: "retain",
Parameters: rule.Parameters{
"num": 10,
"latestPushedK": 10,
},
TagSelectors: []*rule.Selector{
{

26
src/pkg/retention/manager_test.go
View File

@ -29,18 +29,13 @@ func TestPolicy(t *testing.T) {
{
ID: 1,
Priority: 1,
Template: "recentXdays",
Template: "latestPushedK",
Parameters: rule.Parameters{
"num": 10,
"latestPushedK": 10,
},
TagSelectors: []*rule.Selector{
{
Kind: "label",
Decoration: "with",
Pattern: "latest",
},
{
Kind: "regularExpression",
Kind: "doublestar",
Decoration: "matches",
Pattern: "release-[\\d\\.]+",
},
@ -48,7 +43,7 @@ func TestPolicy(t *testing.T) {
ScopeSelectors: map[string][]*rule.Selector{
"repository": {
{
Kind: "regularExpression",
Kind: "doublestar",
Decoration: "matches",
Pattern: ".+",
},
@ -100,18 +95,13 @@ func TestExecution(t *testing.T) {
{
ID: 1,
Priority: 1,
Template: "recentXdays",
Template: "latestPushedK",
Parameters: rule.Parameters{
"num": 10,
"latestPushedK": 10,
},
TagSelectors: []*rule.Selector{
{
Kind: "label",
Decoration: "with",
Pattern: "latest",
},
{
Kind: "regularExpression",
Kind: "doublestar",
Decoration: "matches",
Pattern: "release-[\\d\\.]+",
},
@ -119,7 +109,7 @@ func TestExecution(t *testing.T) {
ScopeSelectors: map[string][]*rule.Selector{
"repository": {
{
Kind: "regularExpression",
Kind: "doublestar",
Decoration: "matches",
Pattern: ".+",
},

5
src/pkg/retention/policy/models.go
View File

@ -17,6 +17,7 @@ package policy
import (
"github.com/astaxie/beego/validation"
"github.com/goharbor/harbor/src/pkg/retention/policy/rule"
"github.com/goharbor/harbor/src/pkg/retention/policy/rule/index"
)
const (
@ -78,6 +79,10 @@ func (m *Metadata) Valid(v *validation.Validation) {
}
if !v.HasErrors() {
for _, r := range m.Rules {
if err := index.Valid(r.Template, r.Parameters); err != nil {
_ = v.SetError("Parameters", err.Error())
return
}
if ok, _ := v.Valid(&r); !ok {
return
}

102
src/pkg/retention/policy/models_test.go
View File

@ -41,9 +41,9 @@ func TestRule(t *testing.T) {
ID: 1,
Priority: 1,
Action: "retain",
Template: "recentXdays",
Template: "latestPushedK",
Parameters: rule.Parameters{
"num": 10,
"latestPushedK": 10,
},
TagSelectors: []*rule.Selector{
{
@ -79,7 +79,105 @@ func TestRule(t *testing.T) {
require.Nil(t, err)
require.False(t, ok)
require.True(t, v.HasErrors())
require.EqualValues(t, "Kind", v.Errors[0].Field)
for _, e := range v.Errors {
fmt.Printf("%s %s\n", e.Field, e.Message)
}
}
func TestParamValid(t *testing.T) {
p := &Metadata{
Algorithm: "or",
Rules: []rule.Metadata{
{
ID: 1,
Priority: 1,
Action: "retain",
Template: "latestPushedK",
Parameters: rule.Parameters{
"latestPushedK": -10,
},
TagSelectors: []*rule.Selector{
{
Kind: "doublestar",
Decoration: "matches",
Pattern: "release-[\\d\\.]+",
},
},
ScopeSelectors: map[string][]*rule.Selector{
"repository": {
{
Kind: "doublestar",
Decoration: "matches",
Pattern: ".+",
},
},
},
},
},
Trigger: &Trigger{
Kind: "Schedule",
Settings: map[string]interface{}{
"cron": "* 22 11 * * *",
},
},
Scope: &Scope{
Level: "project",
Reference: 1,
},
}
v := &validation.Validation{}
ok, err := v.Valid(p)
require.Nil(t, err)
require.False(t, ok)
require.True(t, v.HasErrors())
require.EqualValues(t, "Parameters", v.Errors[0].Field)
p = &Metadata{
Algorithm: "or",
Rules: []rule.Metadata{
{
ID: 1,
Priority: 1,
Action: "retain",
Template: "nDaysSinceLastPull",
Parameters: rule.Parameters{
"nDaysSinceLastPull": 20201010,
},
TagSelectors: []*rule.Selector{
{
Kind: "doublestar",
Decoration: "matches",
Pattern: "release-[\\d\\.]+",
},
},
ScopeSelectors: map[string][]*rule.Selector{
"repository": {
{
Kind: "doublestar",
Decoration: "matches",
Pattern: ".+",
},
},
},
},
},
Trigger: &Trigger{
Kind: "Schedule",
Settings: map[string]interface{}{
"cron": "* 22 11 * * *",
},
},
Scope: &Scope{
Level: "project",
Reference: 1,
},
}
v = &validation.Validation{}
ok, err = v.Valid(p)
require.Nil(t, err)
require.False(t, ok)
require.True(t, v.HasErrors())
require.EqualValues(t, "Parameters", v.Errors[0].Field)
}

23
src/pkg/retention/policy/rule/dayspl/evaluator.go
View File

@ -15,6 +15,8 @@
package dayspl
import (
"fmt"
"github.com/goharbor/harbor/src/common/utils"
"time"
"github.com/goharbor/harbor/src/common/utils/log"
@ -58,7 +60,7 @@ func (e *evaluator) Action() string {
func New(params rule.Parameters) rule.Evaluator {
if params != nil {
if p, ok := params[ParameterN]; ok {
if v, ok := p.(float64); ok && v >= 0 {
if v, ok := utils.ParseJSONInt(p); ok && v >= 0 {
return &evaluator{n: int(v)}
}
}
@ -68,3 +70,22 @@ func New(params rule.Parameters) rule.Evaluator {
return &evaluator{n: DefaultN}
}
// Valid ...
func Valid(params rule.Parameters) error {
if params != nil {
if p, ok := params[ParameterN]; ok {
if v, ok := utils.ParseJSONInt(p); ok {
if v < 0 {
return fmt.Errorf("%s is less than zero", ParameterN)
}
if v > 20190904 {
return fmt.Errorf("%s is too large", ParameterN)
}
} else {
return fmt.Errorf("%s type error", ParameterN)
}
}
}
return nil
}

21
src/pkg/retention/policy/rule/dayspl/evaluator_test.go
View File

@ -15,6 +15,7 @@
package dayspl
import (
"errors"
"fmt"
"testing"
"time"
@ -95,6 +96,26 @@ func (e *EvaluatorTestSuite) TestProcess() {
}
}
func (e *EvaluatorTestSuite) TestValid() {
tests := []struct {
Name string
args rule.Parameters
expectedK error
}{
{Name: "Valid", args: map[string]rule.Parameter{ParameterN: 5}, expectedK: nil},
{Name: "Negative", args: map[string]rule.Parameter{ParameterN: -1}, expectedK: errors.New("nDaysSinceLastPull is less than zero")},
{Name: "Big", args: map[string]rule.Parameter{ParameterN: 21000000}, expectedK: errors.New("nDaysSinceLastPull is too large")},
}
for _, tt := range tests {
e.T().Run(tt.Name, func(t *testing.T) {
err := Valid(tt.args)
require.Equal(t, tt.expectedK, err)
})
}
}
func TestEvaluatorSuite(t *testing.T) {
suite.Run(t, &EvaluatorTestSuite{})
}

23
src/pkg/retention/policy/rule/daysps/evaluator.go
View File

@ -15,6 +15,8 @@
package daysps
import (
"fmt"
"github.com/goharbor/harbor/src/common/utils"
"time"
"github.com/goharbor/harbor/src/common/utils/log"
@ -58,7 +60,7 @@ func (e *evaluator) Action() string {
func New(params rule.Parameters) rule.Evaluator {
if params != nil {
if p, ok := params[ParameterN]; ok {
if v, ok := p.(float64); ok && v >= 0 {
if v, ok := utils.ParseJSONInt(p); ok && v >= 0 {
return &evaluator{n: int(v)}
}
}
@ -68,3 +70,22 @@ func New(params rule.Parameters) rule.Evaluator {
return &evaluator{n: DefaultN}
}
// Valid ...
func Valid(params rule.Parameters) error {
if params != nil {
if p, ok := params[ParameterN]; ok {
if v, ok := utils.ParseJSONInt(p); ok {
if v < 0 {
return fmt.Errorf("%s is less than zero", ParameterN)
}
if v > 20190904 {
return fmt.Errorf("%s is too large", ParameterN)
}
} else {
return fmt.Errorf("%s type error", ParameterN)
}
}
}
return nil
}

21
src/pkg/retention/policy/rule/daysps/evaluator_test.go
View File

@ -15,6 +15,7 @@
package daysps
import (
"errors"
"fmt"
"testing"
"time"
@ -95,6 +96,26 @@ func (e *EvaluatorTestSuite) TestProcess() {
}
}
func (e *EvaluatorTestSuite) TestValid() {
tests := []struct {
Name string
args rule.Parameters
expectedK error
}{
{Name: "Valid", args: map[string]rule.Parameter{ParameterN: 5}, expectedK: nil},
{Name: "Negative", args: map[string]rule.Parameter{ParameterN: -1}, expectedK: errors.New("nDaysSinceLastPush is less than zero")},
{Name: "Big", args: map[string]rule.Parameter{ParameterN: 21000000}, expectedK: errors.New("nDaysSinceLastPush is too large")},
}
for _, tt := range tests {
e.T().Run(tt.Name, func(t *testing.T) {
err := Valid(tt.args)
require.Equal(t, tt.expectedK, err)
})
}
}
func TestEvaluatorSuite(t *testing.T) {
suite.Run(t, &EvaluatorTestSuite{})
}

3
src/pkg/retention/policy/rule/evaluator.go
View File

@ -34,3 +34,6 @@ type Evaluator interface {
// Factory defines a factory method for creating rule evaluator
type Factory func(parameters Parameters) Evaluator
// Validator ...
type Validator func(parameters Parameters) error

54
src/pkg/retention/policy/rule/index/index.go
View File

@ -61,6 +61,8 @@ type indexedItem struct {
Meta *Metadata
Factory rule.Factory
Validators []rule.Validator
}
func init() {
@ -76,7 +78,7 @@ func init() {
Required: true,
},
},
}, latestps.New)
}, latestps.New, latestps.Valid)
// Register latest pulled
Register(&Metadata{
@ -90,7 +92,7 @@ func init() {
Required: true,
},
},
}, latestpl.New)
}, latestpl.New, latestpl.Valid)
// Register latest active
Register(&Metadata{
@ -146,7 +148,7 @@ func init() {
Required: true,
},
},
}, dayspl.New)
}, dayspl.New, dayspl.Valid)
// Register daysps
Register(&Metadata{
@ -160,22 +162,60 @@ func init() {
Required: true,
},
},
}, daysps.New)
}, daysps.New, daysps.Valid)
}
// Register the rule evaluator with the corresponding rule template
func Register(meta *Metadata, factory rule.Factory) {
func Register(meta *Metadata, factory rule.Factory, validator ...rule.Validator) {
if meta == nil || factory == nil || len(meta.TemplateID) == 0 {
// do nothing
return
}
index.Store(meta.TemplateID, &indexedItem{
Meta: meta,
Factory: factory,
Meta: meta,
Factory: factory,
Validators: validator,
})
}
// Valid ...
func Valid(templateID string, parameters rule.Parameters) error {
if len(templateID) == 0 {
return errors.New("empty rule template ID")
}
v, ok := index.Load(templateID)
if !ok {
return errors.Errorf("rule evaluator %s is not registered", templateID)
}
item := v.(*indexedItem)
// We can check more things if we want to do in the future
if len(item.Meta.Parameters) > 0 {
for _, p := range item.Meta.Parameters {
if p.Required {
exists := parameters != nil
if exists {
_, exists = parameters[p.Name]
}
if !exists {
return errors.Errorf("missing required parameter %s for rule %s", p.Name, templateID)
}
}
}
}
for _, v := range item.Validators {
err := v(parameters)
if err != nil {
return err
}
}
return nil
}
// Get rule evaluator with the provided template ID
func Get(templateID string, parameters rule.Parameters) (rule.Evaluator, error) {
if len(templateID) == 0 {

5
src/pkg/retention/policy/rule/lastx/evaluator.go
View File

@ -15,6 +15,7 @@
package lastx
import (
"github.com/goharbor/harbor/src/common/utils"
"time"
"github.com/goharbor/harbor/src/common/utils/log"
@ -58,8 +59,8 @@ func (e *evaluator) Action() string {
// New a Evaluator
func New(params rule.Parameters) rule.Evaluator {
if params != nil {
if param, ok := params[ParameterX]; ok {
if v, ok := param.(float64); ok && v >= 0 {
if p, ok := params[ParameterX]; ok {
if v, ok := utils.ParseJSONInt(p); ok && v >= 0 {
return &evaluator{
x: int(v),
}

5
src/pkg/retention/policy/rule/latestk/evaluator.go
View File

@ -15,6 +15,7 @@
package latestk
import (
"github.com/goharbor/harbor/src/common/utils"
"sort"
"github.com/goharbor/harbor/src/common/utils/log"
@ -64,8 +65,8 @@ func (e *evaluator) Action() string {
// New a Evaluator
func New(params rule.Parameters) rule.Evaluator {
if params != nil {
if param, ok := params[ParameterK]; ok {
if v, ok := param.(float64); ok && v >= 0 {
if p, ok := params[ParameterK]; ok {
if v, ok := utils.ParseJSONInt(p); ok && v >= 0 {
return &evaluator{
k: int(v),
}

24
src/pkg/retention/policy/rule/latestpl/evaluator.go
View File

@ -15,6 +15,9 @@
package latestpl
import (
"fmt"
"github.com/goharbor/harbor/src/common/utils"
"math"
"sort"
"github.com/goharbor/harbor/src/common/utils/log"
@ -59,7 +62,7 @@ func (e *evaluator) Action() string {
func New(params rule.Parameters) rule.Evaluator {
if params != nil {
if p, ok := params[ParameterN]; ok {
if v, ok := p.(float64); ok && v >= 0 {
if v, ok := utils.ParseJSONInt(p); ok && v >= 0 {
return &evaluator{n: int(v)}
}
}
@ -69,3 +72,22 @@ func New(params rule.Parameters) rule.Evaluator {
return &evaluator{n: DefaultN}
}
// Valid ...
func Valid(params rule.Parameters) error {
if params != nil {
if p, ok := params[ParameterN]; ok {
if v, ok := utils.ParseJSONInt(p); ok {
if v < 0 {
return fmt.Errorf("%s is less than zero", ParameterN)
}
if v >= math.MaxInt16 {
return fmt.Errorf("%s is too large", ParameterN)
}
} else {
return fmt.Errorf("%s type error", ParameterN)
}
}
}
return nil
}

21
src/pkg/retention/policy/rule/latestpl/evaluator_test.go
View File

@ -15,6 +15,7 @@
package latestpl
import (
"errors"
"fmt"
"math/rand"
"testing"
@ -84,6 +85,26 @@ func (e *EvaluatorTestSuite) TestProcess() {
}
}
func (e *EvaluatorTestSuite) TestValid() {
tests := []struct {
Name string
args rule.Parameters
expectedK error
}{
{Name: "Valid", args: map[string]rule.Parameter{ParameterN: 5}, expectedK: nil},
{Name: "Negative", args: map[string]rule.Parameter{ParameterN: -1}, expectedK: errors.New("latestPulledN is less than zero")},
{Name: "Big", args: map[string]rule.Parameter{ParameterN: 40000}, expectedK: errors.New("latestPulledN is too large")},
}
for _, tt := range tests {
e.T().Run(tt.Name, func(t *testing.T) {
err := Valid(tt.args)
require.Equal(t, tt.expectedK, err)
})
}
}
func TestEvaluatorSuite(t *testing.T) {
suite.Run(t, &EvaluatorTestSuite{})
}

26
src/pkg/retention/policy/rule/latestps/evaluator.go
View File

@ -15,6 +15,9 @@
package latestps
import (
"fmt"
"github.com/goharbor/harbor/src/common/utils"
"math"
"sort"
"github.com/goharbor/harbor/src/common/utils/log"
@ -61,8 +64,8 @@ func (e *evaluator) Action() string {
// New a Evaluator
func New(params rule.Parameters) rule.Evaluator {
if params != nil {
if param, ok := params[ParameterK]; ok {
if v, ok := param.(float64); ok && v >= 0 {
if p, ok := params[ParameterK]; ok {
if v, ok := utils.ParseJSONInt(p); ok && v >= 0 {
return &evaluator{
k: int(v),
}
@ -76,3 +79,22 @@ func New(params rule.Parameters) rule.Evaluator {
k: DefaultK,
}
}
// Valid ...
func Valid(params rule.Parameters) error {
if params != nil {
if p, ok := params[ParameterK]; ok {
if v, ok := utils.ParseJSONInt(p); ok {
if v < 0 {
return fmt.Errorf("%s is less than zero", ParameterK)
}
if v >= math.MaxInt16 {
return fmt.Errorf("%s is too large", ParameterK)
}
} else {
return fmt.Errorf("%s type error", ParameterK)
}
}
}
return nil
}

21
src/pkg/retention/policy/rule/latestps/evaluator_test.go
View File

@ -1,6 +1,7 @@
package latestps
import (
"errors"
"fmt"
"math/rand"
"testing"
@ -66,6 +67,26 @@ func (e *EvaluatorTestSuite) TestProcess() {
}
}
func (e *EvaluatorTestSuite) TestValid() {
tests := []struct {
Name string
args rule.Parameters
expectedK error
}{
{Name: "Valid", args: map[string]rule.Parameter{ParameterK: 5}, expectedK: nil},
{Name: "Negative", args: map[string]rule.Parameter{ParameterK: -1}, expectedK: errors.New("latestPushedK is less than zero")},
{Name: "Big", args: map[string]rule.Parameter{ParameterK: 40000}, expectedK: errors.New("latestPushedK is too large")},
}
for _, tt := range tests {
e.T().Run(tt.Name, func(t *testing.T) {
err := Valid(tt.args)
require.Equal(t, tt.expectedK, err)
})
}
}
func TestEvaluator(t *testing.T) {
suite.Run(t, &EvaluatorTestSuite{})
}