Allow for multiple userdns

Author: jabbera

RutaHttpModule/AdInteraction.cs

@@ -27,7 +27,7 @@ internal AdInteraction()
             using (PrincipalContext context = new PrincipalContext(ContextType.Domain))
             using (UserPrincipal user = UserPrincipal.FindByIdentity(context, IdentityType.SamAccountName, usernameOnly))
             {
-                if (user?.DistinguishedName.EndsWith(this.settings.AdUserBaseDn, StringComparison.OrdinalIgnoreCase) != true)
+                if (user == null || !MatchesOneUserDn(user.DistinguishedName))
                 {
                     return (null, null, null, null);
                 }
@@ -40,5 +40,15 @@ internal AdInteraction()
                 return (login, name, email, groups);
             }
         }
+
+        private bool MatchesOneUserDn(string userDn)
+        {
+            if (this.settings.AdUserBaseDns.Length == 0)
+            {
+                return true;
+            }
+
+            return this.settings.AdUserBaseDns.Any(x => userDn.EndsWith(x, StringComparison.OrdinalIgnoreCase));
+        }
     }
 }

RutaHttpModule/ISettings.cs

@@ -9,7 +9,7 @@ internal interface ISettings
         bool DowncaseUsers { get; }
         bool DowncaseGroups { get; }
         string AppendString { get; }
-        string AdUserBaseDn { get; }
+        string[] AdUserBaseDns { get; }
         string AdGroupBaseDn { get; }
         string[] PassThruUserAgents { get; }
     }

RutaHttpModule/Properties/Settings.Designer.cs

@@ -17,8 +17,9 @@
     <Setting Name="DowncaseUsers" Type="System.Boolean" Scope="Application">
       <Value Profile="(Default)">True</Value>
     </Setting>
-    <Setting Name="AdUserBaseDn" Type="System.String" Scope="Application">
-      <Value Profile="(Default)" />
+    <Setting Name="AdUserBaseDns" Type="System.Collections.Specialized.StringCollection" Scope="Application">
+      <Value Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
+&lt;ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" /&gt;</Value>
     </Setting>
     <Setting Name="AdGroupBaseDn" Type="System.String" Scope="Application">
       <Value Profile="(Default)" />

RutaHttpModule/Properties/Settings.settings

@@ -6,16 +6,15 @@
     [ExcludeFromCodeCoverage]
     internal class SettingsWrapper : ISettings
     {
-        private readonly string[] passThruUserAgents = Properties.Settings.Default.PassThruAgents.Cast<string>().ToArray();
         public string AdGroupBaseDn => Properties.Settings.Default.AdGroupBaseDn;
-        public string AdUserBaseDn => Properties.Settings.Default.AdUserBaseDn;
+        public string[] AdUserBaseDns => Properties.Settings.Default.AdUserBaseDns.Cast<string>().ToArray();
         public bool DowncaseUsers => Properties.Settings.Default.DowncaseUsers;
         public bool DowncaseGroups => Properties.Settings.Default.DowncaseGroups;
         public string EmailHeader => Properties.Settings.Default.EmailHeader;
         public string GroupsHeader => Properties.Settings.Default.GroupsHeader;
         public string LoginHeader => Properties.Settings.Default.LoginHeader;
         public string NameHeader => Properties.Settings.Default.NameHeader;
         public string AppendString => Properties.Settings.Default.AppendString;
-        public string[] PassThruUserAgents => passThruUserAgents;
+        public string[] PassThruUserAgents { get; } = Properties.Settings.Default.PassThruAgents.Cast<string>().ToArray();
     }
 }

RutaHttpModule/SettingsWrapper.cs

@@ -22,8 +22,11 @@
             <setting name="DowncaseUsers" serializeAs="String">
                 <value>True</value>
             </setting>
-            <setting name="AdUserBaseDn" serializeAs="String">
-                <value />
+            <setting name="AdUserBaseDns" serializeAs="Xml">
+                <value>
+                    <ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                        xmlns:xsd="http://www.w3.org/2001/XMLSchema" />
+                </value>
             </setting>
             <setting name="AdGroupBaseDn" serializeAs="String">
                 <value />

RutaHttpModule/app.config

@@ -23,7 +23,7 @@ public void Init()
         {
             this.settings = new Mock<ISettings>();
             this.settings.SetupGet(x => x.AdGroupBaseDn).Returns(string.Empty);
-            this.settings.SetupGet(x => x.AdUserBaseDn).Returns(string.Empty);
+            this.settings.SetupGet(x => x.AdUserBaseDns).Returns(new string[0]);
             this.settings.SetupGet(x => x.DowncaseUsers).Returns(true);
             this.settings.SetupGet(x => x.DowncaseGroups).Returns(true);
             this.settings.SetupGet(x => x.AppendString).Returns(string.Empty);
@@ -81,7 +81,7 @@ public void GroupDnFilterTest()
         [TestMethod]
         public void UserDnFilterTest()
         {
-            this.settings.SetupGet(x => x.AdUserBaseDn).Returns("DON'T MATCH");
+            this.settings.SetupGet(x => x.AdUserBaseDns).Returns(new[] {"DON'T MATCH"});
             var result = this.adInteraction.GetUserInformation(WindowsIdentity.GetCurrent().Name);
 
             Assert.IsNull(result.login);