uppal/cgrates
1
0
Fork 1
mirror of https://github.com/cgrates/cgrates.git synced 2026-02-25 00:58:45 +05:00
Code Issues Packages Projects Releases Wiki Activity

Update negative filter and rsrfielter

Browse Source
This commit is contained in:
Trial97
2018-11-27 11:00:12 +02:00
committed by Dan Christian Bogos
parent 59cf8e2975
commit 14b9a1b3a1
4 changed files with 104 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
engine/filters.go
View File

@@ -149,26 +149,32 @@ func (f *Filter) Compile() (err error) {
}
func NewFilterRule(rfType, fieldName string, vals []string) (*FilterRule, error) {
ftype := rfType
var negative bool
if strings.HasPrefix(rfType, MetaNot) {
ftype = "*" + strings.TrimPrefix(rfType, MetaNot)
rfType = "*" + strings.TrimPrefix(rfType, MetaNot)
negative = true
}
if !utils.IsSliceMember([]string{MetaString, MetaPrefix, MetaSuffix,
MetaTimings, MetaRSR, MetaStatS, MetaDestinations, MetaEmpty,
MetaLessThan, MetaLessOrEqual, MetaGreaterThan, MetaGreaterOrEqual}, ftype) {
MetaLessThan, MetaLessOrEqual, MetaGreaterThan, MetaGreaterOrEqual}, rfType) {
return nil, fmt.Errorf("Unsupported filter Type: %s", rfType)
}
if fieldName == "" && utils.IsSliceMember([]string{MetaString, MetaPrefix, MetaSuffix,
MetaTimings, MetaDestinations, MetaLessThan, MetaEmpty,
MetaLessOrEqual, MetaGreaterThan, MetaGreaterOrEqual}, ftype) {
MetaLessOrEqual, MetaGreaterThan, MetaGreaterOrEqual}, rfType) {
return nil, fmt.Errorf("FieldName is mandatory for Type: %s", rfType)
}
if len(vals) == 0 && utils.IsSliceMember([]string{MetaString, MetaPrefix, MetaSuffix,
MetaTimings, MetaRSR, MetaDestinations, MetaDestinations, MetaLessThan,
MetaLessOrEqual, MetaGreaterThan, MetaGreaterOrEqual}, ftype) {
MetaLessOrEqual, MetaGreaterThan, MetaGreaterOrEqual}, rfType) {
return nil, fmt.Errorf("Values is mandatory for Type: %s", rfType)
}
rf := &FilterRule{Type: rfType, FieldName: fieldName, Values: vals}
rf := &FilterRule{
Type: rfType,
FieldName: fieldName,
Values: vals,
negative: negative,
}
if err := rf.CompileValues(); err != nil {
return nil, err
}
@@ -194,15 +200,15 @@ type FilterRule struct {
// Separate method to compile RSR fields
func (rf *FilterRule) CompileValues() (err error) {
rftype := rf.Type
if strings.HasPrefix(rftype, MetaNot) {
rftype = "*" + strings.TrimPrefix(rftype, MetaNot)
if !rf.negative && strings.HasPrefix(rf.Type, MetaNot) {
rf.Type = "*" + strings.TrimPrefix(rf.Type, MetaNot)
rf.negative = true
}
if rftype == MetaRSR {
if rf.Type == MetaRSR {
if rf.rsrFields, err = config.NewRSRParsersFromSlice(rf.Values, true); err != nil {
return
}
} else if rftype == MetaStatS {
} else if rf.Type == MetaStatS {
rf.statSThresholds = make([]*RFStatSThreshold, len(rf.Values))
for i, val := range rf.Values {
valSplt := strings.Split(val, utils.InInFieldSep)
@@ -255,13 +261,10 @@ func (fltr *FilterRule) Pass(dP config.DataProvider, rpcClnt rpcclient.RpcClient
default:
err = utils.ErrNotImplemented
}
if fltr.negative {
result = !result
}
if err != nil {
return false, err
}
return
return result != fltr.negative, nil
}
func (fltr *FilterRule) passString(dP config.DataProvider) (bool, error) {

2
engine/filters_test.go
View File

@@ -478,7 +478,7 @@ func TestFilterNewRequestFilter(t *testing.T) {
if err != nil {
t.Errorf("Error: %+v", err)
}
erf = &FilterRule{Type: "*notgt", FieldName: "NotMetaGreaterOrEqual", Values: []string{"20"}}
erf = &FilterRule{Type: "*gt", FieldName: "NotMetaGreaterOrEqual", Values: []string{"20"}, negative: true}
if !reflect.DeepEqual(erf, rf) {
t.Errorf("Expecting: %+v, received: %+v", erf, rf)
}

8
utils/rsrfield.go
View File

@@ -265,7 +265,7 @@ func (rsrFltr *RSRFilter) Pass(val string) bool {
Logger.Warning(fmt.Sprintf("<RSRFilter> rule: <%s>, err: <%s>", rsrFltr.filterRule, err.Error()))
return false
}
return gt && !rsrFltr.negative
return gt != rsrFltr.negative
}
if len(rsrFltr.filterRule) > 2 && rsrFltr.filterRule[:2] == MatchLessThanOrEqual {
@@ -276,7 +276,7 @@ func (rsrFltr *RSRFilter) Pass(val string) bool {
Logger.Warning(fmt.Sprintf("<RSRFilter> rule: <%s>, err: <%s>", rsrFltr.filterRule, err.Error()))
return false
}
return gt && !rsrFltr.negative
return gt != rsrFltr.negative
}
if rsrFltr.filterRule[:1] == MatchGreaterThan {
@@ -286,7 +286,7 @@ func (rsrFltr *RSRFilter) Pass(val string) bool {
Logger.Warning(fmt.Sprintf("<RSRFilter> rule: <%s>, err: <%s>", rsrFltr.filterRule, err.Error()))
return false
}
return gt && !rsrFltr.negative
return gt != rsrFltr.negative
}
if rsrFltr.filterRule[:1] == MatchLessThan {
@@ -297,7 +297,7 @@ func (rsrFltr *RSRFilter) Pass(val string) bool {
Logger.Warning(fmt.Sprintf("<RSRFilter> rule: <%s>, err: <%s>", rsrFltr.filterRule, err.Error()))
return false
}
return gt && !rsrFltr.negative
return gt != rsrFltr.negative
}
return (strings.Index(val, rsrFltr.filterRule) != -1) != rsrFltr.negative // default is string index
}

93
utils/rsrfield_test.go
View File

@@ -31,7 +31,7 @@ func TestNewRSRField1(t *testing.T) {
Id: "sip_redirected_to",
Rules: rulesStr,
RSRules: []*ReSearchReplace{
&ReSearchReplace{
{
SearchRegexp: regexp.MustCompile(`sip:\+49(\d+)@`),
ReplaceTemplate: "0$1"}},
filters: []*RSRFilter{filter},
@@ -47,7 +47,7 @@ func TestNewRSRField1(t *testing.T) {
// rulesStr = `~sip_redirected_to:s/sip:\+49(\d+)@/0$1/{*duration_seconds;*round:5:*middle}(086517174963)`
filter, _ = NewRSRFilter("086517174963")
expRSRField2 := &RSRField{Id: "sip_redirected_to", Rules: rulesStr, filters: []*RSRFilter{filter},
RSRules: []*ReSearchReplace{&ReSearchReplace{SearchRegexp: regexp.MustCompile(`sip:\+49(\d+)@`), ReplaceTemplate: "0$1"}}}
RSRules: []*ReSearchReplace{{SearchRegexp: regexp.MustCompile(`sip:\+49(\d+)@`), ReplaceTemplate: "0$1"}}}
if rsrField, err := NewRSRField(rulesStr); err != nil {
t.Error("Unexpected error: ", err.Error())
} else if !reflect.DeepEqual(expRSRField2, rsrField) {
@@ -60,7 +60,7 @@ func TestNewRSRField1(t *testing.T) {
Id: "sip_redirected_to",
Rules: rulesStr,
RSRules: []*ReSearchReplace{
&ReSearchReplace{
{
SearchRegexp: regexp.MustCompile(`sip:\+49(\d+)@`),
ReplaceTemplate: "0$1"}},
filters: []*RSRFilter{filter},
@@ -74,7 +74,7 @@ func TestNewRSRField1(t *testing.T) {
// One extra separator but escaped
rulesStr = `~sip_redirected_to:s/sip:\+49(\d+)\/@/0$1/`
expRSRField3 := &RSRField{Id: "sip_redirected_to", Rules: rulesStr,
RSRules: []*ReSearchReplace{&ReSearchReplace{SearchRegexp: regexp.MustCompile(`sip:\+49(\d+)\/@`), ReplaceTemplate: "0$1"}}}
RSRules: []*ReSearchReplace{{SearchRegexp: regexp.MustCompile(`sip:\+49(\d+)\/@`), ReplaceTemplate: "0$1"}}}
if rsrField, err := NewRSRField(rulesStr); err != nil {
t.Error("Unexpected error: ", err.Error())
} else if !reflect.DeepEqual(expRSRField3, rsrField) {
@@ -85,7 +85,7 @@ func TestNewRSRField1(t *testing.T) {
func TestNewRSRFieldDDz(t *testing.T) {
rulesStr := `~effective_caller_id_number:s/(\d+)/+$1/`
expectRSRField := &RSRField{Id: "effective_caller_id_number", Rules: rulesStr,
RSRules: []*ReSearchReplace{&ReSearchReplace{SearchRegexp: regexp.MustCompile(`(\d+)`), ReplaceTemplate: "+$1"}}}
RSRules: []*ReSearchReplace{{SearchRegexp: regexp.MustCompile(`(\d+)`), ReplaceTemplate: "+$1"}}}
if rsrField, err := NewRSRField(rulesStr); err != nil {
t.Error(err)
} else if !reflect.DeepEqual(rsrField, expectRSRField) {
@@ -96,7 +96,7 @@ func TestNewRSRFieldDDz(t *testing.T) {
func TestNewRSRFieldIvo(t *testing.T) {
rulesStr := `~cost_details:s/MatchedDestId":".+_(\s\s\s\s\s)"/$1/`
expectRSRField := &RSRField{Id: "cost_details", Rules: rulesStr,
RSRules: []*ReSearchReplace{&ReSearchReplace{SearchRegexp: regexp.MustCompile(`MatchedDestId":".+_(\s\s\s\s\s)"`), ReplaceTemplate: "$1"}}}
RSRules: []*ReSearchReplace{{SearchRegexp: regexp.MustCompile(`MatchedDestId":".+_(\s\s\s\s\s)"`), ReplaceTemplate: "$1"}}}
if rsrField, err := NewRSRField(rulesStr); err != nil {
t.Error(err)
} else if !reflect.DeepEqual(rsrField, expectRSRField) {
@@ -111,8 +111,8 @@ func TestConvertPlusNationalAnd00(t *testing.T) {
rulesStr := `~effective_caller_id_number:s/\+49(\d+)/0$1/:s/\+(\d+)/00$1/`
expectRSRField := &RSRField{Id: "effective_caller_id_number", Rules: rulesStr,
RSRules: []*ReSearchReplace{
&ReSearchReplace{SearchRegexp: regexp.MustCompile(`\+49(\d+)`), ReplaceTemplate: "0$1"},
&ReSearchReplace{SearchRegexp: regexp.MustCompile(`\+(\d+)`), ReplaceTemplate: "00$1"}}}
{SearchRegexp: regexp.MustCompile(`\+49(\d+)`), ReplaceTemplate: "0$1"},
{SearchRegexp: regexp.MustCompile(`\+(\d+)`), ReplaceTemplate: "00$1"}}}
rsrField, err := NewRSRField(rulesStr)
if err != nil {
t.Error(err)
@@ -164,7 +164,7 @@ func TestConvertDurToSecs(t *testing.T) {
rulesStr := `~9:s/^(\d+)$/${1}s/`
expectRSRField := &RSRField{Id: "9", Rules: rulesStr,
RSRules: []*ReSearchReplace{
&ReSearchReplace{SearchRegexp: regexp.MustCompile(`^(\d+)$`), ReplaceTemplate: "${1}s"}}}
{SearchRegexp: regexp.MustCompile(`^(\d+)$`), ReplaceTemplate: "${1}s"}}}
rsrField, err := NewRSRField(rulesStr)
if err != nil {
t.Error(err)
@@ -182,7 +182,7 @@ func TestPrefix164(t *testing.T) {
rulesStr := `~0:s/^([1-9]\d+)$/+$1/`
expectRSRField := &RSRField{Id: "0", Rules: rulesStr,
RSRules: []*ReSearchReplace{
&ReSearchReplace{SearchRegexp: regexp.MustCompile(`^([1-9]\d+)$`), ReplaceTemplate: "+$1"}}}
{SearchRegexp: regexp.MustCompile(`^([1-9]\d+)$`), ReplaceTemplate: "+$1"}}}
rsrField, err := NewRSRField(rulesStr)
if err != nil {
t.Error(err)
@@ -201,7 +201,7 @@ func TestIsStatic(t *testing.T) {
if !rsr1.IsStatic() {
t.Error("Failed to detect static value.")
}
rsr2 := &RSRField{Id: "0", RSRules: []*ReSearchReplace{&ReSearchReplace{SearchRegexp: regexp.MustCompile(`^([1-9]\d+)$`), ReplaceTemplate: "+$1"}}}
rsr2 := &RSRField{Id: "0", RSRules: []*ReSearchReplace{{SearchRegexp: regexp.MustCompile(`^([1-9]\d+)$`), ReplaceTemplate: "+$1"}}}
if rsr2.IsStatic() {
t.Error("Non static detected as static value")
}
@@ -223,7 +223,7 @@ func TestParseRSRFields(t *testing.T) {
expectParsedFields := RSRFields{
&RSRField{Id: "host", Rules: "host"},
&RSRField{Id: "sip_redirected_to", Rules: `~sip_redirected_to:s/sip:\+49(\d+)@/0$1/`,
RSRules: []*ReSearchReplace{&ReSearchReplace{SearchRegexp: regexp.MustCompile(`sip:\+49(\d+)@`), ReplaceTemplate: "0$1"}}},
RSRules: []*ReSearchReplace{{SearchRegexp: regexp.MustCompile(`sip:\+49(\d+)@`), ReplaceTemplate: "0$1"}}},
&RSRField{Id: "destination", Rules: "destination"}}
if parsedFields, err := ParseRSRFields(fields, FIELDS_SEP); err != nil {
t.Error("Unexpected error: ", err.Error())
@@ -497,6 +497,21 @@ func TestRSRFilterPass(t *testing.T) {
t.Error("not passing!")
}
// compare not greaterThan
fltr, err = NewRSRFilter("!>0s") // !(n>0s)
if err != nil {
t.Error(err)
}
if !fltr.Pass("0s") {
t.Error("not passing!")
}
if fltr.Pass("13") {
t.Error("passing!")
}
if fltr.Pass("12s") {
t.Error("passing!")
}
// compare greaterThanOrEqual
fltr, err = NewRSRFilter(">=0s")
if err != nil {
@@ -515,6 +530,24 @@ func TestRSRFilterPass(t *testing.T) {
t.Error("not passing!")
}
// compare not greaterThanOrEqual
fltr, err = NewRSRFilter("!>=0s")
if err != nil {
t.Error(err)
}
if !fltr.Pass("-1s") {
t.Error("not passing!")
}
if fltr.Pass("0s") {
t.Error("passing!")
}
if fltr.Pass("13") {
t.Error("passing!")
}
if fltr.Pass("12s") {
t.Error("passing!")
}
// compare lessThan
fltr, err = NewRSRFilter("<0s")
if err != nil {
@@ -533,6 +566,24 @@ func TestRSRFilterPass(t *testing.T) {
t.Error("not passing!")
}
// compare not lessThan
fltr, err = NewRSRFilter("!<0s")
if err != nil {
t.Error(err)
}
if !fltr.Pass("1ns") {
t.Error("not passing!")
}
if fltr.Pass("13") {
t.Error("passing!")
}
if !fltr.Pass("12s") {
t.Error("not passing!")
}
if fltr.Pass("-12s") {
t.Error("passing!")
}
// compare lessThanOrEqual
fltr, err = NewRSRFilter("<=0s")
if err != nil {
@@ -550,6 +601,24 @@ func TestRSRFilterPass(t *testing.T) {
if fltr.Pass("12s") {
t.Error("passing!")
}
// compare not lessThanOrEqual
fltr, err = NewRSRFilter("!<=0s")
if err != nil {
t.Error(err)
}
if fltr.Pass("-1s") {
t.Error("passing!")
}
if fltr.Pass("0s") {
t.Error("passing!")
}
if fltr.Pass("13") {
t.Error("passing!")
}
if !fltr.Pass("12s") {
t.Error("not passing!")
}
}
func TestRSRFiltersPass(t *testing.T) {