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/02/27 12:02:11 UTC

[03/27] tinkerpop git commit: Fixed problem with non-lowercase hostname

Fixed problem with non-lowercase hostname


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/d2639a7a
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/d2639a7a
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/d2639a7a

Branch: refs/heads/master
Commit: d2639a7a4c239ceab80b2085ff01983db2e58441
Parents: 36713cf
Author: HadoopMarc <vt...@xs4all.nl>
Authored: Sat Dec 3 16:41:47 2016 +0100
Committer: HadoopMarc <vt...@xs4all.nl>
Committed: Wed Jan 18 19:58:48 2017 +0100

----------------------------------------------------------------------
 .../apache/kerby/kerberos/kerb/server/KdcTestBase.java |  7 ++++---
 .../apache/tinkerpop/gremlin/server/AuthKrb5Test.java  | 13 +++----------
 2 files changed, 7 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d2639a7a/gremlin-server/src/test/java/org/apache/kerby/kerberos/kerb/server/KdcTestBase.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/test/java/org/apache/kerby/kerberos/kerb/server/KdcTestBase.java b/gremlin-server/src/test/java/org/apache/kerby/kerberos/kerb/server/KdcTestBase.java
index d50f420..c8f8255 100644
--- a/gremlin-server/src/test/java/org/apache/kerby/kerberos/kerb/server/KdcTestBase.java
+++ b/gremlin-server/src/test/java/org/apache/kerby/kerberos/kerb/server/KdcTestBase.java
@@ -40,7 +40,7 @@ public abstract class KdcTestBase {
     private static final Logger logger = LoggerFactory.getLogger(KdcTestBase.class);
 
     private static File testDir;
-    private static String hostname;
+    protected static String hostname;
     private static final String clientPassword = "123456";
     private static final String clientPrincipalName = "drankye";
     private static final String clientPrincipal = clientPrincipalName + "@" + TestKdcServer.KDC_REALM;
@@ -51,9 +51,10 @@ public abstract class KdcTestBase {
 
     KdcTestBase() {
         // Hostname setting must be consistent with the way gremlin-console sets gremlin-server's hostname
-        // and derives gremlin-server's principal name
+        // and derives gremlin-server's principal name. Also, the hostname needs to be lowercase for use
+        // in principal names.
         try {
-            hostname = Inet4Address.getLocalHost().getCanonicalHostName();
+            hostname = Inet4Address.getLocalHost().getCanonicalHostName().toLowerCase();
             serverPrincipal = serverPrincipalName + "/" + hostname + "@" + TestKdcServer.KDC_REALM;
         } catch (UnknownHostException e) {
             logger.error("Hostname not found");

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d2639a7a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/AuthKrb5Test.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/AuthKrb5Test.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/AuthKrb5Test.java
index 298957c..6615318 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/AuthKrb5Test.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/AuthKrb5Test.java
@@ -53,7 +53,6 @@ import static org.junit.Assert.fail;
 public class AuthKrb5Test extends LoginTestBase {
     private static final Logger logger = LoggerFactory.getLogger(AuthKrb5Test.class);
     private GremlinServerAuthKrb5Integrate server;
-    private String serverHostname = null;
     private static final String TESTCONSOLE = "GremlinConsole";
 
     @Rule
@@ -70,12 +69,7 @@ public class AuthKrb5Test extends LoginTestBase {
         @Override
         public Settings overrideSettings(final Settings settings) {
             logger.debug("Testname: " + nameOfTest);
-            try {              // See hostname setting in KdcTestBase
-                serverHostname = Inet4Address.getLocalHost().getCanonicalHostName();
-                settings.host = serverHostname;
-            } catch(Exception e) {
-                logger.error("Hostname not found");
-            }
+            settings.host = hostname;
             logger.debug("Hostname: " + settings.host);
             final Settings.AuthenticationSettings authSettings = new Settings.AuthenticationSettings();
             authSettings.className = Krb5Authenticator.class.getName();
@@ -129,9 +123,8 @@ public class AuthKrb5Test extends LoginTestBase {
     public void shouldAuthenticate() throws Exception {
         File f = new File(".");
         logger.debug("Working dir: " + f.getCanonicalPath());
-        // ToDo: try TestClientFactory
-        final Cluster cluster = Cluster.build().jaasEntry(TESTCONSOLE)
-            .protocol("test-service").addContactPoint(serverHostname).port(45940).enableSsl(false).create();
+        final Cluster cluster = TestClientFactory.build().jaasEntry(TESTCONSOLE)
+            .protocol("test-service").addContactPoint(hostname).enableSsl(false).create();
         final Client client = cluster.connect();
         try {
             assertEquals(2, client.submit("1+1").all().get().get(0).getInt());