Skip to content

Remove hardcoded LDAP credentials, load from environment #2

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

Draft
Copilot wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

Remove hardcoded LDAP credentials, load from environment #2

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
68beb68
Initial plan
Copilot Nov 25, 2025
40e4fe7
Remove hardcoded LDAP password from LDAPManager
Copilot Nov 25, 2025
a9e901b
Fix code review issues: properly trim password values
Copilot Nov 25, 2025
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
20 changes: 19 additions & 1 deletion src/main/java/org/owasp/benchmark/helpers/LDAPManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,25 @@ protected Hashtable<Object, Object> createEnv() {
env.put(Context.PROVIDER_URL, "ldap://localhost:10389");
env.put(Context.SECURITY_AUTHENTICATION, "simple");
env.put(Context.SECURITY_PRINCIPAL, "uid=admin,ou=system");
env.put(Context.SECURITY_CREDENTIALS, "secret");

// Load password from environment variable or system property
String ldapPassword = System.getenv("LDAP_ADMIN_PASSWORD");
if (ldapPassword != null) {
ldapPassword = ldapPassword.trim();
}
if (ldapPassword == null || ldapPassword.isEmpty()) {
ldapPassword = System.getProperty("ldap.admin.password");
if (ldapPassword != null) {
ldapPassword = ldapPassword.trim();
}
if (ldapPassword == null || ldapPassword.isEmpty()) {
System.err.println(
"WARNING: Using default LDAP password. Set LDAP_ADMIN_PASSWORD environment variable or ldap.admin.password system property for secure configuration.");
ldapPassword = "secret";
}
}

env.put(Context.SECURITY_CREDENTIALS, ldapPassword);
env.put(Context.INITIAL_CONTEXT_FACTORY, "com.sun.jndi.ldap.LdapCtxFactory");
return env;
}
Expand Down