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

Jump to bottom

Fix #23650 SSLHandshakeException occured when execute start-domain after enable-secure-admin #23651

Merged
merged 1 commit into from
Oct 6, 2021
Merged

Fix #23650 SSLHandshakeException occured when execute start-domain after enable-secure-admin #23651

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 10 additions & 0 deletions .../mbeanserver/src/main/java/org/glassfish/admin/mbeanserver/ssl/SSLClientConfigurator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/*
* Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2021 Contributors to the Eclipse Foundation
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
Expand Down Expand Up @@ -402,6 +403,15 @@ private void configureCiphersAndProtocols() {
if (sslParams.getTlsEnabled()) {
tmpSSLArtifactsList.add("TLSv1");
}
if (sslParams.getTls11Enabled()) {
tmpSSLArtifactsList.add("TLSv1.1");
}
if (sslParams.getTls12Enabled()) {
tmpSSLArtifactsList.add("TLSv1.2");
}
if (sslParams.getTls13Enabled()) {
tmpSSLArtifactsList.add("TLSv1.3");
}
if (sslParams.getSsl3Enabled() || sslParams.getTlsEnabled()) {
tmpSSLArtifactsList.add("SSLv2Hello");
}
Expand Down
27 changes: 27 additions & 0 deletions nucleus/common/mbeanserver/src/main/java/org/glassfish/admin/mbeanserver/ssl/SSLParams.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/*
* Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2021 Contributors to the Eclipse Foundation
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
Expand Down Expand Up @@ -61,6 +62,9 @@ public class SSLParams {
private Boolean ssl3Enabled = true;
private String ssl3TlsCiphers;
private Boolean tlsEnabled=true;
private Boolean tls11Enabled=true;
private Boolean tls12Enabled=true;
private Boolean tls13Enabled=true;
private Boolean tlsRollBackEnabled=false;


Expand Down Expand Up @@ -295,10 +299,33 @@ public Boolean getTlsEnabled() {
return tlsEnabled;
}

public Boolean getTls11Enabled() {
return tls11Enabled;
}

public Boolean getTls12Enabled() {
return tls12Enabled;
}

public Boolean getTls13Enabled() {
return tls13Enabled;
}

public void setTlsEnabled(String tlsEnabled) {
this.tlsEnabled = Boolean.parseBoolean(tlsEnabled);
}

public void setTls11Enabled(String tls11Enabled) {
this.tls11Enabled = Boolean.parseBoolean(tls11Enabled);
}

public void setTls12Enabled(String tls12Enabled) {
this.tls12Enabled = Boolean.parseBoolean(tls12Enabled);
}

public void setTls13Enabled(String tls13Enabled) {
this.tls13Enabled = Boolean.parseBoolean(tls13Enabled);
}

/**
* Determines whether TLS rollback is enabled. TLS rollback should be enabled for Microsoft Internet Explorer 5.0
Expand Down