Skip to content

Fix CWE-90 (LDAP Injection) — automated red/blue remediation #7

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

Open
codegm2020 wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Fix CWE-90 (LDAP Injection) — automated red/blue remediation #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b2a8cd9
fix(CWE-90): BenchmarkTest00012 — LDAP Injection (red-verified, round 1)
Sep 24, 2026
e99ddf4
fix(CWE-90): BenchmarkTest00021 — LDAP Injection (red-verified, round 2)
Sep 24, 2026
8ba202a
fix(CWE-90): BenchmarkTest00630 — LDAP Injection (red-verified, round 3)
Sep 24, 2026
e2873db
fix(CWE-90): BenchmarkTest00947 — LDAP Injection (red-verified, round 2)
Sep 24, 2026
e42382b
fix(CWE-90): BenchmarkTest00959 — LDAP Injection (red-verified, round 2)
Sep 24, 2026
d563041
fix(CWE-90): BenchmarkTest01023 — LDAP Injection (red-verified, round 2)
Sep 24, 2026
9a72e27
fix(CWE-90): BenchmarkTest01241 — LDAP Injection (red-verified, round 1)
Sep 24, 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
2 changes: 1 addition & 1 deletion src/main/java/org/owasp/benchmark/testcode/BenchmarkTest00012.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public void doPost(HttpServletRequest request, HttpServletResponse response)
String base = "ou=users,ou=system";
javax.naming.directory.SearchControls sc = new javax.naming.directory.SearchControls();
sc.setSearchScope(javax.naming.directory.SearchControls.SUBTREE_SCOPE);
String filter = "(&(objectclass=person))(|(uid=" + param + ")(street={0}))";
String filter = "(&(objectclass=person))(|(uid={0})(street={1}))";
Object[] filters = new Object[] {"The streetz 4 Ms bar"};

javax.naming.directory.DirContext ctx = ads.getDirContext();
Expand Down
5 changes: 3 additions & 2 deletions src/main/java/org/owasp/benchmark/testcode/BenchmarkTest00021.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,9 @@ public void doPost(HttpServletRequest request, HttpServletResponse response)
String base = "ou=users,ou=system";
javax.naming.directory.SearchControls sc = new javax.naming.directory.SearchControls();
sc.setSearchScope(javax.naming.directory.SearchControls.SUBTREE_SCOPE);
String filter = "(&(objectclass=person))(|(uid=" + param + ")(street={0}))";
Object[] filters = new Object[] {"The streetz 4 Ms bar"};
String escapedParam = org.owasp.esapi.ESAPI.encoder().encodeForLDAP(param);
String filter = "(&(objectclass=person))(|(uid={0})(street={1}))";
Object[] filters = new Object[] {escapedParam, "The streetz 4 Ms bar"};
boolean found = false;
javax.naming.NamingEnumeration<javax.naming.directory.SearchResult> results =
ctx.search(base, filter, filters, sc);
Expand Down
32 changes: 13 additions & 19 deletions src/main/java/org/owasp/benchmark/testcode/BenchmarkTest00630.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,18 +72,20 @@ public void doPost(HttpServletRequest request, HttpServletResponse response)
String base = "ou=users,ou=system";
javax.naming.directory.SearchControls sc = new javax.naming.directory.SearchControls();
sc.setSearchScope(javax.naming.directory.SearchControls.SUBTREE_SCOPE);
String filter = "(&(objectclass=person)(uid=" + bar + "))";
import org.owasp.esapi.ESAPI;

String barEncoded = ESAPI.encoder().encodeForLDAP(bar);

String filter = "(&(objectclass=person)(uid={0}))";
javax.naming.directory.DirContext ctx = ads.getDirContext();
javax.naming.directory.InitialDirContext idc =
(javax.naming.directory.InitialDirContext) ctx;
boolean found = false;
javax.naming.NamingEnumeration<javax.naming.directory.SearchResult> results =
idc.search(base, filter, sc);
javax.naming.directory.InitialDirContext idc = (javax.naming.directory.InitialDirContext) ctx;
javax.naming.directory.SearchControls sc = new javax.naming.directory.SearchControls();
sc.setSearchScope(javax.naming.directory.SearchControls.SUBTREE_SCOPE);
javax.naming.NamingEnumeration<javax.naming.directory.SearchResult> results = idc.search(base, filter, new Object[]{barEncoded}, sc);

boolean found = false;
while (results.hasMore()) {
javax.naming.directory.SearchResult sr =
(javax.naming.directory.SearchResult) results.next();
javax.naming.directory.SearchResult sr = (javax.naming.directory.SearchResult) results.next();
javax.naming.directory.Attributes attrs = sr.getAttributes();

javax.naming.directory.Attribute attr = attrs.get("uid");
Expand All @@ -93,17 +95,9 @@ public void doPost(HttpServletRequest request, HttpServletResponse response)
.println(
"LDAP query results:<br>"
+ "Record found with name "
+ org.owasp
.esapi
.ESAPI
.encoder()
.encodeForHTML(attr.get().toString())
+ ESAPI.encoder().encodeForHTML(attr.get().toString())
+ "<br>Address: "
+ org.owasp
.esapi
.ESAPI
.encoder()
.encodeForHTML(attr2.get().toString())
+ ESAPI.encoder().encodeForHTML(attr2.get().toString())
+ "<br>");
found = true;
}
Expand All @@ -112,7 +106,7 @@ public void doPost(HttpServletRequest request, HttpServletResponse response)
response.getWriter()
.println(
"LDAP query results: nothing found for query: "
+ org.owasp.esapi.ESAPI.encoder().encodeForHTML(filter));
+ ESAPI.encoder().encodeForHTML(filter));
}
} catch (javax.naming.NamingException e) {
throw new ServletException(e);
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/owasp/benchmark/testcode/BenchmarkTest00947.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@ public void doPost(HttpServletRequest request, HttpServletResponse response)
String base = "ou=users,ou=system";
javax.naming.directory.SearchControls sc = new javax.naming.directory.SearchControls();
sc.setSearchScope(javax.naming.directory.SearchControls.SUBTREE_SCOPE);
String filter = "(&(objectclass=person))(|(uid=" + bar + ")(street={0}))";
Object[] filters = new Object[] {"The streetz 4 Ms bar"};
String filter = "(&(objectclass=person))(|(uid={0})(street={1}))";
Object[] filters = new Object[] {bar, "The streetz 4 Ms bar"};
boolean found = false;
javax.naming.NamingEnumeration<javax.naming.directory.SearchResult> results =
ctx.search(base, filter, filters, sc);
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/owasp/benchmark/testcode/BenchmarkTest00959.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@ public void doPost(HttpServletRequest request, HttpServletResponse response)
String base = "ou=users,ou=system";
javax.naming.directory.SearchControls sc = new javax.naming.directory.SearchControls();
sc.setSearchScope(javax.naming.directory.SearchControls.SUBTREE_SCOPE);
String filter = "(&(objectclass=person))(|(uid=" + bar + ")(street={0}))";
Object[] filters = new Object[] {"The streetz 4 Ms bar"};
String filter = "(&(objectclass=person))(|(uid={0})(street={1}))";
Object[] filters = new Object[] {bar, "The streetz 4 Ms bar"};

javax.naming.directory.DirContext ctx = ads.getDirContext();
javax.naming.directory.InitialDirContext idc =
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/owasp/benchmark/testcode/BenchmarkTest01023.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ public void doPost(HttpServletRequest request, HttpServletResponse response)
String base = "ou=users,ou=system";
javax.naming.directory.SearchControls sc = new javax.naming.directory.SearchControls();
sc.setSearchScope(javax.naming.directory.SearchControls.SUBTREE_SCOPE);
String filter = "(&(objectclass=person))(|(uid=" + bar + ")(street={0}))";
Object[] filters = new Object[] {"The streetz 4 Ms bar"};
String filter = "(&(objectclass=person))(|(uid={0})(street={1}))";
Object[] filters = new Object[] {bar, "The streetz 4 Ms bar"};
boolean found = false;
javax.naming.NamingEnumeration<javax.naming.directory.SearchResult> results =
ctx.search(base, filter, filters, sc);
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/owasp/benchmark/testcode/BenchmarkTest01241.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public void doPost(HttpServletRequest request, HttpServletResponse response)
String base = "ou=users,ou=system";
javax.naming.directory.SearchControls sc = new javax.naming.directory.SearchControls();
sc.setSearchScope(javax.naming.directory.SearchControls.SUBTREE_SCOPE);
String filter = "(&(objectclass=person))(|(uid=" + bar + ")(street={0}))";
String filter = "(&(objectclass=person))(|(uid={0})(street={1}))";
Object[] filters = new Object[] {"The streetz 4 Ms bar"};

javax.naming.directory.DirContext ctx = ads.getDirContext();
Expand Down