Skip to content
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

8314063 : The socket is not closed in Connection::createSocket when the handshake failed for LDAP connection #15294

Closed
wants to merge 15 commits into from
+314 −66
Closed

8314063 : The socket is not closed in Connection::createSocket when the handshake failed for LDAP connection #15294

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
e812843
8314063 : The socket is not closed in Connection::createSocket when t…
weibxiao Aug 15, 2023
e5d981e
remove the unused import
weibxiao Aug 15, 2023
5e83e6f
update the test code
weibxiao Aug 16, 2023
0cae234
updated the code according to the review
weibxiao Aug 16, 2023
e4898a5
refactor the code and remove pre-created keystore
weibxiao Aug 17, 2023
3df1b6c
update the Connection code
weibxiao Aug 18, 2023
ac72c3d
re-write close method
weibxiao Aug 18, 2023
e9e0497
refactor the code and test cases
weibxiao Aug 19, 2023
8c23a74
update the code based on the review
weibxiao Aug 21, 2023
212ee7f
use original logic to create socket to avoid the compatibility issue
weibxiao Aug 21, 2023
2e0e80f
format the code
weibxiao Aug 22, 2023
cdb7006
refactoring the code according to the comment
weibxiao Aug 24, 2023
be3bd44
update the code according to code review
weibxiao Aug 24, 2023
71bca08
format the code
weibxiao Aug 24, 2023
f03bb79
update the code
weibxiao Aug 24, 2023
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
4 changes: 2 additions & 2 deletions test/jdk/com/sun/jndi/ldap/LdapSSLHandshakeFailureTest.java
View file
Original file line number Diff line number Diff line change
@@ -71,8 +71,8 @@ public static void main(String args[]) throws Exception {
env.put("java.naming.ldap.version", "3");
env.put("com.sun.jndi.ldap.connect.timeout", "1000");
env.put(Context.SECURITY_AUTHENTICATION, "Simple");
env.put(Context.SECURITY_PRINCIPAL, "cn=orcladmin");
env.put(Context.SECURITY_CREDENTIALS, "password1");
env.put(Context.SECURITY_PRINCIPAL, "cn=principal");
env.put(Context.SECURITY_CREDENTIALS, "justpassword");
try {
LdapContext ctx = new InitialLdapContext(env, null);
ctx.close();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The context can be closed in finally block