Feature #49: Active Directory Managed Groups

Document Template Attachments, Device Batches, Device Profiles and User
Flags can be associated with an Active Directory group. This AD group is
then automatically synchronized with relevant User/Machine accounts.
Contains various other UI tweaks and configuration enhancements.

Disco.Services/Interop/ActiveDirectory/ADGroup.cs

@@ -17,7 +17,7 @@ namespace Disco.Services.Interop.ActiveDirectory
 
         public string DistinguishedName { get; private set; }
         public SecurityIdentifier SecurityIdentifier { get; private set; }
-        
+
         public string Id { get { return string.Format(@"{0}\{1}", Domain.NetBiosName, SamAccountName); } }
         public string SamAccountName { get; private set; }
 
@@ -26,7 +26,9 @@ namespace Disco.Services.Interop.ActiveDirectory
 
         public List<string> MemberOf { get; private set; }
 
-        private ADGroup(ADDomain Domain, string DistinguishedName, SecurityIdentifier SecurityIdentifier, string SamAccountName, string Name, List<string> MemberOf)
+        public Dictionary<string, object[]> LoadedProperties { get; private set; }
+
+        private ADGroup(ADDomain Domain, string DistinguishedName, SecurityIdentifier SecurityIdentifier, string SamAccountName, string Name, List<string> MemberOf, Dictionary<string, object[]> LoadedProperties)
         {
             this.Domain = Domain;
             this.DistinguishedName = DistinguishedName;
@@ -34,9 +36,10 @@ namespace Disco.Services.Interop.ActiveDirectory
             this.SamAccountName = SamAccountName;
             this.Name = Name;
             this.MemberOf = MemberOf;
+            this.LoadedProperties = LoadedProperties;
         }
 
-        public static ADGroup FromSearchResult(ADSearchResult SearchResult)
+        public static ADGroup FromSearchResult(ADSearchResult SearchResult, string[] AdditionalProperties)
         {
             if (SearchResult == null)
                 throw new ArgumentNullException("SearchResult");
@@ -47,10 +50,21 @@ namespace Disco.Services.Interop.ActiveDirectory
             var objectSid = new SecurityIdentifier(SearchResult.Value<byte[]>("objectSid"), 0);
             var memberOf = SearchResult.Values<string>("memberOf").ToList();
 
-            return new ADGroup(SearchResult.Domain, distinguishedName, objectSid, sAMAccountName, name, memberOf);
+            // Additional Properties
+            Dictionary<string, object[]> additionalProperties;
+            if (AdditionalProperties != null)
+                additionalProperties = AdditionalProperties
+                    .Select(p => Tuple.Create(p, SearchResult.Values<object>(p).ToArray()))
+                    .ToDictionary(t => t.Item1, t => t.Item2);
+            else
+            {
+                additionalProperties = new Dictionary<string, object[]>();
+            }
+
+            return new ADGroup(SearchResult.Domain, distinguishedName, objectSid, sAMAccountName, name, memberOf, additionalProperties);
         }
 
-        public static ADGroup FromDirectoryEntry(ADDirectoryEntry DirectoryEntry)
+        public static ADGroup FromDirectoryEntry(ADDirectoryEntry DirectoryEntry, string[] AdditionalProperties)
         {
             if (DirectoryEntry == null)
                 throw new ArgumentNullException("DirectoryEntry");
@@ -63,7 +77,50 @@ namespace Disco.Services.Interop.ActiveDirectory
             var objectSid = new SecurityIdentifier(properties.Value<byte[]>("objectSid"), 0);
             var memberOf = properties.Values<string>("memberOf").ToList();
 
-            return new ADGroup(DirectoryEntry.Domain, distinguishedName, objectSid, sAMAccountName, name, memberOf);
+            Dictionary<string, object[]> additionalProperties;
+            if (AdditionalProperties != null)
+                additionalProperties = AdditionalProperties
+                    .Select(p => Tuple.Create(p, properties.Values<object>(p).ToArray()))
+                    .ToDictionary(t => t.Item1, t => t.Item2);
+            else
+            {
+                additionalProperties = new Dictionary<string, object[]>();
+            }
+
+            return new ADGroup(DirectoryEntry.Domain, distinguishedName, objectSid, sAMAccountName, name, memberOf, additionalProperties);
+        }
+
+        [Obsolete("Use generic equivalents: GetPropertyValue<T>(string PropertyName)")]
+        public object GetPropertyValue(string PropertyName, int Index = 0)
+        {
+            return GetPropertyValues<object>(PropertyName).Skip(Index).FirstOrDefault();
+        }
+
+        public T GetPropertyValue<T>(string PropertyName)
+        {
+            return GetPropertyValues<T>(PropertyName).FirstOrDefault();
+        }
+        public IEnumerable<T> GetPropertyValues<T>(string PropertyName)
+        {
+            switch (PropertyName.ToLower())
+            {
+                case "name":
+                    return new string[] { this.Name }.OfType<T>();
+                case "samaccountname":
+                    return new string[] { this.SamAccountName }.OfType<T>();
+                case "distinguishedname":
+                    return new string[] { this.DistinguishedName }.OfType<T>();
+                case "objectsid":
+                    return new SecurityIdentifier[] { this.SecurityIdentifier }.OfType<T>();
+                case "memberof":
+                    return this.MemberOf.OfType<T>();
+                default:
+                    object[] adProperty;
+                    if (this.LoadedProperties.TryGetValue(PropertyName, out adProperty))
+                        return adProperty.OfType<T>();
+                    else
+                        return Enumerable.Empty<T>();
+            }
         }
 
         public override string ToString()