Skip to content

Commit 3150ee7

Browse files
author
gm2552
committed
Fixing issue when resolving certificate via LDAP.
Applying new filter to resolve certificate via LDAP. Updating to SpringBoot 2.1.9.
1 parent c1ae4bd commit 3150ee7

3 files changed

Lines changed: 21 additions & 6 deletions

File tree

pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<parent>
3939
<groupId>org.springframework.boot</groupId>
4040
<artifactId>spring-boot-dependencies</artifactId>
41-
<version>2.1.3.RELEASE</version>
41+
<version>2.1.9.RELEASE</version>
4242
</parent>
4343
<scm>
4444
<url>https://github.com/DirectProjectJavaRI/agent.git</url>
@@ -54,17 +54,17 @@
5454
<dependency>
5555
<groupId>org.nhind</groupId>
5656
<artifactId>direct-policy</artifactId>
57-
<version>6.0.1-SNAPSHOT</version>
57+
<version>6.0</version>
5858
</dependency>
5959
<dependency>
6060
<groupId>org.nhind</groupId>
6161
<artifactId>direct-common</artifactId>
62-
<version>6.0.1-SNAPSHOT</version>
62+
<version>6.0.1</version>
6363
</dependency>
6464
<dependency>
6565
<groupId>org.nhind</groupId>
6666
<artifactId>direct-msg-monitor-model</artifactId>
67-
<version>6.0.1-SNAPSHOT</version>
67+
<version>6.0</version>
6868
</dependency>
6969
<dependency>
7070
<groupId>commons-codec</groupId>

src/main/java/org/nhindirect/stagent/cert/impl/LdapPublicCertUtilImpl.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
7171
*/
7272
public class LdapPublicCertUtilImpl implements LdapCertUtil{
7373

74-
@SuppressWarnings("deprecation")
7574
private static final Log LOGGER = LogFactory.getFactory().getInstance(LdapPublicCertUtilImpl.class);
7675

7776
private static final String DEFAULT_LDAP_TIMEOUT = "5000";
@@ -135,7 +134,7 @@ public Collection<X509Certificate> ldapSearch(String subjectName){
135134

136135
NamingEnumeration<SearchResult> searchResult = ctx.search(
137136
dn,
138-
EMAIL_ATTRIBUTE + "=" + subjectName,
137+
"(&(" + EMAIL_ATTRIBUTE + "=" + subjectName +")(|(userCertificate;binary=*)(userCertificate=*)))",
139138
getDefaultSearchControls());
140139

141140
while (searchResult != null && searchResult.hasMore()) {

src/site/apt/releaseNotes.apt

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,22 @@
66
Greg Meyer
77
---
88

9+
{6.0.3}
10+
11+
Changes included with release 6.0.3
12+
13+
[]
14+
15+
Enhancements
16+
17+
* Updating to SpringBoot 2.1.9
18+
19+
[]
20+
21+
Bug Fixes
22+
23+
* Fixing issue resolving certificate via LDAP. Using same filters on return types as NIST tooling.
24+
925
{6.0.2}
1026

1127
Changes included with release 6.0.2

0 commit comments

Comments
 (0)