You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ha...@apache.org on 2015/03/18 06:35:33 UTC

directory-kerby git commit: Adding kdc test based on json backend.

Repository: directory-kerby
Updated Branches:
  refs/heads/master 2f6684929 -> 4bb6a7c80


Adding kdc test based on json backend.


Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/4bb6a7c8
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/4bb6a7c8
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/4bb6a7c8

Branch: refs/heads/master
Commit: 4bb6a7c80f4057d8165afd1318d9db51d20fa989
Parents: 2f66849
Author: hazel <li...@foxmail.com>
Authored: Wed Mar 18 13:35:26 2015 +0800
Committer: hazel <li...@foxmail.com>
Committed: Wed Mar 18 13:35:26 2015 +0800

----------------------------------------------------------------------
 kerby-kerb/kerb-kdc-test/pom.xml                |  5 ++
 .../kerb/server/JsonBackendKdcTest.java         | 53 ++++++++++++++++++++
 .../kerby/kerberos/kerb/server/KdcTest.java     |  5 +-
 .../kerby/kerberos/kerb/server/KdcTestBase.java | 13 +++--
 .../kerberos/kerb/server/TestKdcServer.java     |  9 +++-
 .../kerby/kerberos/kerb/server/KdcServer.java   |  4 ++
 6 files changed, 81 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/4bb6a7c8/kerby-kerb/kerb-kdc-test/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-kdc-test/pom.xml b/kerby-kerb/kerb-kdc-test/pom.xml
index 905337b..f9c0752 100644
--- a/kerby-kerb/kerb-kdc-test/pom.xml
+++ b/kerby-kerb/kerb-kdc-test/pom.xml
@@ -57,5 +57,10 @@
       <artifactId>kerby-pkix</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.apache.kerby</groupId>
+      <artifactId>Json-identity-backend</artifactId>
+      <version>${project.version}</version>
+    </dependency>
   </dependencies>
 </project>

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/4bb6a7c8/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/JsonBackendKdcTest.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/JsonBackendKdcTest.java b/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/JsonBackendKdcTest.java
new file mode 100644
index 0000000..87016ee
--- /dev/null
+++ b/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/JsonBackendKdcTest.java
@@ -0,0 +1,53 @@
+/**
+ *  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.
+ *
+ */
+package org.apache.kerby.kerberos.kerb.server;
+
+import org.apache.kerby.config.Conf;
+import org.apache.kerby.config.Config;
+import org.apache.kerby.kerberos.kdc.identitybackend.JsonIdentityBackend;
+import org.apache.kerby.kerberos.kerb.identity.backend.IdentityBackend;
+import org.junit.Test;
+
+import java.io.File;
+
+public class JsonBackendKdcTest extends KdcTest{
+
+    @Override
+    protected void setUpKdcServer() throws Exception {
+        super.setUpKdcServer();
+
+        File testDir = new File(System.getProperty("test.dir", "target"));
+        String jsonBackendFileString = new File(testDir, "json-identity-backend-file").getAbsolutePath();
+
+        Config backendConfig = new Conf();
+        backendConfig.setString(JsonIdentityBackend.JSON_IDENTITY_BACKEND_FILE, jsonBackendFileString);
+
+        IdentityBackend backend = new JsonIdentityBackend(backendConfig);
+        backend.initialize();
+
+        kdcServer.setBackend(backend);
+    }
+
+    @Test
+    public void testKdc() throws Exception {
+        performKdcTest();
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/4bb6a7c8/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/KdcTest.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/KdcTest.java b/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/KdcTest.java
index e9166cf..c63eb20 100644
--- a/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/KdcTest.java
+++ b/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/KdcTest.java
@@ -22,7 +22,6 @@ package org.apache.kerby.kerberos.kerb.server;
 import org.apache.kerby.kerberos.kerb.spec.ticket.ServiceTicket;
 import org.apache.kerby.kerberos.kerb.spec.ticket.TgtTicket;
 import org.junit.Assert;
-import org.junit.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -31,8 +30,8 @@ public abstract class KdcTest extends KdcTestBase {
     private String password = "123456";
 
     @Override
-    protected void setUpKdcServer() throws Exception {
-        super.setUpKdcServer();
+    protected void createPrincipals() {
+        super.createPrincipals();
         kdcServer.createPrincipal(clientPrincipal, password);
     }
 

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/4bb6a7c8/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/KdcTestBase.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/KdcTestBase.java b/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/KdcTestBase.java
index 900b7f4..a4c6235 100644
--- a/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/KdcTestBase.java
+++ b/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/KdcTestBase.java
@@ -19,13 +19,13 @@
  */
 package org.apache.kerby.kerberos.kerb.server;
 
-import java.io.IOException;
-import java.net.ServerSocket;
-
 import org.apache.kerby.kerberos.kerb.client.KrbClient;
 import org.junit.After;
 import org.junit.Before;
 
+import java.io.IOException;
+import java.net.ServerSocket;
+
 public abstract class KdcTestBase {
 
     protected String kdcRealm;
@@ -53,6 +53,7 @@ public abstract class KdcTestBase {
 
         setUpKdcServer();
         setUpClient();
+        createPrincipals();
     }
 
     protected void setUpKdcServer() throws Exception {
@@ -72,7 +73,6 @@ public abstract class KdcTestBase {
         clientPrincipal = "drankye@" + kdcRealm;
 
         serverPrincipal = "test-service/localhost@" + kdcRealm;
-        kdcServer.createPrincipals(serverPrincipal);
     }
 
     protected void setUpClient() throws Exception {
@@ -91,6 +91,11 @@ public abstract class KdcTestBase {
         krbClnt.setKdcRealm(kdcServer.getKdcRealm());
     }
 
+    protected void createPrincipals() {
+        kdcServer.createKrbtgtPrincipal();
+        kdcServer.createPrincipals(serverPrincipal);
+    }
+
     /**
      * Get a server socket point for testing usage, either TCP or UDP.
      * @return server socket point

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/4bb6a7c8/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/TestKdcServer.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/TestKdcServer.java b/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/TestKdcServer.java
index 5540f4a..e394524 100644
--- a/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/TestKdcServer.java
+++ b/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/TestKdcServer.java
@@ -22,6 +22,7 @@ package org.apache.kerby.kerberos.kerb.server;
 import org.apache.kerby.kerberos.kerb.KrbException;
 import org.apache.kerby.kerberos.kerb.common.EncryptionUtil;
 import org.apache.kerby.kerberos.kerb.identity.KrbIdentity;
+import org.apache.kerby.kerberos.kerb.identity.backend.IdentityBackend;
 import org.apache.kerby.kerberos.kerb.keytab.Keytab;
 import org.apache.kerby.kerberos.kerb.keytab.KeytabEntry;
 import org.apache.kerby.kerberos.kerb.spec.KerberosTime;
@@ -32,7 +33,6 @@ import org.apache.kerby.kerberos.kerb.spec.common.PrincipalName;
 import java.io.File;
 import java.io.IOException;
 import java.util.List;
-import java.util.Properties;
 import java.util.UUID;
 
 public class TestKdcServer extends SimpleKdcServer {
@@ -54,7 +54,9 @@ public class TestKdcServer extends SimpleKdcServer {
         super.init();
 
         prepareKdcConfig();
+    }
 
+    public void createKrbtgtPrincipal() {
         createPrincipals("krbtgt");
     }
 
@@ -75,6 +77,11 @@ public class TestKdcServer extends SimpleKdcServer {
         getIdentityService().addIdentity(identity);
     }
 
+    public void setBackend(IdentityBackend backend) {
+        super.setBackend(backend);
+    }
+
+
     public void createPrincipals(String ... principals) {
         String passwd;
         for (String principal : principals) {

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/4bb6a7c8/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/KdcServer.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/KdcServer.java b/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/KdcServer.java
index 8f8107e..c29a22b 100644
--- a/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/KdcServer.java
+++ b/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/KdcServer.java
@@ -308,4 +308,8 @@ public class KdcServer {
         }
         return kdcConfig.getKdcServiceName();
     }
+
+    protected void setBackend(IdentityBackend backend) {
+        this.backend = backend;
+    }
 }