refactor: factorize referral retrieval

go-ldap · Apr 30, 2022 · 76b0db3 · 76b0db3
1 parent 6e90b19
commit 76b0db3
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 44 deletions.
diff --git a/modify.go b/modify.go
@@ -161,17 +161,8 @@ func (l *Conn) ModifyWithResult(modifyRequest *ModifyRequest) (*ModifyResult, er
 	case ApplicationModifyResponse:
 		err := GetLDAPError(packet)
 		if err != nil {
-			if IsErrorWithCode(err, LDAPResultReferral) && len(packet.Children) >= 2 {
-				for _, child := range packet.Children[1].Children {
-					if child.Tag == ber.TagBitString && len(child.Children) >= 1 {
-						referral, ok := child.Children[0].Value.(string)
-						if ok {
-							result.Referral = referral
-
-							break
-						}
-					}
-				}
+			if referral, ok := getReferral(err, packet); ok {
+				result.Referral = referral
 			}
 
 			return result, err

diff --git a/passwdmodify.go b/passwdmodify.go
@@ -97,17 +97,8 @@ func (l *Conn) PasswordModify(passwordModifyRequest *PasswordModifyRequest) (*Pa
 	if packet.Children[1].Tag == ApplicationExtendedResponse {
 		err := GetLDAPError(packet)
 		if err != nil {
-			if IsErrorWithCode(err, LDAPResultReferral) && len(packet.Children) >= 2 {
-				for _, child := range packet.Children[1].Children {
-					if child.Tag == ber.TagBitString && len(child.Children) >= 1 {
-						referral, ok := child.Children[0].Value.(string)
-						if ok {
-							result.Referral = referral
-
-							break
-						}
-					}
-				}
+			if referral, ok := getReferral(err, packet); ok {
+				result.Referral = referral
 			}
 
 			return result, err

diff --git a/request.go b/request.go
@@ -69,3 +69,19 @@ func (l *Conn) readPacket(msgCtx *messageContext) (*ber.Packet, error) {
 	}
 	return packet, nil
 }
+
+func getReferral(err error, packet *ber.Packet) (referral string, ok bool) {
+	if !IsErrorWithCode(err, LDAPResultReferral) || len(packet.Children) < 2 {
+		return "", false
+	}
+
+	for _, child := range packet.Children[1].Children {
+		if child.Tag == ber.TagBitString && len(child.Children) >= 1 {
+			if referral, ok = child.Children[0].Value.(string); ok {
+				return referral, ok
+			}
+		}
+	}
+
+	return "", false
+}
diff --git a/v3/modify.go b/v3/modify.go
@@ -161,17 +161,8 @@ func (l *Conn) ModifyWithResult(modifyRequest *ModifyRequest) (*ModifyResult, er
 	case ApplicationModifyResponse:
 		err := GetLDAPError(packet)
 		if err != nil {
-			if IsErrorWithCode(err, LDAPResultReferral) && len(packet.Children) >= 2 {
-				for _, child := range packet.Children[1].Children {
-					if child.Tag == ber.TagBitString && len(child.Children) >= 1 {
-						referral, ok := child.Children[0].Value.(string)
-						if ok {
-							result.Referral = referral
-
-							break
-						}
-					}
-				}
+			if referral, ok := getReferral(err, packet); ok {
+				result.Referral = referral
 			}
 
 			return result, err

diff --git a/v3/passwdmodify.go b/v3/passwdmodify.go
@@ -97,17 +97,8 @@ func (l *Conn) PasswordModify(passwordModifyRequest *PasswordModifyRequest) (*Pa
 	if packet.Children[1].Tag == ApplicationExtendedResponse {
 		err := GetLDAPError(packet)
 		if err != nil {
-			if IsErrorWithCode(err, LDAPResultReferral) && len(packet.Children) >= 2 {
-				for _, child := range packet.Children[1].Children {
-					if child.Tag == ber.TagBitString && len(child.Children) >= 1 {
-						referral, ok := child.Children[0].Value.(string)
-						if ok {
-							result.Referral = referral
-
-							break
-						}
-					}
-				}
+			if referral, ok := getReferral(err, packet); ok {
+				result.Referral = referral
 			}
 
 			return result, err

diff --git a/v3/request.go b/v3/request.go
@@ -69,3 +69,19 @@ func (l *Conn) readPacket(msgCtx *messageContext) (*ber.Packet, error) {
 	}
 	return packet, nil
 }
+
+func getReferral(err error, packet *ber.Packet) (referral string, ok bool) {
+	if !IsErrorWithCode(err, LDAPResultReferral) || len(packet.Children) < 2 {
+		return "", false
+	}
+
+	for _, child := range packet.Children[1].Children {
+		if child.Tag == ber.TagBitString && len(child.Children) >= 1 {
+			if referral, ok = child.Children[0].Value.(string); ok {
+				return referral, ok
+			}
+		}
+	}
+
+	return "", false
+}