more progress

Author: santisq

src/ADEffectiveAccess/AclBuilder.cs

@@ -24,7 +24,7 @@ internal AclBuilder(string path, byte[] descriptor) : base()
         _group = GetGroup(_targetType);
     }
 
-    internal IEnumerable<EffectiveAccessRule> EnumerateAccessRules(SchemaMap map)
+    internal IEnumerable<EffectiveAccessRule> EnumerateAccessRules(GuidResolver map)
     {
         foreach (ActiveDirectoryAccessRule rule in GetAccessRules(true, true, _targetType))
         {
@@ -36,7 +36,7 @@ internal IEnumerable<EffectiveAccessRule> EnumerateAccessRules(SchemaMap map)
         }
     }
 
-    internal IEnumerable<EffectiveAuditRule> EnumerateAuditRules(SchemaMap map)
+    internal IEnumerable<EffectiveAuditRule> EnumerateAuditRules(GuidResolver map)
     {
         foreach (ActiveDirectoryAuditRule rule in GetAuditRules(true, true, _targetType))
         {

src/ADEffectiveAccess/GetADEffectiveAccessComand.cs

@@ -15,7 +15,8 @@ public sealed class GetADEffectiveAccessComand : PSCmdlet
 
     private const string IdentitySet = "Identity";
 
-    private SchemaMap? _map;
+    [ThreadStatic]
+    private static GuidResolver? _map;
 
     [Parameter(Position = 0, ParameterSetName = FilterSet)]
     [ValidateNotNullOrEmpty]
@@ -55,7 +56,8 @@ protected override void BeginProcessing()
     {
         try
         {
-            _map = new SchemaMap(Server);
+            _map ??= new GuidResolver();
+            _map.SetCurrentContext(Server);
         }
         catch (Exception exception)
         {

src/ADEffectiveAccess/SchemaMap.cs src/ADEffectiveAccess/GuidResolver.cssrc/ADEffectiveAccess/SchemaMap.cs renamed to src/ADEffectiveAccess/GuidResolver.cs

@@ -4,23 +4,35 @@
 
 namespace ADEffectiveAccess;
 
-internal sealed class SchemaMap
+internal sealed class GuidResolver
 {
-    private readonly Dictionary<Guid, string> _schemaMap = [];
+    private readonly Dictionary<string?, Dictionary<Guid, string>> _map = [];
 
-    internal SchemaMap(string? server = null)
+    private Dictionary<Guid, string>? _current;
+
+    internal void SetCurrentContext(string? server = null)
     {
         string path = server is null ? "LDAP://RootDSE" : $"LDAP://{server}/RootDSE";
         using DirectoryEntry root = new(path);
+        string? ctxName = root.Properties["defaultNamingContext"][0]?.ToString();
+        if (_map.TryGetValue(ctxName, out Dictionary<Guid, string> current))
+        {
+            _current = current;
+            return;
+        }
+
+        current = [];
         string? ctxSchema = root.Properties["schemaNamingContext"][0]?.ToString();
         string? ctxConfig = root.Properties["configurationNamingContext"][0]?.ToString();
-        if (ctxSchema is not null) PopulateSchema(ctxSchema, _schemaMap);
-        if (ctxConfig is not null) PopulateExtendedRights(ctxConfig, _schemaMap);
+        if (ctxSchema is not null) PopulateSchema(ctxSchema, current);
+        if (ctxConfig is not null) PopulateExtendedRights(ctxConfig, current);
+        _map[ctxName] = current;
+        _current = current;
     }
 
     internal string Translate(Guid guid, string defaultValue)
     {
-        if (guid == Guid.Empty || _schemaMap.TryGetValue(guid, out defaultValue))
+        if (guid == Guid.Empty || _current!.TryGetValue(guid, out defaultValue))
         {
             return defaultValue;
         }