You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2017/07/12 17:06:05 UTC
[3/6] tinkerpop git commit: TINKERPOP-915 Fix issues from merging
master
TINKERPOP-915 Fix issues from merging master
Removed generics on ServerExecutor in merge
Update HttpChannelizer integration tests to use new json format
Fix issues created from merging tp32 in 960fde1 regarding creation of
the authenticationHandler
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/325499c7
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/325499c7
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/325499c7
Branch: refs/heads/master
Commit: 325499c706c79c1fe5d0489e2bacbcf8fefa76c3
Parents: cee56f5
Author: Keith Lohnes <kr...@us.ibm.com>
Authored: Wed Jul 12 12:23:48 2017 -0400
Committer: Keith Lohnes <kr...@us.ibm.com>
Committed: Wed Jul 12 12:23:48 2017 -0400
----------------------------------------------------------------------
.../gremlin/server/AbstractChannelizer.java | 5 +++--
.../server/channel/WebSocketChannelizer.java | 2 +-
.../server/channel/WsAndHttpChannelizer.java | 2 +-
.../SaslAndHttpBasicAuthenticationHandler.java | 8 +++++---
.../server/handler/SaslAuthenticationHandler.java | 2 +-
.../handler/WsAndHttpChannelizerHandler.java | 2 +-
.../server/GremlinServerHttpIntegrateTest.java | 18 ------------------
...actGremlminServerChannelizerIntegrateTest.java | 2 +-
8 files changed, 13 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/325499c7/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/AbstractChannelizer.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/AbstractChannelizer.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/AbstractChannelizer.java
index d53cdfe..3b44e70 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/AbstractChannelizer.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/AbstractChannelizer.java
@@ -158,9 +158,10 @@ public abstract class AbstractChannelizer extends ChannelInitializer<SocketChann
protected AbstractAuthenticationHandler createAuthenticationHandler(final Settings.AuthenticationSettings config) {
try {
final Class<?> clazz = Class.forName(config.authenticationHandler);
- final Class[] constructorArgs = new Class[1];
+ final Class[] constructorArgs = new Class[2];
constructorArgs[0] = Authenticator.class;
- return (AbstractAuthenticationHandler) clazz.getDeclaredConstructor(constructorArgs).newInstance(authenticator);
+ constructorArgs[1] = Settings.AuthenticationSettings.class;
+ return (AbstractAuthenticationHandler) clazz.getDeclaredConstructor(constructorArgs).newInstance(authenticator, config);
} catch (Exception ex) {
logger.warn(ex.getMessage());
throw new IllegalStateException(String.format("Could not create/configure AuthenticationHandler %s", config.authenticationHandler), ex);
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/325499c7/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/channel/WebSocketChannelizer.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/channel/WebSocketChannelizer.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/channel/WebSocketChannelizer.java
index d8639de..081e336 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/channel/WebSocketChannelizer.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/channel/WebSocketChannelizer.java
@@ -68,7 +68,7 @@ public class WebSocketChannelizer extends AbstractChannelizer {
// configure authentication - null means don't bother to add authentication to the pipeline
if (authenticator != null)
authenticationHandler = authenticator.getClass() == AllowAllAuthenticator.class ?
- null : new SaslAuthenticationHandler(authenticator, settings.authentication);
+ null : instantiateAuthenticationHandler(settings.authentication);
}
@Override
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/325499c7/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/channel/WsAndHttpChannelizer.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/channel/WsAndHttpChannelizer.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/channel/WsAndHttpChannelizer.java
index 58885fb..a8aa0b1 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/channel/WsAndHttpChannelizer.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/channel/WsAndHttpChannelizer.java
@@ -47,7 +47,7 @@ public class WsAndHttpChannelizer extends AbstractChannelizer {
private WsAndHttpChannelizerHandler handler;
@Override
- public void init(final ServerGremlinExecutor<EventLoopGroup> serverGremlinExecutor) {
+ public void init(final ServerGremlinExecutor serverGremlinExecutor) {
super.init(serverGremlinExecutor);
handler = new WsAndHttpChannelizerHandler();
handler.init(serverGremlinExecutor, new HttpGremlinEndpointHandler(serializers, gremlinExecutor, graphManager, settings));
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/325499c7/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/SaslAndHttpBasicAuthenticationHandler.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/SaslAndHttpBasicAuthenticationHandler.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/SaslAndHttpBasicAuthenticationHandler.java
index d3e4cfe..87e692c 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/SaslAndHttpBasicAuthenticationHandler.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/SaslAndHttpBasicAuthenticationHandler.java
@@ -24,6 +24,7 @@ import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.ChannelPipeline;
import io.netty.handler.codec.http.HttpMessage;
import org.apache.tinkerpop.gremlin.server.auth.Authenticator;
+import org.apache.tinkerpop.gremlin.server.Settings;
import org.apache.tinkerpop.gremlin.server.handler.HttpBasicAuthenticationHandler;
import org.apache.tinkerpop.gremlin.server.handler.SaslAuthenticationHandler;
import org.apache.tinkerpop.gremlin.server.handler.WebSocketHandlerUtil;
@@ -38,15 +39,16 @@ public class SaslAndHttpBasicAuthenticationHandler extends SaslAuthenticationHan
private final String HTTP_AUTH = "http-authentication";
- public SaslAndHttpBasicAuthenticationHandler(final Authenticator authenticator) {
- super(authenticator);
+ public SaslAndHttpBasicAuthenticationHandler(final Authenticator authenticator,
+ final Settings.AuthenticationSettings authenticationSettings) {
+ super(authenticator, authenticationSettings);
}
@Override
public void channelRead(final ChannelHandlerContext ctx, final Object obj) throws Exception {
if (obj instanceof HttpMessage && !WebSocketHandlerUtil.isWebSocket((HttpMessage)obj)) {
if (null == ctx.pipeline().get(HTTP_AUTH)) {
- ctx.pipeline().addAfter(PIPELINE_AUTHENTICATOR, HTTP_AUTH, new HttpBasicAuthenticationHandler(authenticator));
+ ctx.pipeline().addAfter(PIPELINE_AUTHENTICATOR, HTTP_AUTH, new HttpBasicAuthenticationHandler(authenticator, this.authenticationSettings));
}
ctx.fireChannelRead(obj);
} else {
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/325499c7/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/SaslAuthenticationHandler.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/SaslAuthenticationHandler.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/SaslAuthenticationHandler.java
index 077d05a..0e8fa1a 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/SaslAuthenticationHandler.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/SaslAuthenticationHandler.java
@@ -60,7 +60,7 @@ public class SaslAuthenticationHandler extends AbstractAuthenticationHandler {
private static final Base64.Encoder BASE64_ENCODER = Base64.getEncoder();
private static final Logger auditLogger = LoggerFactory.getLogger(GremlinServer.AUDIT_LOGGER_NAME);
- private final Settings.AuthenticationSettings authenticationSettings;
+ protected final Settings.AuthenticationSettings authenticationSettings;
public SaslAuthenticationHandler(final Authenticator authenticator, final Settings.AuthenticationSettings authenticationSettings) {
super(authenticator);
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/325499c7/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/WsAndHttpChannelizerHandler.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/WsAndHttpChannelizerHandler.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/WsAndHttpChannelizerHandler.java
index 328a34b..4bd8aec 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/WsAndHttpChannelizerHandler.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/WsAndHttpChannelizerHandler.java
@@ -50,7 +50,7 @@ public class WsAndHttpChannelizerHandler extends ChannelInboundHandlerAdapter {
private final WebSocketChannelizer wsChannelizer = new WebSocketChannelizer();
private HttpGremlinEndpointHandler httpGremlinEndpointHandler;
- public void init(final ServerGremlinExecutor<EventLoopGroup> serverGremlinExecutor, final HttpGremlinEndpointHandler httpGremlinEndpointHandler) {
+ public void init(final ServerGremlinExecutor serverGremlinExecutor, final HttpGremlinEndpointHandler httpGremlinEndpointHandler) {
//WebSocketChannelizer has everything needed for the http endpoint to work
wsChannelizer.init(serverGremlinExecutor);
this.httpGremlinEndpointHandler = httpGremlinEndpointHandler;
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/325499c7/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerHttpIntegrateTest.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerHttpIntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerHttpIntegrateTest.java
index ec878de..820247e 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerHttpIntegrateTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerHttpIntegrateTest.java
@@ -307,24 +307,6 @@ public class GremlinServerHttpIntegrateTest extends AbstractGremlinServerIntegra
}
@Test
- @Deprecated
- public void should200OnPOSTWithAuthorizationHeaderOld() throws Exception {
- final CloseableHttpClient httpclient = HttpClients.createDefault();
- final HttpPost httppost = new HttpPost(TestClientFactory.createURLString());
- httppost.addHeader("Content-Type", "application/json");
- httppost.addHeader("Authorization", "Basic " + encoder.encodeToString("stephen:password".getBytes()));
- httppost.setEntity(new StringEntity("{\"gremlin\":\"1-1\"}", Consts.UTF_8));
-
- try (final CloseableHttpResponse response = httpclient.execute(httppost)) {
- assertEquals(200, response.getStatusLine().getStatusCode());
- assertEquals("application/json", response.getEntity().getContentType().getValue());
- final String json = EntityUtils.toString(response.getEntity());
- final JsonNode node = mapper.readTree(json);
- assertEquals(0, node.get("result").get("data").get(0).intValue());
- }
- }
-
- @Test
public void should200OnGETWithGremlinQueryStringArgumentWithBindingsAndFunction() throws Exception {
final CloseableHttpClient httpclient = HttpClients.createDefault();
final HttpGet httpget = new HttpGet(TestClientFactory.createURLString("?gremlin=addItUp(Integer.parseInt(x),Integer.parseInt(y))&bindings.x=10&bindings.y=10"));
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/325499c7/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/channel/AbstractGremlminServerChannelizerIntegrateTest.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/channel/AbstractGremlminServerChannelizerIntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/channel/AbstractGremlminServerChannelizerIntegrateTest.java
index 738ca89..e018e9c 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/channel/AbstractGremlminServerChannelizerIntegrateTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/channel/AbstractGremlminServerChannelizerIntegrateTest.java
@@ -285,7 +285,7 @@ abstract class AbstractGremlinServerChannelizerIntegrateTest extends AbstractGre
assertEquals("application/json", response.getEntity().getContentType().getValue());
final String json = EntityUtils.toString(response.getEntity());
final JsonNode node = mapper.readTree(json);
- assertEquals(result, node.get("result").get("data").get(0).intValue());
+ assertEquals(result, node.get("result").get("data").get(0).get("@value").intValue());
}
}
if (wsBuilder != null) {