From 02c93a248c90414f7f8f27eac7fb26518ca65eb6 Mon Sep 17 00:00:00 2001 From: DanB Date: Tue, 17 Apr 2018 13:49:28 +0200 Subject: [PATCH] Radius - use > as separator within Vendor attribute selection, so we can be consistent --- agents/librad.go | 2 +- agents/librad_test.go | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/agents/librad.go b/agents/librad.go index d21317631..f56b0956a 100644 --- a/agents/librad.go +++ b/agents/librad.go @@ -94,7 +94,7 @@ func (pv processorVars) valAsString(fldPath string) (val string, err error) { // radAttrVendorFromPath returns AttributenName and VendorName from path // path should be the form attributeName or vendorName/attributeName func attrVendorFromPath(path string) (attrName, vendorName string) { - splt := strings.Split(path, "/") + splt := strings.Split(path, utils.HIERARCHY_SEP) if len(splt) > 1 { vendorName, attrName = splt[0], splt[1] } else { diff --git a/agents/librad_test.go b/agents/librad_test.go index 0acee0351..6fbc5eb7c 100644 --- a/agents/librad_test.go +++ b/agents/librad_test.go @@ -83,7 +83,7 @@ func TestAttrVendorFromPath(t *testing.T) { vendorName != "" { t.Error("failed") } - if attrName, vendorName := attrVendorFromPath("Cisco/Cisco-NAS-Port"); attrName != "Cisco-NAS-Port" || + if attrName, vendorName := attrVendorFromPath("Cisco>Cisco-NAS-Port"); attrName != "Cisco-NAS-Port" || vendorName != "Cisco" { t.Error("failed") } @@ -109,11 +109,11 @@ func TestRadPassesFieldFilter(t *testing.T) { t.Error("passing invalid filter value") } if !radPassesFieldFilter(pkt, nil, - utils.NewRSRFieldMustCompile("Cisco/Cisco-NAS-Port(CGR1)")) { + utils.NewRSRFieldMustCompile("Cisco>Cisco-NAS-Port(CGR1)")) { t.Error("not passing valid filter") } if radPassesFieldFilter(pkt, nil, - utils.NewRSRFieldMustCompile("Cisco/Cisco-NAS-Port(notmatching)")) { + utils.NewRSRFieldMustCompile("Cisco>Cisco-NAS-Port(notmatching)")) { t.Error("passing invalid filter value") } if !radPassesFieldFilter(pkt, processorVars{MetaRadReqType: MetaRadAuth}, @@ -140,7 +140,7 @@ func TestRadComposedFieldValue(t *testing.T) { } eOut := fmt.Sprintf("%s|flopsy|CGR1", MetaRadAcctStart) if out := radComposedFieldValue(pkt, processorVars{MetaRadReqType: MetaRadAcctStart}, - utils.ParseRSRFieldsMustCompile(fmt.Sprintf("%s;^|;User-Name;^|;Cisco/Cisco-NAS-Port", + utils.ParseRSRFieldsMustCompile(fmt.Sprintf("%s;^|;User-Name;^|;Cisco>Cisco-NAS-Port", MetaRadReqType), utils.INFIELD_SEP)); out != eOut { t.Errorf("Expecting: <%s>, received: <%s>", eOut, out) } @@ -156,7 +156,7 @@ func TestRadFieldOutVal(t *testing.T) { } eOut := fmt.Sprintf("%s|flopsy|CGR1", MetaRadAcctStart) cfgFld := &config.CfgCdrField{Tag: "ComposedTest", Type: utils.META_COMPOSED, FieldId: utils.Destination, - Value: utils.ParseRSRFieldsMustCompile(fmt.Sprintf("%s;^|;User-Name;^|;Cisco/Cisco-NAS-Port", MetaRadReqType), utils.INFIELD_SEP), Mandatory: true} + Value: utils.ParseRSRFieldsMustCompile(fmt.Sprintf("%s;^|;User-Name;^|;Cisco>Cisco-NAS-Port", MetaRadReqType), utils.INFIELD_SEP), Mandatory: true} if outVal, err := radFieldOutVal(pkt, processorVars{MetaRadReqType: MetaRadAcctStart}, cfgFld); err != nil { t.Error(err) } else if outVal != eOut {