Resort to generic ber packet design instead of fixed octet string in …

…requestValue
go-ldap · Apr 24, 2024 · b6483ea · b6483ea
1 parent 49bb329
commit b6483ea
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/extend.go b/extend.go
@@ -39,7 +39,7 @@ func (er ExtendedRequest) appendTo(envelope *ber.Packet) error {
 
 type ExtendResponse struct {
 	Name  string
-	Value string
+	Value *ber.Packet
 }
 
 func (l *Conn) Extended(er *ExtendedRequest) (*ExtendResponse, error) {
@@ -57,7 +57,11 @@ func (l *Conn) Extended(er *ExtendedRequest) (*ExtendResponse, error) {
 	if err != nil {
 		return nil, err
 	}
-	if len(packet.Children) < 2 || len(packet.Children[1].Children) < 4 {
+	if err = GetLDAPError(packet); err != nil {
+		return nil, err
+	}
+
+	if len(packet.Children[1].Children) < 4 {
 		return nil, fmt.Errorf(
 			"ldap: malformed extended response: expected 4 children, got %d",
 			len(packet.Children),
@@ -67,7 +71,7 @@ func (l *Conn) Extended(er *ExtendedRequest) (*ExtendResponse, error) {
 	response := new(ExtendResponse)
 	response.Name = packet.Children[1].Children[3].Data.String()
 	if len(packet.Children) == 4 {
-		response.Value = packet.Children[1].Children[4].Data.String()
+		response.Value = packet.Children[1].Children[4]
 	}
 
 	return response, nil

diff --git a/v3/extend.go b/v3/extend.go
@@ -39,7 +39,7 @@ func (er ExtendedRequest) appendTo(envelope *ber.Packet) error {
 
 type ExtendResponse struct {
 	Name  string
-	Value string
+	Value *ber.Packet
 }
 
 func (l *Conn) Extended(er *ExtendedRequest) (*ExtendResponse, error) {
@@ -57,7 +57,11 @@ func (l *Conn) Extended(er *ExtendedRequest) (*ExtendResponse, error) {
 	if err != nil {
 		return nil, err
 	}
-	if len(packet.Children) < 2 || len(packet.Children[1].Children) < 4 {
+	if err = GetLDAPError(packet); err != nil {
+		return nil, err
+	}
+
+	if len(packet.Children[1].Children) < 4 {
 		return nil, fmt.Errorf(
 			"ldap: malformed extended response: expected 4 children, got %d",
 			len(packet.Children),
@@ -67,7 +71,7 @@ func (l *Conn) Extended(er *ExtendedRequest) (*ExtendResponse, error) {
 	response := new(ExtendResponse)
 	response.Name = packet.Children[1].Children[3].Data.String()
 	if len(packet.Children) == 4 {
-		response.Value = packet.Children[1].Children[4].Data.String()
+		response.Value = packet.Children[1].Children[4]
 	}
 
 	return response, nil