Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix/multi server ldap binding linux #79657

Merged
merged 2 commits into from
Dec 28, 2022
Merged

Fix/multi server ldap binding linux #79657

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f371bc0
Fix LDAP configuration typo
iinuwa Dec 14, 2022
b44a9e3
Allow LDAP binding to multiple servers on Linux
iinuwa Dec 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/libraries/Common/tests/System/DirectoryServices/LDAP.Configuration.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ this command views the status
SLAPD OPENLDAP SERVER
=====================

docker run -p:390:389 -e LDAP_DOMAIN=example.com -e LDAP_ROOTPASS=password -d nickstenning/slapd
docker run -p 390:389 -e LDAP_DOMAIN=example.com -e LDAP_ROOTPASS=password -d nickstenning/slapd

and to test and view status

Expand Down Expand Up @@ -125,4 +125,4 @@ Note:
<SupportsServerSideSort>False</SupportsServerSideSort>
</Connection>

</Configuration>
</Configuration>
4 changes: 2 additions & 2 deletions ...oryServices.Protocols/src/System/DirectoryServices/Protocols/ldap/LdapConnection.Linux.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@ public partial class LdapConnection
// Linux doesn't support setting FQDN so we mark the flag as if it is already set so we don't make a call to set it again.
private bool _setFQDNDone = true;

private void InternalInitConnectionHandle(string hostname)
private void InternalInitConnectionHandle()
{
if ((LdapDirectoryIdentifier)_directoryIdentifier == null)
{
throw new NullReferenceException();
}

_ldapHandle = new ConnectionHandle($"ldap://{hostname}:{((LdapDirectoryIdentifier)_directoryIdentifier).PortNumber}");
_ldapHandle = new ConnectionHandle();
}

private int InternalConnectToServer()
Expand Down
26 changes: 25 additions & 1 deletion ...yServices.Protocols/src/System/DirectoryServices/Protocols/ldap/LdapConnection.Windows.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,39 @@
using System.Diagnostics;
using System.Net;
using System.Runtime.CompilerServices;
using System.Text;

namespace System.DirectoryServices.Protocols
{
public partial class LdapConnection
{
private bool _setFQDNDone;

private void InternalInitConnectionHandle(string hostname)
private void InternalInitConnectionHandle()
{
string hostname = null;
string[] servers = ((LdapDirectoryIdentifier)_directoryIdentifier)?.Servers;
if (servers != null && servers.Length != 0)
{
var temp = new StringBuilder(200);
for (int i = 0; i < servers.Length; i++)
{
if (servers[i] != null)
{
temp.Append(servers[i]);
if (i < servers.Length - 1)
{
temp.Append(' ');
}
}
}

if (temp.Length != 0)
{
hostname = temp.ToString();
}
}

LdapDirectoryIdentifier directoryIdentifier = _directoryIdentifier as LdapDirectoryIdentifier;

// User wants to setup a connectionless session with server.
Expand Down
25 changes: 1 addition & 24 deletions ...DirectoryServices.Protocols/src/System/DirectoryServices/Protocols/ldap/LdapConnection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,30 +173,7 @@ internal bool NeedDispose

internal void Init()
{
string hostname = null;
string[] servers = ((LdapDirectoryIdentifier)_directoryIdentifier)?.Servers;
if (servers != null && servers.Length != 0)
{
var temp = new StringBuilder(200);
for (int i = 0; i < servers.Length; i++)
{
if (servers[i] != null)
{
temp.Append(servers[i]);
if (i < servers.Length - 1)
{
temp.Append(' ');
}
}
}

if (temp.Length != 0)
{
hostname = temp.ToString();
}
}

InternalInitConnectionHandle(hostname);
InternalInitConnectionHandle();

// Create a WeakReference object with the target of ldapHandle and put it into our handle table.
lock (s_objectLock)
Expand Down
24 changes: 24 additions & 0 deletions src/libraries/System.DirectoryServices.Protocols/tests/DirectoryServicesProtocolsTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -670,6 +670,30 @@ public void TestSortedSearch()
}
}

[ConditionalFact(nameof(IsLdapConfigurationExist))]
public void TestMultipleServerBind()
{
LdapDirectoryIdentifier directoryIdentifier = string.IsNullOrEmpty(LdapConfiguration.Configuration.Port) ?
new LdapDirectoryIdentifier(new string[] { LdapConfiguration.Configuration.ServerName, LdapConfiguration.Configuration.ServerName }, true, false) :
new LdapDirectoryIdentifier(new string[] { LdapConfiguration.Configuration.ServerName, LdapConfiguration.Configuration.ServerName },
int.Parse(LdapConfiguration.Configuration.Port, NumberStyles.None, CultureInfo.InvariantCulture),
true, false);
NetworkCredential credential = new NetworkCredential(LdapConfiguration.Configuration.UserName, LdapConfiguration.Configuration.Password);

using LdapConnection connection = new LdapConnection(directoryIdentifier, credential)
{
AuthType = AuthType.Basic
};

// Set server protocol before bind; OpenLDAP servers default
// to LDAP v2, which we do not support, and will return LDAP_PROTOCOL_ERROR
connection.SessionOptions.ProtocolVersion = 3;
connection.SessionOptions.SecureSocketLayer = LdapConfiguration.Configuration.UseTls;
connection.Bind();

connection.Timeout = new TimeSpan(0, 3, 0);
}

private void DeleteAttribute(LdapConnection connection, string entryDn, string attributeName)
{
string dn = entryDn + "," + LdapConfiguration.Configuration.SearchDn;
Expand Down