Merge pull request #42 from FrendsPlatform/FSPES-17-Skip-User-Issue

Fixed LDAP exception when adding duplicate users with skip option ena…

Author: MatteoDelOmbra

Frends.LDAP.AddUserToGroups/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## [1.2.0] - 2025-11-20
+### Fixed
+- Fixed LDAP exception when adding duplicate users with skip option enabled.
+
 ## [1.1.0] - 2025-08-13
 ### Fixed
 - Fixed KeyNotFoundException when checking empty groups for existing users.

Frends.LDAP.AddUserToGroups/Frends.LDAP.AddUserToGroups/AddUserToGroups.cs

@@ -51,6 +51,10 @@ public static Result AddUserToGroups([PropertyTab] Input input, [PropertyTab] Co
         }
         catch (LdapException ex)
         {
+            if (ex.ResultCode == LdapException.AttributeOrValueExists && input.UserExistsAction == UserExistsAction.Skip)
+            {
+                return new Result(false, "User already exists in the group, skipped as requested.", input.UserDistinguishedName, input.GroupDistinguishedName);
+            }
             throw new Exception($"AddUserToGroups LDAP error: {ex.Message}");
         }
         catch (Exception ex)
@@ -66,44 +70,26 @@ public static Result AddUserToGroups([PropertyTab] Input input, [PropertyTab] Co
 
     private static bool UserExistsInGroup(LdapConnection connection, string userDn, string groupDn, CancellationToken cancellationToken)
     {
-        // Search for the user's groups
+        cancellationToken.ThrowIfCancellationRequested();
+
         ILdapSearchResults searchResults = connection.Search(
             groupDn,
             LdapConnection.ScopeSub,
             "(objectClass=*)",
             null,
             false);
 
-        // Check if the user is a member of the specified group
-        while (searchResults.HasMore())
+        if (searchResults.HasMore())
         {
-            cancellationToken.ThrowIfCancellationRequested();
-            LdapEntry entry;
             try
             {
-                entry = searchResults.Next();
-            }
-            catch (LdapException)
-            {
-                continue;
+                var entry = searchResults.Next();
+                var memberAttr = entry.GetAttribute("member");
+                return memberAttr.StringValueArray.Contains(userDn, StringComparer.OrdinalIgnoreCase);
             }
-
-            if (entry != null)
+            catch (KeyNotFoundException)
             {
-                LdapAttribute memberAttr;
-
-                try
-                {
-                    memberAttr = entry.GetAttribute("member");
-                }
-                catch (KeyNotFoundException)
-                {
-                    continue;
-                }
-
-                var currentMembers = memberAttr.StringValueArray;
-                if (currentMembers.Where(e => e == userDn).Any())
-                    return true;
+                return false;
             }
         }
 

Frends.LDAP.AddUserToGroups/Frends.LDAP.AddUserToGroups/Frends.LDAP.AddUserToGroups.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
 	<TargetFrameworks>net6.0</TargetFrameworks>
-	<Version>1.1.0</Version>
+	<Version>1.2.0</Version>
 	<Authors>Frends</Authors>
 	<Copyright>Frends</Copyright>
 	<Company>Frends</Company>