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/extended_request.go | 69 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100644 goldap/extended_request.go (limited to 'goldap/extended_request.go') diff --git a/goldap/extended_request.go b/goldap/extended_request.go new file mode 100644 index 0000000..983ebf9 --- /dev/null +++ b/goldap/extended_request.go @@ -0,0 +1,69 @@ +package message + +import "fmt" + +// +// ExtendedRequest ::= [APPLICATION 23] SEQUENCE { +// requestName [0] LDAPOID, +// requestValue [1] OCTET STRING OPTIONAL } + +func (extended *ExtendedRequest) RequestName() LDAPOID { + return extended.requestName +} + +func (extended *ExtendedRequest) RequestValue() *OCTETSTRING { + return extended.requestValue +} + +func readExtendedRequest(bytes *Bytes) (ret ExtendedRequest, err error) { + err = bytes.ReadSubBytes(classApplication, TagExtendedRequest, ret.readComponents) + if err != nil { + err = LdapError{fmt.Sprintf("readExtendedRequest:\n%s", err.Error())} + return + } + return +} + +func (extended *ExtendedRequest) readComponents(bytes *Bytes) (err error) { + extended.requestName, err = readTaggedLDAPOID(bytes, classContextSpecific, TagExtendedRequestName) + if err != nil { + err = LdapError{fmt.Sprintf("readComponents:\n%s", err.Error())} + return + } + if bytes.HasMoreData() { + var tag TagAndLength + tag, err = bytes.PreviewTagAndLength() + if err != nil { + err = LdapError{fmt.Sprintf("readComponents:\n%s", err.Error())} + return + } + if tag.Tag == TagExtendedRequestValue { + var requestValue OCTETSTRING + requestValue, err = readTaggedOCTETSTRING(bytes, classContextSpecific, TagExtendedRequestValue) + if err != nil { + err = LdapError{fmt.Sprintf("readComponents:\n%s", err.Error())} + return + } + extended.requestValue = requestValue.Pointer() + } + } + return +} + +func (extended ExtendedRequest) write(bytes *Bytes) (size int) { + if extended.requestValue != nil { + size += extended.requestValue.writeTagged(bytes, classContextSpecific, TagExtendedRequestValue) + } + size += extended.requestName.writeTagged(bytes, classContextSpecific, TagExtendedRequestName) + size += bytes.WriteTagAndLength(classApplication, isCompound, TagExtendedRequest, size) + return +} + +func (extended ExtendedRequest) size() (size int) { + size += extended.requestName.sizeTagged(TagExtendedRequestName) + if extended.requestValue != nil { + size += extended.requestValue.sizeTagged(TagExtendedRequestValue) + } + size += sizeTagAndLength(TagExtendedRequest, size) + return +} -- cgit v1.2.3