forked from apache/pulsar
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[improve][broker-web&websocket&proxy&function-worker] Full-support se…
…t ssl provider, ciphers and protocols (apache#13740) Fixes apache#13734 ### Motivation Pulsar doesn't set ssl provider, ciphers and protocols to the web, websocket and proxy service when `tlsEnabledWithKeyStore=false` ### Modifications - Add `org.apache.pulsar.jetty.tls` package in pulsar-broker-common for Jetty TLS support - Add a new `webServiceTlsProvider=Conscrypt` to broker and proxy config - Update `Conscrypt` as the `tlsProvider` value in websocket config In the old version, we implicitly use the `Conscrypt` provider, now we need to set it explicitly.
- Loading branch information
Showing
34 changed files
with
583 additions
and
257 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
19 changes: 19 additions & 0 deletions
19
pulsar-broker-common/src/main/java/org/apache/pulsar/jetty/package-info.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
/** | ||
* Licensed to the Apache Software Foundation (ASF) under one | ||
* or more contributor license agreements. See the NOTICE file | ||
* distributed with this work for additional information | ||
* regarding copyright ownership. The ASF licenses this file | ||
* to you under the Apache License, Version 2.0 (the | ||
* "License"); you may not use this file except in compliance | ||
* with the License. You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, | ||
* software distributed under the License is distributed on an | ||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
* KIND, either express or implied. See the License for the | ||
* specific language governing permissions and limitations | ||
* under the License. | ||
*/ | ||
package org.apache.pulsar.jetty; |
116 changes: 116 additions & 0 deletions
116
pulsar-broker-common/src/main/java/org/apache/pulsar/jetty/tls/JettySslContextFactory.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,116 @@ | ||
/** | ||
* Licensed to the Apache Software Foundation (ASF) under one | ||
* or more contributor license agreements. See the NOTICE file | ||
* distributed with this work for additional information | ||
* regarding copyright ownership. The ASF licenses this file | ||
* to you under the Apache License, Version 2.0 (the | ||
* "License"); you may not use this file except in compliance | ||
* with the License. You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, | ||
* software distributed under the License is distributed on an | ||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
* KIND, either express or implied. See the License for the | ||
* specific language governing permissions and limitations | ||
* under the License. | ||
*/ | ||
package org.apache.pulsar.jetty.tls; | ||
|
||
import java.util.Set; | ||
import javax.net.ssl.SSLContext; | ||
import lombok.extern.slf4j.Slf4j; | ||
import org.apache.pulsar.common.util.DefaultSslContextBuilder; | ||
import org.apache.pulsar.common.util.SecurityUtility; | ||
import org.apache.pulsar.common.util.SslContextAutoRefreshBuilder; | ||
import org.apache.pulsar.common.util.keystoretls.NetSslContextBuilder; | ||
import org.eclipse.jetty.util.ssl.SslContextFactory; | ||
|
||
@Slf4j | ||
public class JettySslContextFactory { | ||
static { | ||
// DO NOT EDIT - Load Conscrypt provider | ||
if (SecurityUtility.CONSCRYPT_PROVIDER != null) { | ||
} | ||
} | ||
|
||
public static SslContextFactory.Server createServerSslContextWithKeystore(String sslProviderString, | ||
String keyStoreTypeString, | ||
String keyStore, | ||
String keyStorePassword, | ||
boolean allowInsecureConnection, | ||
String trustStoreTypeString, | ||
String trustStore, | ||
String trustStorePassword, | ||
boolean requireTrustedClientCertOnConnect, | ||
Set<String> ciphers, | ||
Set<String> protocols, | ||
long certRefreshInSec) { | ||
NetSslContextBuilder sslCtxRefresher = new NetSslContextBuilder( | ||
sslProviderString, | ||
keyStoreTypeString, | ||
keyStore, | ||
keyStorePassword, | ||
allowInsecureConnection, | ||
trustStoreTypeString, | ||
trustStore, | ||
trustStorePassword, | ||
requireTrustedClientCertOnConnect, | ||
certRefreshInSec); | ||
|
||
return new JettySslContextFactory.Server(sslProviderString, sslCtxRefresher, | ||
requireTrustedClientCertOnConnect, ciphers, protocols); | ||
} | ||
|
||
public static SslContextFactory createServerSslContext(String sslProviderString, boolean tlsAllowInsecureConnection, | ||
String tlsTrustCertsFilePath, | ||
String tlsCertificateFilePath, | ||
String tlsKeyFilePath, | ||
boolean tlsRequireTrustedClientCertOnConnect, | ||
Set<String> ciphers, | ||
Set<String> protocols, | ||
long certRefreshInSec) { | ||
DefaultSslContextBuilder sslCtxRefresher = | ||
new DefaultSslContextBuilder(tlsAllowInsecureConnection, tlsTrustCertsFilePath, tlsCertificateFilePath, | ||
tlsKeyFilePath, tlsRequireTrustedClientCertOnConnect, certRefreshInSec, sslProviderString); | ||
|
||
return new JettySslContextFactory.Server(sslProviderString, sslCtxRefresher, | ||
tlsRequireTrustedClientCertOnConnect, ciphers, protocols); | ||
} | ||
|
||
private static class Server extends SslContextFactory.Server { | ||
private final SslContextAutoRefreshBuilder<SSLContext> sslCtxRefresher; | ||
|
||
public Server(String sslProviderString, SslContextAutoRefreshBuilder<SSLContext> sslCtxRefresher, | ||
boolean requireTrustedClientCertOnConnect, Set<String> ciphers, Set<String> protocols) { | ||
super(); | ||
this.sslCtxRefresher = sslCtxRefresher; | ||
|
||
if (ciphers != null && ciphers.size() > 0) { | ||
this.setIncludeCipherSuites(ciphers.toArray(new String[0])); | ||
} | ||
|
||
if (protocols != null && protocols.size() > 0) { | ||
this.setIncludeProtocols(protocols.toArray(new String[0])); | ||
} | ||
|
||
if (sslProviderString != null && !sslProviderString.equals("")) { | ||
setProvider(sslProviderString); | ||
} | ||
|
||
if (requireTrustedClientCertOnConnect) { | ||
this.setNeedClientAuth(true); | ||
this.setTrustAll(false); | ||
} else { | ||
this.setWantClientAuth(true); | ||
this.setTrustAll(true); | ||
} | ||
} | ||
|
||
@Override | ||
public SSLContext getSslContext() { | ||
return sslCtxRefresher.get(); | ||
} | ||
} | ||
} |
19 changes: 19 additions & 0 deletions
19
pulsar-broker-common/src/main/java/org/apache/pulsar/jetty/tls/package-info.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
/** | ||
* Licensed to the Apache Software Foundation (ASF) under one | ||
* or more contributor license agreements. See the NOTICE file | ||
* distributed with this work for additional information | ||
* regarding copyright ownership. The ASF licenses this file | ||
* to you under the Apache License, Version 2.0 (the | ||
* "License"); you may not use this file except in compliance | ||
* with the License. You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, | ||
* software distributed under the License is distributed on an | ||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
* KIND, either express or implied. See the License for the | ||
* specific language governing permissions and limitations | ||
* under the License. | ||
*/ | ||
package org.apache.pulsar.jetty.tls; |
Oops, something went wrong.