Skip to content

Fix #41618 Correct marshalling of SortKey objects on Linux #65548

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

Merged
joperezr merged 8 commits into from
Mar 22, 2022
Merged

Fix #41618 Correct marshalling of SortKey objects on Linux #65548

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
83b224c
Fix #41618 Correct marshalling of SortKey objects on Linux
lscorcia Feb 17, 2022
9fa6938
Correct the test expectation for OpenLdap platforms
lscorcia Feb 18, 2022
2493b95
Add test for LDAP sort control against a real LDAP server
lscorcia Mar 1, 2022
11ba024
Introduce SortKeyInterop class and restore original SortKey definition
lscorcia Mar 4, 2022
c1bfb54
Reduce duplication and make SortKeyInterop a struct
lscorcia Mar 4, 2022
97c7c67
Code style improvements
lscorcia Mar 10, 2022
76029df
Reintroduce StructLayout attribute on SortKey class
lscorcia Mar 15, 2022
27d87a9
Conditionally enable Sort Control tests for OpenDJ and Active Directo…
lscorcia Mar 16, 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
Prev Previous commit
Next Next commit
Add test for LDAP sort control against a real LDAP server
  • Loading branch information
@lscorcia
lscorcia committed Mar 8, 2022
commit 2493b9503ba3d1db2ca7ff958a8400d40a9fd287
52 changes: 52 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 @@ -533,6 +533,58 @@ public void TestPageRequests()
}
}

[ConditionalFact(nameof(IsLdapConfigurationExist))]
public void TestSortedSearch()
{
using (LdapConnection connection = GetConnection())
{
string ouName = "ProtocolsGroup10";
string dn = "ou=" + ouName;

try
{
for (int i=0; i<10; i++)
{
DeleteEntry(connection, "ou=ProtocolsSubGroup10." + i + "," + dn);
}
DeleteEntry(connection, dn);

AddOrganizationalUnit(connection, dn);
SearchResultEntry sre = SearchOrganizationalUnit(connection, LdapConfiguration.Configuration.SearchDn, ouName);
Assert.NotNull(sre);

for (int i=0; i<10; i++)
{
AddOrganizationalUnit(connection, "ou=ProtocolsSubGroup10." + i + "," + dn);
}

string filter = "(objectClass=*)";
SearchRequest searchRequest = new SearchRequest(
dn + "," + LdapConfiguration.Configuration.SearchDn,
filter,
SearchScope.Subtree,
null);

var sortRequestControl = new SortRequestControl("ou", true);
searchRequest.Controls.Add(sortRequestControl);

SearchResponse searchResponse = (SearchResponse) connection.SendRequest(searchRequest);
Assert.Equal(1, searchResponse.Controls.Length);
Assert.True(searchResponse.Controls[0] is SortResponseControl);
Assert.True(searchResponse.Entries.Count > 0);
Assert.Equal("ou=ProtocolsSubGroup10.9," + dn + "," + LdapConfiguration.Configuration.SearchDn, searchResponse.Entries[0].DistinguishedName);
}
finally
{
for (int i=0; i<20; i++)
{
DeleteEntry(connection, "ou=ProtocolsSubGroup10." + i + "," + dn);
}
DeleteEntry(connection, dn);
}
}
}

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