From 5c3668238c4cadac08f0d9e0f91400173d8d25b4 Mon Sep 17 00:00:00 2001 From: Kevin Risden Date: Thu, 12 Apr 2018 21:08:15 -0500 Subject: [PATCH] HBase Thrift HTTP - Shouldn't handle TRACE/OPTIONS methods --- .../java/org/apache/hadoop/hbase/thrift/ThriftServerRunner.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServerRunner.java b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServerRunner.java index 39ea259426..28ba28ad62 100644 --- a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServerRunner.java +++ b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServerRunner.java @@ -79,6 +79,7 @@ import org.apache.hadoop.hbase.filter.Filter; import org.apache.hadoop.hbase.filter.ParseFilter; import org.apache.hadoop.hbase.filter.PrefixFilter; import org.apache.hadoop.hbase.filter.WhileMatchFilter; +import org.apache.hadoop.hbase.http.HttpServerUtil; import org.apache.hadoop.hbase.log.HBaseMarkers; import org.apache.hadoop.hbase.security.SaslUtil; import org.apache.hadoop.hbase.security.SaslUtil.QualityOfProtection; @@ -448,6 +449,7 @@ public class ThriftServerRunner implements Runnable { ServletContextHandler ctxHandler = new ServletContextHandler(httpServer, "/", ServletContextHandler.SESSIONS); ctxHandler.addServlet(new ServletHolder(thriftHttpServlet), "/*"); + HttpServerUtil.constrainHttpMethods(ctxHandler); // set up Jetty and run the embedded server HttpConfiguration httpConfig = new HttpConfiguration(); -- 2.17.0