Resolved #193: Call to GetAccounts returns NotImplementedException

Author: MichaelGrafnetter

Src/DSInternals.PowerShell/Commands/Replication/GetADReplAccountCommand.cs

@@ -74,13 +74,6 @@ protected override void BeginProcessing()
         {
             base.BeginProcessing();
 
-            // TODO: Retrieval of linked objects is not yet implemented in the replication client.
-            this.Properties &= ~AccountPropertySets.ManagedBy;
-            this.Properties &= ~AccountPropertySets.Manager;
-
-            // TODO: LAPS-related attribute schema loading is not yet implemented.
-            this.Properties &= ~AccountPropertySets.LAPS;
-
             if (this.ExportFormat != null)
             {
                 // Override the property sets to match the requirements of the export formats.

Src/DSInternals.Replication/DirectoryReplicationClient.cs

@@ -1,4 +1,8 @@
-using DSInternals.Common;
+using System;
+using System.Collections.Generic;
+using System.Net;
+using System.Security.Principal;
+using DSInternals.Common;
 using DSInternals.Common.Cryptography;
 using DSInternals.Common.Data;
 using DSInternals.Common.Exceptions;
@@ -9,11 +13,6 @@
 using NDceRpc;
 using NDceRpc.Microsoft.Interop;
 using NDceRpc.Native;
-using System;
-using System.Collections.Generic;
-using System.Net;
-using System.Security.Principal;
-using System.Security.AccessControl;
 
 namespace DSInternals.Replication
 {
@@ -87,17 +86,19 @@ public ReplicationCursor[] GetReplicationCursors(string namingContext)
             return this.drsConnection.GetReplicationCursors(namingContext);
         }
 
-        public IEnumerable<DSAccount> GetAccounts(string domainNamingContext, ReplicationProgressHandler progressReporter = null, AccountPropertySets properties = AccountPropertySets.All)
+        public IEnumerable<DSAccount> GetAccounts(string domainNamingContext, ReplicationProgressHandler progressReporter = null, AccountPropertySets propertySets = AccountPropertySets.All)
         {
             Validator.AssertNotNullOrWhiteSpace(domainNamingContext, nameof(domainNamingContext));
             ReplicationCookie cookie = new ReplicationCookie(domainNamingContext);
-            return GetAccounts(cookie, progressReporter, properties);
+            return GetAccounts(cookie, progressReporter, propertySets);
         }
 
-        public IEnumerable<DSAccount> GetAccounts(ReplicationCookie initialCookie, ReplicationProgressHandler progressReporter = null, AccountPropertySets properties = AccountPropertySets.All)
+        public IEnumerable<DSAccount> GetAccounts(ReplicationCookie initialCookie, ReplicationProgressHandler progressReporter = null, AccountPropertySets propertySets = AccountPropertySets.All)
         {
             Validator.AssertNotNull(initialCookie, nameof(initialCookie));
 
+            propertySets = SkipUnsupportedProperties(propertySets);
+
             // Create AD schema
             var schema = BasicSchemaFactory.CreateSchema();
             var currentCookie = initialCookie;
@@ -121,7 +122,7 @@ public IEnumerable<DSAccount> GetAccounts(ReplicationCookie initialCookie, Repli
                 {
                     obj.Schema = schema;
 
-                    var account = AccountFactory.CreateAccount(obj, this.NetBIOSDomainName, this.SecretDecryptor, properties);
+                    var account = AccountFactory.CreateAccount(obj, this.NetBIOSDomainName, this.SecretDecryptor, propertySets);
 
                     if (account != null)
                     {
@@ -137,6 +138,8 @@ public IEnumerable<DSAccount> GetAccounts(ReplicationCookie initialCookie, Repli
 
         public DSAccount GetAccount(Guid objectGuid, AccountPropertySets propertySets = AccountPropertySets.All)
         {
+            propertySets = SkipUnsupportedProperties(propertySets);
+
             var obj = this.drsConnection.ReplicateSingleObject(objectGuid);
             var schema = BasicSchemaFactory.CreateSchema();
             obj.Schema = schema;
@@ -153,6 +156,8 @@ public DSAccount GetAccount(Guid objectGuid, AccountPropertySets propertySets =
 
         public DSAccount GetAccount(string distinguishedName, AccountPropertySets propertySets = AccountPropertySets.All)
         {
+            propertySets = SkipUnsupportedProperties(propertySets);
+
             var obj = this.drsConnection.ReplicateSingleObject(distinguishedName);
             var schema = BasicSchemaFactory.CreateSchema();
             obj.Schema = schema;
@@ -321,5 +326,17 @@ private void LoadDomainInfo()
             NTAccount pdcAccount = this.drsConnection.ResolveAccountName(pdcAccountDN);
             this.netBIOSDomainName = pdcAccount.NetBIOSDomainName();
         }
+
+        private static AccountPropertySets SkipUnsupportedProperties(AccountPropertySets propertySets)
+        {
+            // TODO: Retrieval of linked objects is not yet implemented in the replication client.
+            propertySets &= ~AccountPropertySets.ManagedBy;
+            propertySets &= ~AccountPropertySets.Manager;
+
+            // TODO: LAPS-related attribute schema loading is not yet implemented.
+            propertySets &= ~AccountPropertySets.LAPS;
+
+            return propertySets;
+        }
     }
 }