Skip to content

[ldap] Add flag for disable nested groups search #8414

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
merged 4 commits into from
Aug 28, 2024
Merged

[ldap] Add flag for disable nested groups search #8414

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
00f2752
Add flag to disable search nested groups
molotkov-and Aug 27, 2024
62e4b69
Set flag EnableNestedGroups to false by default
molotkov-and Aug 28, 2024
46d768c
Move enable nested groups search flag to extendedSettings section
molotkov-and Aug 28, 2024
c4a6c7e
fix memory leak
molotkov-and Aug 28, 2024
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: 5 additions & 0 deletions ydb/core/protos/auth.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,10 @@ message TLdapAuthentication {
optional TCertRequire CertRequire = 3 [default = DEMAND];
}

message TExtendedSettings {
optional bool EnableNestedGroupsSearch = 1 [default = false];
}

optional string Host = 1; // DEPRECATED: Use Hosts instead it
optional uint32 Port = 2;
required string BaseDn = 3;
Expand All @@ -112,4 +116,5 @@ message TLdapAuthentication {
optional string RequestedGroupAttribute = 9;
repeated string Hosts = 10;
optional string Scheme = 11 [default = "ldap"];
optional TExtendedSettings ExtendedSettings = 12;
}
15 changes: 12 additions & 3 deletions ydb/core/security/ldap_auth_provider/ldap_auth_provider.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,8 @@ class TLdapAuthProvider : public NActors::TActorBootstrapped<TLdapAuthProvider>
NKikimrLdap::BerFree(ber, 0);
}
std::vector<TString> allUserGroups;
if (!directUserGroups.empty()) {
auto& extendedSettings = Settings.GetExtendedSettings();
if (extendedSettings.GetEnableNestedGroupsSearch() && !directUserGroups.empty()) {
// Active Directory has special matching rule to fetch nested groups in one request it is MatchingRuleInChain
// We don`t know what is ldap server. Is it Active Directory or OpenLdap or other server?
// If using MatchingRuleInChain return empty list of groups it means that ldap server isn`t Active Directory
Expand All @@ -158,6 +159,8 @@ class TLdapAuthProvider : public NActors::TActorBootstrapped<TLdapAuthProvider>
allUserGroups = std::move(directUserGroups);
GetNestedGroups(ld, &allUserGroups);
}
} else {
allUserGroups = std::move(directUserGroups);
}
NKikimrLdap::MsgFree(entry);
NKikimrLdap::Unbind(ld);
Expand Down Expand Up @@ -306,7 +309,10 @@ class TLdapAuthProvider : public NActors::TActorBootstrapped<TLdapAuthProvider>
std::vector<TString> TryToGetGroupsUseMatchingRuleInChain(LDAP* ld, LDAPMessage* entry) const {
static const TString matchingRuleInChain = "1.2.840.113556.1.4.1941"; // Only Active Directory supports
TStringBuilder filter;
filter << "(member:" << matchingRuleInChain << ":=" << NKikimrLdap::GetDn(ld, entry) << ')';
char* dn = NKikimrLdap::GetDn(ld, entry);
filter << "(member:" << matchingRuleInChain << ":=" << dn << ')';
NKikimrLdap::MemFree(dn);
dn = nullptr;
LDAPMessage* searchMessage = nullptr;
int result = NKikimrLdap::Search(ld, Settings.GetBaseDn(), NKikimrLdap::EScope::SUBTREE, filter, NKikimrLdap::noAttributes, 0, &searchMessage);
if (!NKikimrLdap::IsSuccess(result)) {
Expand All @@ -320,7 +326,10 @@ class TLdapAuthProvider : public NActors::TActorBootstrapped<TLdapAuthProvider>
std::vector<TString> groups;
groups.reserve(countEntries);
for (LDAPMessage* groupEntry = NKikimrLdap::FirstEntry(ld, searchMessage); groupEntry != nullptr; groupEntry = NKikimrLdap::NextEntry(ld, groupEntry)) {
groups.push_back(NKikimrLdap::GetDn(ld, groupEntry));
dn = NKikimrLdap::GetDn(ld, groupEntry);
groups.push_back(dn);
NKikimrLdap::MemFree(dn);
dn = nullptr;
}
NKikimrLdap::MsgFree(searchMessage);
return groups;
Expand Down
Loading
Loading