Merge pull request #22 from TheManticoreProject/improve-ldap-functions

[enhancement] Improve ldap functions

Author: p0dalirius

network/ldap/modify.go

@@ -185,7 +185,10 @@ func (req *ModifyRequest) Replace(attrType string, attrVals []string) {
 //   - attrVals: A slice of strings representing the new values for the attribute.
 func (ldapSession *Session) OverwriteAttributeValues(distinguishedName string, attrName string, attrVals []string) error {
 	if len(attrVals) == 0 {
-		ldapSession.FlushAttribute(distinguishedName, attrName)
+		err := ldapSession.FlushAttributeValues(distinguishedName, attrName)
+		if err != nil {
+			return fmt.Errorf("error flushing attribute %s of %s: %s", attrName, distinguishedName, err)
+		}
 	} else {
 		controls := NewControlsWithOIDs([]string{LDAP_SERVER_PERMISSIVE_MODIFY_OID}, false)
 
@@ -196,7 +199,7 @@ func (ldapSession *Session) OverwriteAttributeValues(distinguishedName string, a
 		// Execute the modify request
 		err := ldapSession.connection.Modify(m)
 		if err != nil {
-			return fmt.Errorf("error overwriting attribute %s of %s: %s", attrName, distinguishedName, err)
+			return fmt.Errorf("error flushing attribute %s of %s: %w", attrName, distinguishedName, err)
 		}
 	}
 	return nil
@@ -325,15 +328,15 @@ func (ldapSession *Session) AddStringToAttributeList(distinguishedName string, a
 	return nil
 }
 
-// FlushAttribute flushes the attribute by deleting it
+// FlushAttributeValues flushes the attribute by deleting it
 //
 // Parameters:
 //   - dn: A string representing the distinguished name (DN) of the LDAP entry to be modified.
 //   - attributeName: A string representing the name of the attribute to be flushed.
 //
 // Returns:
 //   - An error object if the flush operation fails, otherwise nil.
-func (ldapSession *Session) FlushAttribute(distinguishedName string, attributeName string) error {
+func (ldapSession *Session) FlushAttributeValues(distinguishedName string, attributeName string) error {
 	// Create a modify request
 	m := goldapv3.NewModifyRequest(distinguishedName, nil)
 	m.Replace(attributeName, []string{})

network/ldap/naming_contexts.go

@@ -6,7 +6,7 @@ import (
 	goldapv3 "github.com/go-ldap/ldap/v3"
 )
 
-// BaseDNExists checks if a given base distinguished name (baseDN) exists in the LDAP directory.
+// DistinguishedNameExists checks if a given base distinguished name (baseDN) exists in the LDAP directory.
 //
 // This function performs an LDAP search with a base scope to determine if the specified baseDN exists.
 // It constructs an LDAP search request with the provided baseDN and a search filter of "(objectClass=*)",
@@ -18,11 +18,16 @@ import (
 //
 // Returns:
 //   - bool: True if the baseDN exists, false if it does not exist or if an error occurs.
+//   - error: An error if the search fails.
 //
 // Example usage:
 //
 //	ldapSession := &Session{}
-//	exists := ldapSession.BaseDNExists("DC=example,DC=com")
+//	exists, err := ldapSession.DistinguishedNameExists("DC=example,DC=com")
+//	if err != nil {
+//		fmt.Println("Error checking if baseDN exists:", err)
+//		return
+//	}
 //	if exists {
 //	    fmt.Println("The baseDN exists in the LDAP directory.")
 //	} else {
@@ -32,12 +37,12 @@ import (
 // Note:
 //   - This function assumes that the Session struct has a valid connection object and that the ldap package
 //     is correctly imported and used.
-func (ldapSession *Session) BaseDNExists(baseDN string) bool {
+func (ldapSession *Session) DistinguishedNameExists(distinguishedName string) (bool, error) {
 	// Specify LDAP search parameters
 	// https://pkg.go.dev/gopkg.in/ldap.v3#NewSearchRequest
 	searchRequest := goldapv3.NewSearchRequest(
 		// Base DN
-		baseDN,
+		distinguishedName,
 		// Scope
 		goldapv3.ScopeBaseObject,
 		// DerefAliases
@@ -58,11 +63,15 @@ func (ldapSession *Session) BaseDNExists(baseDN string) bool {
 
 	// Perform LDAP search
 	_, err := ldapSession.connection.Search(searchRequest)
-	if goldapv3.IsErrorWithCode(err, goldapv3.LDAPResultNoSuchObject) {
-		return false
-	} else {
-		return true
+	if err != nil {
+		if goldapv3.IsErrorWithCode(err, goldapv3.LDAPResultNoSuchObject) {
+			return false, nil
+		} else {
+			return false, err
+		}
 	}
+
+	return true, nil
 }
 
 // GetAllNamingContexts retrieves all naming contexts from the LDAP server.