jessikitty/Disco
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Escape AD Distinguished Names that contain "/"

Browse Source 
for EFC
This commit is contained in:
Gary Sharp
2016-09-15 19:45:14 +10:00
parent acfa0e5094
commit 4b866c9486
2 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Disco.Services/Interop/ActiveDirectory/ADDomainController.cs
+1 -1
View File
@@ -67,7 +67,7 @@ namespace Disco.Services.Interop.ActiveDirectory
if (!DistinguishedName.EndsWith(this.Domain.DistinguishedName, StringComparison.OrdinalIgnoreCase))
throw new ArgumentException(string.Format("The Distinguished Name ({0}) isn't a member of this domain [{1}]", DistinguishedName, this.Domain.Name), "DistinguishedName");
var entry = new DirectoryEntry(string.Format(LdapPathTemplate, this.Name, DistinguishedName));
var entry = new DirectoryEntry(string.Format(LdapPathTemplate, this.Name, ADHelpers.EscapeDistinguishedName(DistinguishedName)));
if (LoadProperties != null)
entry.RefreshCache(LoadProperties);
Disco.Services/Interop/ActiveDirectory/ADHelpers.cs
+16 -3
View File
@@ -1,4 +1,5 @@
using System.Security.Principal;
using System;
using System.Security.Principal;
using System.Text;
namespace Disco.Services.Interop.ActiveDirectory
@@ -47,11 +48,23 @@ namespace Disco.Services.Interop.ActiveDirectory
return query.Replace("*", "\\2a").Replace("(", "\\28").Replace(")", "\\29").Replace("\\", "\\5c").Replace("NUL", "\\00").Replace("/", "\\2f");
}
internal static string ToLdapQueryFormat(this System.Guid g)
internal static string EscapeDistinguishedName(string DistinguishedName)
{
if (DistinguishedName.Contains("/"))
{
return DistinguishedName.Replace("/", @"\/");
}
else
{
return DistinguishedName;
}
}
internal static string ToLdapQueryFormat(this Guid g)
{
checked
{
System.Text.StringBuilder sb = new System.Text.StringBuilder();
StringBuilder sb = new StringBuilder();
byte[] array = g.ToByteArray();
for (int i = 0; i < array.Length; i++)
{