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 2020/12/24 13:02:55 UTC
[tinkerpop] branch master updated (16266fa -> 61f7b8c)
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git.
from 16266fa Bumped to Groovy 3.0.7 CTR
add bc99bf0 Adds the squashed work on the authorization feature until 2020-11-09
add 221dc34 Fixes the issues caused and discovered due to rebasing
add 5a25f01 Fixes minor oversights
add f92e764 Fixes issue with and adds test for authorization with http transport
add ea40044 Fixes audit logging for unauthorized http request
add 779430b Adds code and test for VertexProgramDenyStrategy
add d41ede2 Adds documentation on the application of TraversalStrategy instances
add d9140c2 Refactors the Authorizer interface and all classes associated with it
add 786207f Adds true-false-true test to GremlinServerAuthzIntegrateTest
add f4d7bb4 Fixes issues regarding Authorizer usage with AlowAllAuthenticator
add 2f95b1b Extends AllowListAuthorizer with checks on mutations and SubgraphStrategy alterations
add 41e2257 Does some more refinement on the AllowListAuthorizer and related documentation
add 39db2b6 Adds sessioned string requests to GremlinServerAuthzIntegrateTest
add 26d916f Makes HttpBasicAuthorizationHandler consistent with HttpGremlinEndpointhandler
add f2c578d Corrects https://tinkerpop.apache.org/docs/current/ref* links in the asciidoc as requested in review
add d5317d3 Reconstructs incomplete paragraph in new doc section
new 61f7b8c Merge branch 'pr-1308'
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
CHANGELOG.asciidoc | 6 +-
docs/src/dev/provider/index.asciidoc | 46 +-
docs/src/index.asciidoc | 2 +-
docs/src/recipes/centrality.asciidoc | 6 +-
docs/src/recipes/collections.asciidoc | 2 +-
docs/src/recipes/recommendation.asciidoc | 2 +-
docs/src/reference/gremlin-applications.asciidoc | 757 +++++++++++++++------
docs/src/reference/the-traversal.asciidoc | 50 +-
docs/src/upgrade/release-3.5.x.asciidoc | 5 +
.../tinkerpop/gremlin/jsr223/CoreImports.java | 5 +-
.../VertexProgramRestrictionStrategy.java | 58 ++
.../process/traversal/util/BytecodeHelper.java | 2 +-
.../VertexProgramRestrictionStrategyTest.java | 75 ++
gremlin-server/data/README.asciidoc | 6 +-
gremlin-server/data/credentials.kryo | Bin 138 -> 411 bytes
.../gremlin/server/AbstractChannelizer.java | 32 +-
.../apache/tinkerpop/gremlin/server/Settings.java | 42 +-
.../server/authz/AuthorizationException.java | 47 ++
.../tinkerpop/gremlin/server/authz/Authorizer.java | 62 ++
.../gremlin/server/channel/HttpChannelizer.java | 22 +-
.../server/channel/WebSocketChannelizer.java | 22 +-
.../handler/HttpBasicAuthenticationHandler.java | 15 +-
.../handler/HttpBasicAuthorizationHandler.java | 110 +++
.../server/handler/HttpGremlinEndpointHandler.java | 192 +-----
.../gremlin/server/handler/HttpHandlerUtil.java | 204 ++++++
.../SaslAndHttpBasicAuthenticationHandler.java | 7 +-
.../server/handler/SaslAuthenticationHandler.java | 11 +-
.../tinkerpop/gremlin/server/handler/StateKey.java | 6 +
.../handler/WebSocketAuthorizationHandler.java | 109 +++
.../gremlin/server/op/AbstractEvalOpProcessor.java | 13 +-
.../server/op/traversal/TraversalOpProcessor.java | 10 +
...mlinServerAuditLogDeprecatedIntegrateTest.java} | 65 +-
.../server/GremlinServerAuditLogIntegrateTest.java | 65 +-
.../server/GremlinServerAuthIntegrateTest.java | 2 +-
.../server/GremlinServerAuthzIntegrateTest.java | 386 +++++++++++
.../server/GremlinServerHttpIntegrateTest.java | 6 +-
.../tinkerpop/gremlin/server/authz/AllowList.java | 70 ++
.../gremlin/server/authz/AllowListAuthorizer.java | 152 +++++
.../gremlin/server/authz/AuthorizerTest.java | 278 ++++++++
.../gremlin/server/allow-list-http-anonymous.yaml | 24 +
.../tinkerpop/gremlin/server/allow-list.yaml | 32 +
41 files changed, 2484 insertions(+), 522 deletions(-)
create mode 100644 gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/strategy/verification/VertexProgramRestrictionStrategy.java
create mode 100644 gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/computer/traversal/strategy/verifcation/VertexProgramRestrictionStrategyTest.java
create mode 100644 gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/authz/AuthorizationException.java
create mode 100644 gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/authz/Authorizer.java
create mode 100644 gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/HttpBasicAuthorizationHandler.java
create mode 100644 gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/HttpHandlerUtil.java
create mode 100644 gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/WebSocketAuthorizationHandler.java
copy gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/{GremlinServerAuditLogIntegrateTest.java => GremlinServerAuditLogDeprecatedIntegrateTest.java} (91%)
create mode 100644 gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuthzIntegrateTest.java
create mode 100644 gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/authz/AllowList.java
create mode 100644 gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/authz/AllowListAuthorizer.java
create mode 100644 gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/authz/AuthorizerTest.java
create mode 100644 gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/server/allow-list-http-anonymous.yaml
create mode 100644 gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/server/allow-list.yaml
[tinkerpop] 01/01: Merge branch 'pr-1308'
Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit 61f7b8c08ac6a1232b460e100b3ff7c91ab4142d
Merge: 16266fa d5317d3
Author: Stephen Mallette <st...@amazon.com>
AuthorDate: Thu Dec 24 07:39:42 2020 -0500
Merge branch 'pr-1308'
CHANGELOG.asciidoc | 6 +-
docs/src/dev/provider/index.asciidoc | 46 +-
docs/src/index.asciidoc | 2 +-
docs/src/recipes/centrality.asciidoc | 6 +-
docs/src/recipes/collections.asciidoc | 2 +-
docs/src/recipes/recommendation.asciidoc | 2 +-
docs/src/reference/gremlin-applications.asciidoc | 757 +++++++++++++++------
docs/src/reference/the-traversal.asciidoc | 50 +-
docs/src/upgrade/release-3.5.x.asciidoc | 5 +
.../tinkerpop/gremlin/jsr223/CoreImports.java | 5 +-
.../VertexProgramRestrictionStrategy.java | 58 ++
.../process/traversal/util/BytecodeHelper.java | 2 +-
.../VertexProgramRestrictionStrategyTest.java | 75 ++
gremlin-server/data/README.asciidoc | 6 +-
gremlin-server/data/credentials.kryo | Bin 138 -> 411 bytes
.../gremlin/server/AbstractChannelizer.java | 32 +-
.../apache/tinkerpop/gremlin/server/Settings.java | 42 +-
.../server/authz/AuthorizationException.java | 47 ++
.../tinkerpop/gremlin/server/authz/Authorizer.java | 62 ++
.../gremlin/server/channel/HttpChannelizer.java | 22 +-
.../server/channel/WebSocketChannelizer.java | 22 +-
.../handler/HttpBasicAuthenticationHandler.java | 15 +-
.../handler/HttpBasicAuthorizationHandler.java | 110 +++
.../server/handler/HttpGremlinEndpointHandler.java | 192 +-----
.../gremlin/server/handler/HttpHandlerUtil.java | 204 ++++++
.../SaslAndHttpBasicAuthenticationHandler.java | 7 +-
.../server/handler/SaslAuthenticationHandler.java | 11 +-
.../tinkerpop/gremlin/server/handler/StateKey.java | 6 +
.../handler/WebSocketAuthorizationHandler.java | 109 +++
.../gremlin/server/op/AbstractEvalOpProcessor.java | 13 +-
.../server/op/traversal/TraversalOpProcessor.java | 10 +
...mlinServerAuditLogDeprecatedIntegrateTest.java} | 65 +-
.../server/GremlinServerAuditLogIntegrateTest.java | 65 +-
.../server/GremlinServerAuthIntegrateTest.java | 2 +-
.../server/GremlinServerAuthzIntegrateTest.java | 386 +++++++++++
.../server/GremlinServerHttpIntegrateTest.java | 6 +-
.../tinkerpop/gremlin/server/authz/AllowList.java | 70 ++
.../gremlin/server/authz/AllowListAuthorizer.java | 152 +++++
.../gremlin/server/authz/AuthorizerTest.java | 278 ++++++++
.../gremlin/server/allow-list-http-anonymous.yaml | 24 +
.../tinkerpop/gremlin/server/allow-list.yaml | 32 +
41 files changed, 2484 insertions(+), 522 deletions(-)
diff --cc gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuditLogIntegrateTest.java
index c058ac4,1955fa0..8b18793
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuditLogIntegrateTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuditLogIntegrateTest.java
@@@ -294,9 -298,9 +298,9 @@@ public class GremlinServerAuditLogInteg
.filter(event -> event.getMessage().toString().contains(simpleAuthenticatorName)).iterator().next();
final String authMsg = authEvent.getMessage().toString();
assertTrue(authEvent.getLevel() == INFO &&
- authMsg.matches(String.format("User %s with address .*? authenticated by %s", "stephen", simpleAuthenticatorName)));
+ authMsg.matches(String.format("User stephen with address .+? authenticated by %s", simpleAuthenticatorName)));
assertTrue(log.stream().anyMatch(item -> item.getLevel() == INFO &&
- item.getMessage().toString().matches("User with address .*? requested: 2-1")));
- item.getMessage().toString().matches("User stephen with address .+? requested: 1-1")));
++ item.getMessage().toString().matches("User stephen with address .+? requested: 2-1")));
}
@Test