Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-27027 Use jetty SslContextFactory.Server instead of deprecated SslContextFactory (#4425) 

Signed-off-by: Duo Zhang <zhangduo@apache.org>
(cherry picked from commit 1be2c83b3d)
This commit is contained in:
bitterfox 2022-05-22 12:32:17 +09:00 committed by Duo Zhang
parent 6ae8c9a808
commit 075f6e638f
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hbase-http/src/main/java/org/apache/hadoop/hbase/http/HttpServer.java
View File

@ -417,7 +417,7 @@ public class HttpServer implements FilterContainer {
} else if ("https".equals(scheme)) { } else if ("https".equals(scheme)) {
HttpConfiguration httpsConfig = new HttpConfiguration(httpConfig); HttpConfiguration httpsConfig = new HttpConfiguration(httpConfig);
httpsConfig.addCustomizer(new SecureRequestCustomizer()); httpsConfig.addCustomizer(new SecureRequestCustomizer());
SslContextFactory sslCtxFactory = new SslContextFactory(); SslContextFactory.Server sslCtxFactory = new SslContextFactory.Server();
sslCtxFactory.setNeedClientAuth(needsClientAuth); sslCtxFactory.setNeedClientAuth(needsClientAuth);
sslCtxFactory.setKeyManagerPassword(keyPassword); sslCtxFactory.setKeyManagerPassword(keyPassword);

2
hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/RESTServer.java
View File

@ -313,7 +313,7 @@ public class RESTServer implements Constants {
HttpConfiguration httpsConfig = new HttpConfiguration(httpConfig); HttpConfiguration httpsConfig = new HttpConfiguration(httpConfig);
httpsConfig.addCustomizer(new SecureRequestCustomizer()); httpsConfig.addCustomizer(new SecureRequestCustomizer());
SslContextFactory sslCtxFactory = new SslContextFactory(); SslContextFactory.Server sslCtxFactory = new SslContextFactory.Server();
String keystore = conf.get(REST_SSL_KEYSTORE_STORE); String keystore = conf.get(REST_SSL_KEYSTORE_STORE);
String keystoreType = conf.get(REST_SSL_KEYSTORE_TYPE); String keystoreType = conf.get(REST_SSL_KEYSTORE_TYPE);
String password = HBaseConfiguration.getPassword(conf, REST_SSL_KEYSTORE_PASSWORD, null); String password = HBaseConfiguration.getPassword(conf, REST_SSL_KEYSTORE_PASSWORD, null);

2
hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServer.java
View File

@ -407,7 +407,7 @@ public class ThriftServer extends Configured implements Tool {
HttpConfiguration httpsConfig = new HttpConfiguration(httpConfig); HttpConfiguration httpsConfig = new HttpConfiguration(httpConfig);
httpsConfig.addCustomizer(new SecureRequestCustomizer()); httpsConfig.addCustomizer(new SecureRequestCustomizer());
SslContextFactory sslCtxFactory = new SslContextFactory(); SslContextFactory.Server sslCtxFactory = new SslContextFactory.Server();
String keystore = conf.get(THRIFT_SSL_KEYSTORE_STORE_KEY); String keystore = conf.get(THRIFT_SSL_KEYSTORE_STORE_KEY);
String password = String password =
HBaseConfiguration.getPassword(conf, THRIFT_SSL_KEYSTORE_PASSWORD_KEY, null); HBaseConfiguration.getPassword(conf, THRIFT_SSL_KEYSTORE_PASSWORD_KEY, null);