Add convenience class for creating partial sttributes

Author: vforteli

Flexinets.Ldap.Core.Tests/LdapPacketTests.cs

@@ -1,5 +1,6 @@
 using NUnit.Framework;
 using System;
+using System.Collections.Generic;
 using System.IO;
 
 namespace Flexinets.Ldap.Core.Tests
@@ -132,7 +133,7 @@ public void TestPacketStuff()
 
             var partialAttributeList = new LdapAttribute(UniversalDataType.Sequence);
 
-            
+
 
             var partialAttributeUid = new LdapAttribute(UniversalDataType.Sequence);
             partialAttributeUid.ChildAttributes.Add(new LdapAttribute(UniversalDataType.OctetString, "uid"));   // type
@@ -159,8 +160,34 @@ public void TestPacketStuff()
             var packet = LdapPacket.ParsePacket(responsEntryBytes);
             RecurseAttributes(packet);
             Assert.AreEqual(expected, Utils.ByteArrayToString(packet.GetBytes()));
+        }
+
+
+        [TestCase]
+        public void TestPacketPartialAttribute()
+        {
+            var expected = "3084000000800204000000016478042d636e3d62696e64557365722c636e3d55736572732c64633d6465762c64633d636f6d70616e792c64633d636f6d3047301804037569643111040f75736572756964676f657368657265302b040b6f626a656374436c617373311c040c616161616161616161616161040c626262626262626262626262";
+            var responseEntryPacket = new LdapPacket(1);
+            var searchResultEntry = new LdapAttribute(LdapOperation.SearchResultEntry);
+            searchResultEntry.ChildAttributes.Add(new LdapAttribute(UniversalDataType.OctetString, "cn=bindUser,cn=Users,dc=dev,dc=company,dc=com"));   //  objectName
+
+            var partialAttributeList = new LdapAttribute(UniversalDataType.Sequence);
+
 
 
+            partialAttributeList.ChildAttributes.Add(new LdapPartialAttribute("uid", "useruidgoeshere"));
+            partialAttributeList.ChildAttributes.Add(new LdapPartialAttribute("objectClass", new List<String> { "aaaaaaaaaaaa", "bbbbbbbbbbbb" }));
+
+            searchResultEntry.ChildAttributes.Add(partialAttributeList);
+            responseEntryPacket.ChildAttributes.Add(searchResultEntry);
+            var responsEntryBytes = responseEntryPacket.GetBytes();
+
+            Console.WriteLine(Utils.ByteArrayToString(responsEntryBytes));
+
+
+            var packet = LdapPacket.ParsePacket(responsEntryBytes);
+            RecurseAttributes(packet);
+            Assert.AreEqual(expected, Utils.ByteArrayToString(packet.GetBytes()));
         }
 
 
@@ -205,7 +232,7 @@ public void TestPacketThunderbirdSearch()
 
 
 
-        
+
 
 
         private void RecurseAttributes(LdapAttribute attribute, Int32 depth = 1)

Flexinets.Ldap.Core.Tests/LdapPartialAttributeTests.cs

@@ -0,0 +1,40 @@
+using NUnit.Framework;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Flexinets.Ldap.Core.Tests
+{
+    public class LdapPartialAttributeTests
+    {
+        [TestCase]
+        public void TestLdapPartialAttributeDescription()
+        {
+            var expected = "objectClass";
+            var attribute = new LdapPartialAttribute(expected, "test");
+
+            Assert.AreEqual(expected, attribute.Description);
+        }
+
+
+        [TestCase]
+        public void TestLdapPartialAttributeSingleValue()
+        {
+            var expected = "test";
+            var attribute = new LdapPartialAttribute("objectClass", expected);
+
+            Assert.AreEqual(expected, attribute.Values.SingleOrDefault());
+        }
+
+
+        [TestCase]
+        public void TestLdapPartialAttributeMultipleValues()
+        {
+            var expected = new List<String> { "test", "foo", "bar" };
+            var attribute = new LdapPartialAttribute("objectClass", expected);
+
+            var output = attribute.Values;
+            CollectionAssert.AreEqual(expected, output);
+        }
+    }
+}

Flexinets.Ldap.Core/Flexinets.Ldap.Core.csproj

@@ -13,8 +13,8 @@ For an example server implementation see https://github.com/vforteli/FlexinetsLd
     <PackageProjectUrl>https://github.com/vforteli/Flexinets.Ldap.Core</PackageProjectUrl>
     <PackageReleaseNotes>Minor performance improvements</PackageReleaseNotes>
     <PackageTags>LDAP packet parse assemble authentication</PackageTags>
-    <AssemblyVersion>1.0.79.0</AssemblyVersion>
-    <FileVersion>1.0.79.0</FileVersion>
+    <AssemblyVersion>1.0.85.0</AssemblyVersion>
+    <FileVersion>1.0.85.0</FileVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netstandard2.0|AnyCPU'">

Flexinets.Ldap.Core/LdapPartialAttribute.cs

@@ -0,0 +1,51 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Flexinets.Ldap.Core
+{
+    /// <summary>
+    /// Convenience class for creating PartialAttributes
+    /// </summary>
+    public class LdapPartialAttribute : LdapAttribute
+    {
+        /// <summary>
+        /// Partial attribute description
+        /// </summary>
+        public String Description => (String)ChildAttributes.FirstOrDefault().GetValue();
+
+
+        /// <summary>
+        /// Partial attribute values
+        /// </summary>
+        public List<String> Values => ChildAttributes[1].ChildAttributes.Select(o => (String)o.GetValue()).ToList();
+
+
+        /// <summary>
+        /// Create a partial Attribute from list of values
+        /// </summary>
+        /// <param name="attributeDescription"></param>
+        /// <param name="attributeValues"></param>
+        public LdapPartialAttribute(String attributeDescription, IEnumerable<String> attributeValues) : base(UniversalDataType.Sequence)
+        {
+            ChildAttributes.Add(new LdapAttribute(UniversalDataType.OctetString, attributeDescription));
+            var values = new LdapAttribute(UniversalDataType.Set);
+            foreach (var value in attributeValues)
+            {
+                values.ChildAttributes.Add(new LdapAttribute(UniversalDataType.OctetString, value));
+            }
+            ChildAttributes.Add(values);
+        }
+
+
+        /// <summary>
+        /// Create a partial attribute with a single value
+        /// </summary>
+        /// <param name="attributeDescription"></param>
+        /// <param name="attributeValue"></param>
+        public LdapPartialAttribute(String attributeDescription, String attributeValue) : this(attributeDescription, new List<String> { attributeValue })
+        {
+
+        }        
+    }
+}