You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ct...@apache.org on 2015/05/26 22:57:21 UTC
[1/6] accumulo git commit: ACCUMULO-3460 Disable HTTP TRACE in
embedded Jetty
Repository: accumulo
Updated Branches:
refs/heads/1.6 259032205 -> de2763e47
refs/heads/1.7 829f46d06 -> 07672bdc3
refs/heads/master fdd7d09a0 -> ca5928e20
ACCUMULO-3460 Disable HTTP TRACE in embedded Jetty
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/de2763e4
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/de2763e4
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/de2763e4
Branch: refs/heads/1.6
Commit: de2763e47f969a34317ab650403cb260996902c5
Parents: 2590322
Author: Christopher Tubbs <ct...@apache.org>
Authored: Tue May 26 14:09:19 2015 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Tue May 26 15:48:20 2015 -0400
----------------------------------------------------------------------
.../accumulo/monitor/EmbeddedWebServer.java | 20 +++++++++++++++++++-
1 file changed, 19 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/de2763e4/server/monitor/src/main/java/org/apache/accumulo/monitor/EmbeddedWebServer.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/EmbeddedWebServer.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/EmbeddedWebServer.java
index af91136..41890e8 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/EmbeddedWebServer.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/EmbeddedWebServer.java
@@ -21,11 +21,14 @@ import javax.servlet.http.HttpServlet;
import org.apache.accumulo.core.conf.AccumuloConfiguration;
import org.apache.accumulo.core.conf.Property;
import org.apache.commons.lang.StringUtils;
+import org.eclipse.jetty.security.ConstraintMapping;
+import org.eclipse.jetty.security.ConstraintSecurityHandler;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.nio.SelectChannelConnector;
import org.eclipse.jetty.server.session.SessionHandler;
import org.eclipse.jetty.server.ssl.SslSelectChannelConnector;
import org.eclipse.jetty.servlet.ServletContextHandler;
+import org.eclipse.jetty.util.security.Constraint;
import org.eclipse.jetty.util.ssl.SslContextFactory;
public class EmbeddedWebServer {
@@ -76,13 +79,28 @@ public class EmbeddedWebServer {
connector.setHost(host);
connector.setPort(port);
- handler = new ServletContextHandler(server, "/", new SessionHandler(), null, null, null);
+ handler = new ServletContextHandler(server, "/", new SessionHandler(), new ConstraintSecurityHandler(), null, null);
+ disableTrace("/");
}
public void addServlet(Class<? extends HttpServlet> klass, String where) {
handler.addServlet(klass, where);
}
+ private void disableTrace(String where) {
+ Constraint constraint = new Constraint();
+ constraint.setName("Disable TRACE");
+ constraint.setAuthenticate(true); // require auth, but no roles defined, so it'll never match
+
+ ConstraintMapping mapping = new ConstraintMapping();
+ mapping.setConstraint(constraint);
+ mapping.setMethod("TRACE");
+ mapping.setPathSpec(where);
+
+ ConstraintSecurityHandler security = (ConstraintSecurityHandler) handler.getSecurityHandler();
+ security.addConstraintMapping(mapping);
+ }
+
public int getPort() {
return connector.getLocalPort();
}
[4/6] accumulo git commit: Merge branch '1.6' into 1.7
Posted by ct...@apache.org.
Merge branch '1.6' into 1.7
Conflicts:
server/monitor/src/main/java/org/apache/accumulo/monitor/EmbeddedWebServer.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/07672bdc
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/07672bdc
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/07672bdc
Branch: refs/heads/master
Commit: 07672bdc3bae59165bcd408bab2082332312b1d6
Parents: 829f46d de2763e
Author: Christopher Tubbs <ct...@apache.org>
Authored: Tue May 26 16:19:01 2015 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Tue May 26 16:19:01 2015 -0400
----------------------------------------------------------------------
.../accumulo/monitor/EmbeddedWebServer.java | 20 +++++++++++++++++++-
1 file changed, 19 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/07672bdc/server/monitor/src/main/java/org/apache/accumulo/monitor/EmbeddedWebServer.java
----------------------------------------------------------------------
diff --cc server/monitor/src/main/java/org/apache/accumulo/monitor/EmbeddedWebServer.java
index 8c23a16,41890e8..f0213e7
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/EmbeddedWebServer.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/EmbeddedWebServer.java
@@@ -21,11 -21,14 +21,14 @@@ import javax.servlet.http.HttpServlet
import org.apache.accumulo.core.conf.AccumuloConfiguration;
import org.apache.accumulo.core.conf.Property;
import org.apache.commons.lang.StringUtils;
+ import org.eclipse.jetty.security.ConstraintMapping;
+ import org.eclipse.jetty.security.ConstraintSecurityHandler;
+import org.eclipse.jetty.server.HttpConnectionFactory;
import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.server.nio.SelectChannelConnector;
+import org.eclipse.jetty.server.ServerConnector;
import org.eclipse.jetty.server.session.SessionHandler;
-import org.eclipse.jetty.server.ssl.SslSelectChannelConnector;
import org.eclipse.jetty.servlet.ServletContextHandler;
+ import org.eclipse.jetty.util.security.Constraint;
import org.eclipse.jetty.util.ssl.SslContextFactory;
public class EmbeddedWebServer {
[2/6] accumulo git commit: ACCUMULO-3460 Disable HTTP TRACE in
embedded Jetty
Posted by ct...@apache.org.
ACCUMULO-3460 Disable HTTP TRACE in embedded Jetty
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/de2763e4
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/de2763e4
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/de2763e4
Branch: refs/heads/1.7
Commit: de2763e47f969a34317ab650403cb260996902c5
Parents: 2590322
Author: Christopher Tubbs <ct...@apache.org>
Authored: Tue May 26 14:09:19 2015 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Tue May 26 15:48:20 2015 -0400
----------------------------------------------------------------------
.../accumulo/monitor/EmbeddedWebServer.java | 20 +++++++++++++++++++-
1 file changed, 19 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/de2763e4/server/monitor/src/main/java/org/apache/accumulo/monitor/EmbeddedWebServer.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/EmbeddedWebServer.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/EmbeddedWebServer.java
index af91136..41890e8 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/EmbeddedWebServer.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/EmbeddedWebServer.java
@@ -21,11 +21,14 @@ import javax.servlet.http.HttpServlet;
import org.apache.accumulo.core.conf.AccumuloConfiguration;
import org.apache.accumulo.core.conf.Property;
import org.apache.commons.lang.StringUtils;
+import org.eclipse.jetty.security.ConstraintMapping;
+import org.eclipse.jetty.security.ConstraintSecurityHandler;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.nio.SelectChannelConnector;
import org.eclipse.jetty.server.session.SessionHandler;
import org.eclipse.jetty.server.ssl.SslSelectChannelConnector;
import org.eclipse.jetty.servlet.ServletContextHandler;
+import org.eclipse.jetty.util.security.Constraint;
import org.eclipse.jetty.util.ssl.SslContextFactory;
public class EmbeddedWebServer {
@@ -76,13 +79,28 @@ public class EmbeddedWebServer {
connector.setHost(host);
connector.setPort(port);
- handler = new ServletContextHandler(server, "/", new SessionHandler(), null, null, null);
+ handler = new ServletContextHandler(server, "/", new SessionHandler(), new ConstraintSecurityHandler(), null, null);
+ disableTrace("/");
}
public void addServlet(Class<? extends HttpServlet> klass, String where) {
handler.addServlet(klass, where);
}
+ private void disableTrace(String where) {
+ Constraint constraint = new Constraint();
+ constraint.setName("Disable TRACE");
+ constraint.setAuthenticate(true); // require auth, but no roles defined, so it'll never match
+
+ ConstraintMapping mapping = new ConstraintMapping();
+ mapping.setConstraint(constraint);
+ mapping.setMethod("TRACE");
+ mapping.setPathSpec(where);
+
+ ConstraintSecurityHandler security = (ConstraintSecurityHandler) handler.getSecurityHandler();
+ security.addConstraintMapping(mapping);
+ }
+
public int getPort() {
return connector.getLocalPort();
}
[6/6] accumulo git commit: Merge branch '1.7'
Posted by ct...@apache.org.
Merge branch '1.7'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ca5928e2
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ca5928e2
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ca5928e2
Branch: refs/heads/master
Commit: ca5928e2089139cda395a82d3d201d3aab1d3231
Parents: fdd7d09 07672bd
Author: Christopher Tubbs <ct...@apache.org>
Authored: Tue May 26 16:45:33 2015 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Tue May 26 16:45:33 2015 -0400
----------------------------------------------------------------------
.../accumulo/monitor/EmbeddedWebServer.java | 20 +++++++++++++++++++-
1 file changed, 19 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[5/6] accumulo git commit: Merge branch '1.6' into 1.7
Posted by ct...@apache.org.
Merge branch '1.6' into 1.7
Conflicts:
server/monitor/src/main/java/org/apache/accumulo/monitor/EmbeddedWebServer.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/07672bdc
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/07672bdc
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/07672bdc
Branch: refs/heads/1.7
Commit: 07672bdc3bae59165bcd408bab2082332312b1d6
Parents: 829f46d de2763e
Author: Christopher Tubbs <ct...@apache.org>
Authored: Tue May 26 16:19:01 2015 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Tue May 26 16:19:01 2015 -0400
----------------------------------------------------------------------
.../accumulo/monitor/EmbeddedWebServer.java | 20 +++++++++++++++++++-
1 file changed, 19 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/07672bdc/server/monitor/src/main/java/org/apache/accumulo/monitor/EmbeddedWebServer.java
----------------------------------------------------------------------
diff --cc server/monitor/src/main/java/org/apache/accumulo/monitor/EmbeddedWebServer.java
index 8c23a16,41890e8..f0213e7
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/EmbeddedWebServer.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/EmbeddedWebServer.java
@@@ -21,11 -21,14 +21,14 @@@ import javax.servlet.http.HttpServlet
import org.apache.accumulo.core.conf.AccumuloConfiguration;
import org.apache.accumulo.core.conf.Property;
import org.apache.commons.lang.StringUtils;
+ import org.eclipse.jetty.security.ConstraintMapping;
+ import org.eclipse.jetty.security.ConstraintSecurityHandler;
+import org.eclipse.jetty.server.HttpConnectionFactory;
import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.server.nio.SelectChannelConnector;
+import org.eclipse.jetty.server.ServerConnector;
import org.eclipse.jetty.server.session.SessionHandler;
-import org.eclipse.jetty.server.ssl.SslSelectChannelConnector;
import org.eclipse.jetty.servlet.ServletContextHandler;
+ import org.eclipse.jetty.util.security.Constraint;
import org.eclipse.jetty.util.ssl.SslContextFactory;
public class EmbeddedWebServer {
[3/6] accumulo git commit: ACCUMULO-3460 Disable HTTP TRACE in
embedded Jetty
Posted by ct...@apache.org.
ACCUMULO-3460 Disable HTTP TRACE in embedded Jetty
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/de2763e4
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/de2763e4
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/de2763e4
Branch: refs/heads/master
Commit: de2763e47f969a34317ab650403cb260996902c5
Parents: 2590322
Author: Christopher Tubbs <ct...@apache.org>
Authored: Tue May 26 14:09:19 2015 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Tue May 26 15:48:20 2015 -0400
----------------------------------------------------------------------
.../accumulo/monitor/EmbeddedWebServer.java | 20 +++++++++++++++++++-
1 file changed, 19 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/de2763e4/server/monitor/src/main/java/org/apache/accumulo/monitor/EmbeddedWebServer.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/EmbeddedWebServer.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/EmbeddedWebServer.java
index af91136..41890e8 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/EmbeddedWebServer.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/EmbeddedWebServer.java
@@ -21,11 +21,14 @@ import javax.servlet.http.HttpServlet;
import org.apache.accumulo.core.conf.AccumuloConfiguration;
import org.apache.accumulo.core.conf.Property;
import org.apache.commons.lang.StringUtils;
+import org.eclipse.jetty.security.ConstraintMapping;
+import org.eclipse.jetty.security.ConstraintSecurityHandler;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.nio.SelectChannelConnector;
import org.eclipse.jetty.server.session.SessionHandler;
import org.eclipse.jetty.server.ssl.SslSelectChannelConnector;
import org.eclipse.jetty.servlet.ServletContextHandler;
+import org.eclipse.jetty.util.security.Constraint;
import org.eclipse.jetty.util.ssl.SslContextFactory;
public class EmbeddedWebServer {
@@ -76,13 +79,28 @@ public class EmbeddedWebServer {
connector.setHost(host);
connector.setPort(port);
- handler = new ServletContextHandler(server, "/", new SessionHandler(), null, null, null);
+ handler = new ServletContextHandler(server, "/", new SessionHandler(), new ConstraintSecurityHandler(), null, null);
+ disableTrace("/");
}
public void addServlet(Class<? extends HttpServlet> klass, String where) {
handler.addServlet(klass, where);
}
+ private void disableTrace(String where) {
+ Constraint constraint = new Constraint();
+ constraint.setName("Disable TRACE");
+ constraint.setAuthenticate(true); // require auth, but no roles defined, so it'll never match
+
+ ConstraintMapping mapping = new ConstraintMapping();
+ mapping.setConstraint(constraint);
+ mapping.setMethod("TRACE");
+ mapping.setPathSpec(where);
+
+ ConstraintSecurityHandler security = (ConstraintSecurityHandler) handler.getSecurityHandler();
+ security.addConstraintMapping(mapping);
+ }
+
public int getPort() {
return connector.getLocalPort();
}