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 2019/07/09 14:23:43 UTC
[tinkerpop] 01/03: Bumped to latest kerby for kerberos testing CTR
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 582b20b6869136c32bee8ad9bdf95bef71c89247
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Tue Jul 9 10:22:22 2019 -0400
Bumped to latest kerby for kerberos testing CTR
---
gremlin-server/pom.xml | 2 +-
.../apache/tinkerpop/gremlin/server/KdcFixture.java | 2 +-
.../apache/tinkerpop/gremlin/server/backend.conf | 19 -------------------
.../gremlin/server/gremlin-console-jaas.conf | 4 ++--
.../org/apache/tinkerpop/gremlin/server/kdc.conf | 21 ---------------------
5 files changed, 4 insertions(+), 44 deletions(-)
diff --git a/gremlin-server/pom.xml b/gremlin-server/pom.xml
index 0218a68..4ab6a15 100644
--- a/gremlin-server/pom.xml
+++ b/gremlin-server/pom.xml
@@ -103,7 +103,7 @@ limitations under the License.
<dependency>
<groupId>org.apache.kerby</groupId>
<artifactId>kerb-simplekdc</artifactId>
- <version>1.0.0</version>
+ <version>2.0.0</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/KdcFixture.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/KdcFixture.java
index 29eaf8d..0234e24 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/KdcFixture.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/KdcFixture.java
@@ -93,7 +93,7 @@ public class KdcFixture {
private File createTestDir() {
final String basedir = System.getProperty("basedir");
final File targetdir = new File(basedir, "target");
- final File testDir = new File(targetdir, "tmp");
+ final File testDir = new File(targetdir, "kdc");
testDir.mkdirs();
return testDir;
}
diff --git a/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/server/backend.conf b/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/server/backend.conf
deleted file mode 100644
index db1e075..0000000
--- a/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/server/backend.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-kdc_identity_backend = org.apache.kerby.kerberos.kerb.identity.backend.MemoryIdentityBackend
diff --git a/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/server/gremlin-console-jaas.conf b/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/server/gremlin-console-jaas.conf
index b467ab7..ec852b6 100644
--- a/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/server/gremlin-console-jaas.conf
+++ b/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/server/gremlin-console-jaas.conf
@@ -21,7 +21,7 @@ GremlinConsole {
com.sun.security.auth.module.Krb5LoginModule required
doNotPrompt=true
useTicketCache=true
- ticketCache="target/tmp/test-tkt.cc";
+ ticketCache="target/kdc/test-tkt.cc";
};
@@ -37,5 +37,5 @@ GremlinConsole2 {
com.sun.security.auth.module.Krb5LoginModule required
doNotPrompt=true
useTicketCache=true
- ticketCache="target/tmp/test-tkt2.cc";
+ ticketCache="target/kdc/test-tkt2.cc";
};
diff --git a/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/server/kdc.conf b/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/server/kdc.conf
deleted file mode 100644
index 313cda7..0000000
--- a/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/server/kdc.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-[kdcdefaults]
- kdc_tcp_port = 34455
- kdc_realm = EXAMPLE.COM