Merge branch 'tp32' into tp33 Conflicts: gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/fa7a7f61 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/fa7a7f61 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/fa7a7f61 Branch: refs/heads/TINKERPOP-1878 Commit: fa7a7f61308acc675e4a4c4a6dc863cf9818c3f9 Parents: 2cf551f 37476a2 Author: Stephen Mallette <sp...@genoprime.com> Authored: Tue Aug 7 12:08:39 2018 -0400 Committer: Stephen Mallette <sp...@genoprime.com> Committed: Tue Aug 7 12:08:39 2018 -0400 ---------------------------------------------------------------------- CHANGELOG.asciidoc | 1 + .../driver/message/ResponseStatusCode.java | 7 + .../driver/message/ResponseStatusCodeTest.java | 36 +++++ .../gremlin/server/ResponseHandlerContext.java | 85 +++++++++++ .../server/op/AbstractEvalOpProcessor.java | 38 ++++- .../gremlin/server/op/AbstractOpProcessor.java | 34 ++++- .../AbstractGremlinServerIntegrationTest.java | 20 ++- .../server/GremlinServerIntegrateTest.java | 51 +++++++ .../server/ResponseHandlerContextTest.java | 143 +++++++++++++++++++ .../server/op/AbstractEvalOpProcessorTest.java | 62 ++++++++ .../server/op/AbstractOpProcessorTest.java | 73 ++++++++++ 11 files changed, 535 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fa7a7f61/CHANGELOG.asciidoc ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fa7a7f61/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java ---------------------------------------------------------------------- diff --cc gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java index 74e9478,ca1ee53..dbf7a44 --- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java +++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java @@@ -242,14 -287,9 +266,14 @@@ public abstract class AbstractEvalOpPro final Iterator itty = IteratorUtils.asIterator(o); logger.debug("Preparing to iterate results from - {} - in thread [{}]", msg, Thread.currentThread().getName()); + if (settings.authentication.enableAuditLog) { + String address = context.getChannelHandlerContext().channel().remoteAddress().toString(); + if (address.startsWith("/") && address.length() > 1) address = address.substring(1); + auditLogger.info("User with address {} requested: {}", address, script); + } try { - handleIterator(context, itty); + handleIterator(rhc, itty); } catch (Exception ex) { if (managedTransactionsForRequest) attemptRollback(msg, context.getGraphManager(), settings.strictTransactionManagement); @@@ -271,9 -311,16 +295,9 @@@ // occurs when the TimedInterruptCustomizerProvider is in play final String errorMessage = String.format("A timeout occurred within the script during evaluation of [%s] - consider increasing the limit given to TimedInterruptCustomizerProvider", msg); logger.warn(errorMessage); - ctx.writeAndFlush(ResponseMessage.build(msg).code(ResponseStatusCode.SERVER_ERROR_TIMEOUT) + rhc.writeAndFlush(ResponseMessage.build(msg).code(ResponseStatusCode.SERVER_ERROR_TIMEOUT) .statusMessage("Timeout during script evaluation triggered by TimedInterruptCustomizerProvider") .statusAttributeException(t).create()); - } else if (t instanceof org.apache.tinkerpop.gremlin.groovy.jsr223.TimedInterruptTimeoutException) { - // occurs when the TimedInterruptCustomizerProvider is in play - final String errorMessage = String.format("A timeout occurred within the script during evaluation of [%s] - consider increasing the limit given to TimedInterruptCustomizerProvider", msg); - logger.warn(errorMessage); - rhc.writeAndFlush(ResponseMessage.build(msg).code(ResponseStatusCode.SERVER_ERROR_TIMEOUT) - .statusMessage("Timeout during script evaluation triggered by TimedInterruptCustomizerProvider") - .statusAttributeException(t).create()); } else if (t instanceof TimeoutException) { final String errorMessage = String.format("Script evaluation exceeded the configured threshold for request [%s]", msg); logger.warn(errorMessage, t); http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fa7a7f61/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java ---------------------------------------------------------------------- diff --cc gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java index a1689e9,eb5def9..67ad021 --- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java +++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java @@@ -71,7 -74,9 +72,8 @@@ import org.junit.Test import java.lang.reflect.Field; import java.nio.channels.ClosedChannelException; import java.util.ArrayList; -import java.util.Collections; import java.util.HashMap; + import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set;