Skip to content

Commit ecb0c74

Browse files
authored
Remove insecure SSLSocketFactory (frankframework#4004)
1 parent bad1fb5 commit ecb0c74

File tree

2 files changed

+3
-118
lines changed

2 files changed

+3
-118
lines changed

core/src/main/java/nl/nn/adapterframework/ldap/LdapFindMemberPipe.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright 2016, 2019, 2020 Nationale-Nederlanden
2+
Copyright 2016, 2019-2020 Nationale-Nederlanden, 2022 WeAreFrank!
33
44
Licensed under the Apache License, Version 2.0 (the "License");
55
you may not use this file except in compliance with the License.
@@ -27,14 +27,13 @@
2727

2828
import org.apache.commons.lang3.StringUtils;
2929

30-
import nl.nn.adapterframework.core.PipeLineSession;
3130
import nl.nn.adapterframework.core.ParameterException;
31+
import nl.nn.adapterframework.core.PipeLineSession;
3232
import nl.nn.adapterframework.core.PipeRunException;
3333
import nl.nn.adapterframework.core.PipeRunResult;
3434
import nl.nn.adapterframework.doc.IbisDoc;
3535
import nl.nn.adapterframework.parameters.ParameterValueList;
3636
import nl.nn.adapterframework.stream.Message;
37-
import nl.nn.adapterframework.webcontrol.DummySSLSocketFactory;
3837

3938
/**
4039
* Pipe that checks if a specified dn exists as 'member' in another specified dn
@@ -108,8 +107,7 @@ private boolean findMember(String host, int port, String dnSearchIn, boolean use
108107
ctx = new InitialDirContext(env);
109108
} catch (CommunicationException e) {
110109
log.info("Cannot create constructor for DirContext ["+ e.getMessage() + "], will try again with dummy SocketFactory",e);
111-
env.put("java.naming.ldap.factory.socket", DummySSLSocketFactory.class.getName());
112-
ctx = new InitialLdapContext(env, null);
110+
ctx = new InitialLdapContext(env, null); //Try again without connection request controls.
113111
}
114112
Attribute attrs = ctx.getAttributes("").get("member");
115113
if (attrs != null) {

core/src/main/java/nl/nn/adapterframework/webcontrol/DummySSLSocketFactory.java

Lines changed: 0 additions & 113 deletions
This file was deleted.

0 commit comments

Comments
 (0)