From 563fc272a36c8be317fbe95c8308ca2dfa29c3aa Mon Sep 17 00:00:00 2001 From: Quentin Dufour Date: Wed, 7 Jul 2021 01:49:33 +0200 Subject: Vendor goldap, fix ASN.1 BER integer and length encoding - Add tests for goldap to prevent regressions - Disable reconnection for our functional tests --- goldap/filter_and.go | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 goldap/filter_and.go (limited to 'goldap/filter_and.go') diff --git a/goldap/filter_and.go b/goldap/filter_and.go new file mode 100644 index 0000000..981284d --- /dev/null +++ b/goldap/filter_and.go @@ -0,0 +1,54 @@ +package message + +import "fmt" + +// and [0] SET SIZE (1..MAX) OF filter Filter, + +func (filterAnd FilterAnd) getFilterTag() int { + return TagFilterAnd +} + +func (filterAnd FilterAnd) size() (size int) { + for _, filter := range filterAnd { + size += filter.size() + } + size += sizeTagAndLength(TagFilterAnd, size) + return +} + +func (filterAnd *FilterAnd) readComponents(bytes *Bytes) (err error) { + count := 0 + for bytes.HasMoreData() { + count++ + var filter Filter + filter, err = readFilter(bytes) + if err != nil { + err = LdapError{fmt.Sprintf("readComponents (filter %d):\n%s", count, err.Error())} + return + } + *filterAnd = append(*filterAnd, filter) + } + if len(*filterAnd) == 0 { + err = LdapError{"readComponents: expecting at least one Filter"} + return + } + return +} + +func (filterAnd FilterAnd) write(bytes *Bytes) (size int) { + + for i := len(filterAnd) - 1; i >= 0; i-- { + size += filterAnd[i].write(bytes) + } + size += bytes.WriteTagAndLength(classContextSpecific, isCompound, TagFilterAnd, size) + return +} + +func readFilterAnd(bytes *Bytes) (filterand FilterAnd, err error) { + err = bytes.ReadSubBytes(classContextSpecific, TagFilterAnd, filterand.readComponents) + if err != nil { + err = LdapError{fmt.Sprintf("readFilterAnd:\n%s", err.Error())} + return + } + return +} -- cgit v1.2.3