Skip to content

[SPARK-54293][SQL] Disable SNI host check in ThriftHttpCLIService #55308

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

Open
yadavay-amzn wants to merge 1 commit into
base: master
Choose a base branch
from
+9 −1
Open

[SPARK-54293][SQL] Disable SNI host check in ThriftHttpCLIService #55308

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: 9 additions & 1 deletion ...e-thriftserver/src/main/java/org/apache/hive/service/cli/thrift/ThriftHttpCLIService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@
import org.eclipse.jetty.server.AbstractConnectionFactory;
import org.eclipse.jetty.server.ConnectionFactory;
import org.eclipse.jetty.server.HttpConnectionFactory;
import org.eclipse.jetty.server.HttpConfiguration;
import org.eclipse.jetty.server.SecureRequestCustomizer;
import org.eclipse.jetty.server.ServerConnector;
import org.eclipse.jetty.ee10.servlet.ServletContextHandler;
import org.eclipse.jetty.ee10.servlet.ServletHolder;
Expand Down Expand Up @@ -91,8 +93,14 @@ protected void initializeServer() {
Arrays.toString(sslContextFactoryServer.getExcludeProtocols()));
sslContextFactoryServer.setKeyStorePath(keyStorePath);
sslContextFactoryServer.setKeyStorePassword(keyStorePassword);
// SPARK-54293: Disable SNI host check, which defaults to true since Jetty 10.
// This is consistent with the fix in JettyUtils.scala (SPARK-45522).
HttpConfiguration httpConfig = new HttpConfiguration();
SecureRequestCustomizer src = new SecureRequestCustomizer();
src.setSniHostCheck(false);
httpConfig.addCustomizer(src);
connectionFactories = AbstractConnectionFactory.getFactories(
sslContextFactoryServer, new HttpConnectionFactory());
sslContextFactoryServer, new HttpConnectionFactory(httpConfig));
} else {
connectionFactories = new ConnectionFactory[] { new HttpConnectionFactory() };
}
Expand Down