Skip to content

Fix LDAP search to include an optional trailing slash #417

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
ralphbean merged 3 commits into from
Feb 11, 2026
Merged

Fix LDAP search to include an optional trailing slash #417

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bf8e041
Fix LDAP search to include an optional trailing slash
webbnh Feb 3, 2026
538ee27
Code review feedback
webbnh Feb 3, 2026
815a3c1
Merge branch 'main' into trailing-LDAP-slash
Bala-Sakabattula Feb 4, 2026
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
5 changes: 4 additions & 1 deletion Rover_Lookup/lookup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,11 @@ def github_username_to_emails(

# Construct the LDAP filter to match the GitHub "Professional Social Media" URL.
# The rhatSocialURL field contains values like "Github->https://github.com/username".
# However, 5% of the entries include a trailing slash (which GitHub accepts),
# so look for those, too.
github_url = f"https://github.com/{github_username}"
ldap_filter = f"(rhatSocialURL=Github->{github_url})"
filter_clause = f"rhatSocialURL=Github->{github_url}"
ldap_filter = f"(|({filter_clause})({filter_clause}/))"

# Attributes to retrieve (email fields)
attributes = ["rhatPrimaryMail", "mail", "rhatPreferredAlias"]
Expand Down
7 changes: 3 additions & 4 deletions Rover_Lookup/tests/test_lookup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,9 @@ def test_successful_lookup_single_record(self, mock_connection_class, caplog):
# Verify LDAP query was called correctly
mock_conn.search.assert_called_once()
search_args = mock_conn.search.call_args
assert (
search_args[1]["search_filter"]
== "(rhatSocialURL=Github->https://github.com/test-user)"
)
filter_part = "rhatSocialURL=Github->https://github.com/test-user"
expected_filter = f"(|({filter_part})({filter_part}/))"
assert search_args[1]["search_filter"] == expected_filter
assert "rhatPrimaryMail" in search_args[1]["attributes"]
assert "mail" in search_args[1]["attributes"]
assert "rhatPreferredAlias" in search_args[1]["attributes"]
Expand Down