You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by dr...@apache.org on 2015/07/04 06:50:03 UTC
directory-kerby git commit: DIRKRB-323 Added more GSS tests;
consolidated related codes; use ticket cache and keytab to login
Repository: directory-kerby
Updated Branches:
refs/heads/master d3e4ebcf4 -> d3c8272d2
DIRKRB-323 Added more GSS tests; consolidated related codes; use ticket cache and keytab to login
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/d3c8272d
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/d3c8272d
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/d3c8272d
Branch: refs/heads/master
Commit: d3c8272d2a9307252bb3666b68f16de258b32bb3
Parents: d3e4ebc
Author: drankye <ka...@intel.com>
Authored: Sat Jul 4 12:49:45 2015 +0800
Committer: Drankye <dr...@gmail.com>
Committed: Sat Jul 4 12:49:45 2015 +0800
----------------------------------------------------------------------
.../kerby/kerberos/kdc/GssInteropTestBase.java | 180 +------------------
.../kerby/kerberos/kdc/GssTcpInteropTest.java | 15 ++
.../kerby/kerberos/kdc/GssUdpInteropTest.java | 7 +
.../apache/kerby/kerberos/kdc/KerbyKdcTest.java | 2 +-
.../kerberos/kerb/server/GssInteropTest.java | 69 ++-----
.../kerberos/kerb/server/GssTcpInteropTest.java | 36 ++++
.../kerberos/kerb/server/GssUdpInteropTest.java | 36 ++++
.../kerby/kerberos/kerb/server/KdcTestBase.java | 4 +
.../kerberos/kerb/server/LoginTestBase.java | 7 +-
.../kerberos/kerb/server/SimpleKdcServer.java | 10 ++
10 files changed, 134 insertions(+), 232 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/d3c8272d/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/GssInteropTestBase.java
----------------------------------------------------------------------
diff --git a/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/GssInteropTestBase.java b/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/GssInteropTestBase.java
index fe23cf6..1741086 100644
--- a/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/GssInteropTestBase.java
+++ b/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/GssInteropTestBase.java
@@ -19,183 +19,19 @@
*/
package org.apache.kerby.kerberos.kdc;
+import org.apache.kerby.kerberos.kdc.impl.NettyKdcServerImpl;
import org.apache.kerby.kerberos.kerb.KrbException;
-import org.apache.kerby.kerberos.kerb.client.JaasKrbUtil;
-import org.apache.kerby.kerberos.kerb.server.KdcTestBase;
-import org.ietf.jgss.*;
-import org.junit.Assert;
-import org.junit.Test;
-
-import javax.security.auth.Subject;
-import javax.security.auth.callback.Callback;
-import javax.security.auth.callback.CallbackHandler;
-import javax.security.auth.callback.PasswordCallback;
-import javax.security.auth.callback.UnsupportedCallbackException;
-import javax.security.auth.kerberos.KerberosTicket;
-import java.io.IOException;
-import java.security.Principal;
-import java.security.PrivilegedExceptionAction;
-import java.util.Set;
+import org.apache.kerby.kerberos.kerb.server.GssInteropTest;
/**
* This is an interop test using the Java GSS APIs against the Kerby KDC
*/
-public abstract class GssInteropTestBase extends KdcTestBase {
- @Override
- protected void createPrincipals() throws KrbException {
- getKdcServer().createPrincipal(getClientPrincipal(), getClientPassword());
- getKdcServer().createPrincipal(getServerPrincipal(), getServerPassword());
- }
-
- private String getServerPassword() {
- return getClientPassword(); // Reuse the same password
- }
-
- @Test
- public void testKdc() throws Exception {
- Subject clientSubject = JaasKrbUtil.loginUsingPassword(
- getClientPrincipal(), getClientPassword());
-
- Set<Principal> clientPrincipals = clientSubject.getPrincipals();
- Assert.assertFalse(clientPrincipals.isEmpty());
-
- // Get the TGT
- Set<KerberosTicket> privateCredentials =
- clientSubject.getPrivateCredentials(KerberosTicket.class);
- Assert.assertFalse(privateCredentials.isEmpty());
- KerberosTicket tgt = privateCredentials.iterator().next();
- Assert.assertNotNull(tgt);
-
- // Get the service ticket
- KerberosClientExceptionAction action =
- new KerberosClientExceptionAction(clientPrincipals.iterator().next(),
- getServerPrincipal());
-
- byte[] kerberosToken = (byte[]) Subject.doAs(clientSubject, action);
- Assert.assertNotNull(kerberosToken);
-
- validateServiceTicket(kerberosToken);
- }
-
- private void validateServiceTicket(byte[] ticket) throws Exception {
- Subject serviceSubject = JaasKrbUtil.loginUsingPassword(
- getServerPrincipal(), getClientPassword());
-
- Set<Principal> servicePrincipals = serviceSubject.getPrincipals();
- Assert.assertFalse(servicePrincipals.isEmpty());
-
- // Handle the service ticket
- KerberosServiceExceptionAction serviceAction =
- new KerberosServiceExceptionAction(ticket, getServerPrincipal());
-
- Subject.doAs(serviceSubject, serviceAction);
- }
-
- private class KerberosCallbackHandler implements CallbackHandler {
-
- public void handle(Callback[] callbacks) throws IOException,
- UnsupportedCallbackException {
- for (int i = 0; i < callbacks.length; i++) {
- if (callbacks[i] instanceof PasswordCallback) {
- PasswordCallback pc = (PasswordCallback) callbacks[i];
- if (pc.getPrompt().contains(getClientPrincipalName())) {
- pc.setPassword(getClientPassword().toCharArray());
- break;
- } else if (pc.getPrompt().contains(getServerPrincipalName())) {
- pc.setPassword(getClientPassword().toCharArray());
- break;
- }
- }
- }
- }
- }
-
- /**
- * This class represents a PrivilegedExceptionAction implementation to
- * obtain a service ticket from a Kerberos Key Distribution Center.
- */
- private static class KerberosClientExceptionAction
- implements PrivilegedExceptionAction<byte[]> {
-
- private static final String JGSS_KERBEROS_TICKET_OID = "1.2.840.113554.1.2.2";
-
- private Principal clientPrincipal;
- private String serviceName;
-
- public KerberosClientExceptionAction(Principal clientPrincipal,
- String serviceName) {
- this.clientPrincipal = clientPrincipal;
- this.serviceName = serviceName;
- }
-
- public byte[] run() throws GSSException {
- GSSManager gssManager = GSSManager.getInstance();
-
- GSSName gssService = gssManager.createName(serviceName,
- GSSName.NT_USER_NAME);
- Oid oid = new Oid(JGSS_KERBEROS_TICKET_OID);
- GSSName gssClient = gssManager.createName(clientPrincipal.getName(),
- GSSName.NT_USER_NAME);
- GSSCredential credentials =
- gssManager.createCredential(
- gssClient, GSSCredential.DEFAULT_LIFETIME, oid,
- GSSCredential.INITIATE_ONLY
- );
-
- GSSContext secContext =
- gssManager.createContext(
- gssService, oid, credentials, GSSContext.DEFAULT_LIFETIME
- );
-
- secContext.requestMutualAuth(false);
- secContext.requestCredDeleg(false);
-
- try {
- byte[] token = new byte[0];
- byte[] returnedToken = secContext.initSecContext(token, 0, token.length);
-
- return returnedToken;
- } finally {
- secContext.dispose();
- }
- }
- }
-
- private static class KerberosServiceExceptionAction
- implements PrivilegedExceptionAction<byte[]> {
-
- private static final String JGSS_KERBEROS_TICKET_OID = "1.2.840.113554.1.2.2";
-
- private byte[] ticket;
- private String serviceName;
-
- public KerberosServiceExceptionAction(byte[] ticket, String serviceName) {
- this.ticket = ticket;
- this.serviceName = serviceName;
- }
-
- public byte[] run() throws GSSException {
- GSSManager gssManager = GSSManager.getInstance();
- GSSContext secContext;
- GSSName gssService = gssManager.createName(serviceName,
- GSSName.NT_USER_NAME);
-
- Oid oid = new Oid(JGSS_KERBEROS_TICKET_OID);
- GSSCredential credentials =
- gssManager.createCredential(
- gssService, GSSCredential.DEFAULT_LIFETIME, oid,
- GSSCredential.ACCEPT_ONLY
- );
- secContext = gssManager.createContext(credentials);
-
- try {
- return secContext.acceptSecContext(ticket, 0, ticket.length);
- } finally {
- if (null != secContext) {
- secContext.dispose();
- }
- }
- }
+public class GssInteropTestBase extends GssInteropTest {
+ @Override
+ protected void prepareKdc() throws KrbException {
+ getKdcServer().setInnerKdcImpl(
+ new NettyKdcServerImpl(getKdcServer().getKdcSetting()));
+ super.prepareKdc();
}
}
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/d3c8272d/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/GssTcpInteropTest.java
----------------------------------------------------------------------
diff --git a/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/GssTcpInteropTest.java b/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/GssTcpInteropTest.java
index c101d0d..2af6cc7 100644
--- a/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/GssTcpInteropTest.java
+++ b/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/GssTcpInteropTest.java
@@ -19,14 +19,29 @@
*/
package org.apache.kerby.kerberos.kdc;
+import org.apache.kerby.kerberos.kdc.impl.NettyKdcServerImpl;
+import org.apache.kerby.kerberos.kerb.KrbException;
+import org.apache.kerby.kerberos.kerb.server.GssInteropTest;
+
/**
* This is an interop test using the Java GSS APIs against the Kerby KDC (using TCP)
*/
public class GssTcpInteropTest extends GssInteropTestBase {
@Override
+ protected void prepareKdc() throws KrbException {
+ getKdcServer().setInnerKdcImpl(
+ new NettyKdcServerImpl(getKdcServer().getKdcSetting()));
+ super.prepareKdc();
+ }
+
+ @Override
protected boolean allowUdp() {
return false;
}
+ @Override
+ protected boolean allowTcp() {
+ return true;
+ }
}
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/d3c8272d/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/GssUdpInteropTest.java
----------------------------------------------------------------------
diff --git a/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/GssUdpInteropTest.java b/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/GssUdpInteropTest.java
index a3e8c55..5b30b7a 100644
--- a/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/GssUdpInteropTest.java
+++ b/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/GssUdpInteropTest.java
@@ -19,6 +19,8 @@
*/
package org.apache.kerby.kerberos.kdc;
+import org.apache.kerby.kerberos.kerb.server.GssInteropTest;
+
/**
* This is an interop test using the Java GSS APIs against the Kerby KDC (using UDP)
*/
@@ -28,4 +30,9 @@ public class GssUdpInteropTest extends GssInteropTestBase {
protected boolean allowUdp() {
return true;
}
+
+ @Override
+ protected boolean allowTcp() {
+ return false;
+ }
}
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/d3c8272d/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/KerbyKdcTest.java
----------------------------------------------------------------------
diff --git a/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/KerbyKdcTest.java b/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/KerbyKdcTest.java
index 2f08601..f782719 100644
--- a/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/KerbyKdcTest.java
+++ b/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/KerbyKdcTest.java
@@ -32,9 +32,9 @@ public abstract class KerbyKdcTest extends KdcTestBase {
@Override
protected void prepareKdc() throws KrbException {
- super.prepareKdc();
getKdcServer().setInnerKdcImpl(
new NettyKdcServerImpl(getKdcServer().getKdcSetting()));
+ super.prepareKdc();
}
protected void performKdcTest() throws Exception {
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/d3c8272d/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/GssInteropTest.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/GssInteropTest.java b/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/GssInteropTest.java
index a3a0fe3..03298c1 100644
--- a/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/GssInteropTest.java
+++ b/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/GssInteropTest.java
@@ -19,7 +19,6 @@
*/
package org.apache.kerby.kerberos.kerb.server;
-import org.apache.kerby.kerberos.kerb.KrbException;
import org.apache.kerby.kerberos.kerb.client.JaasKrbUtil;
import org.ietf.jgss.*;
import org.junit.Assert;
@@ -31,6 +30,7 @@ import javax.security.auth.callback.CallbackHandler;
import javax.security.auth.callback.PasswordCallback;
import javax.security.auth.callback.UnsupportedCallbackException;
import javax.security.auth.kerberos.KerberosTicket;
+import java.io.File;
import java.io.IOException;
import java.security.Principal;
import java.security.PrivilegedExceptionAction;
@@ -39,26 +39,11 @@ import java.util.Set;
/**
* This is an interop test using the Java GSS APIs against the Kerby KDC
*/
-public class GssInteropTest extends KdcTestBase {
-
- protected boolean allowUdp() {
- return false;
- }
-
- @Override
- protected void createPrincipals() throws KrbException {
- getKdcServer().createPrincipal(getClientPrincipal(), getClientPassword());
- getKdcServer().createPrincipal(getServerPrincipal(), getServerPassword());
- }
-
- private String getServerPassword() {
- return getClientPassword(); // Reuse the same password
- }
+public class GssInteropTest extends LoginTestBase {
@Test
- public void testKdc() throws Exception {
- Subject clientSubject = JaasKrbUtil.loginUsingPassword(
- getClientPrincipal(), getClientPassword());
+ public void testGss() throws Exception {
+ Subject clientSubject = loginClientUsingTicketCache();
Set<Principal> clientPrincipals = clientSubject.getPrincipals();
Assert.assertFalse(clientPrincipals.isEmpty());
@@ -82,41 +67,20 @@ public class GssInteropTest extends KdcTestBase {
}
private void validateServiceTicket(byte[] ticket) throws Exception {
- Subject serviceSubject = JaasKrbUtil.loginUsingPassword(
- getServerPrincipal(), getClientPassword());
-
+ Subject serviceSubject = loginServiceUsingKeytab();
Set<Principal> servicePrincipals = serviceSubject.getPrincipals();
Assert.assertFalse(servicePrincipals.isEmpty());
// Handle the service ticket
KerberosServiceExceptionAction serviceAction =
- new KerberosServiceExceptionAction(ticket,
- getServerPrincipal());
+ new KerberosServiceExceptionAction(ticket, getServerPrincipal());
Subject.doAs(serviceSubject, serviceAction);
}
- private class KerberosCallbackHandler implements CallbackHandler {
- public void handle(Callback[] callbacks) throws IOException,
- UnsupportedCallbackException {
- for (int i = 0; i < callbacks.length; i++) {
- if (callbacks[i] instanceof PasswordCallback) {
- PasswordCallback pc = (PasswordCallback) callbacks[i];
- if (pc.getPrompt().contains(getClientPrincipalName())) {
- pc.setPassword(getClientPassword().toCharArray());
- break;
- } else if (pc.getPrompt().contains(getServerPrincipalName())) {
- pc.setPassword(getClientPassword().toCharArray());
- break;
- }
- }
- }
- }
- }
-
/**
- * This class represents a PrivilegedExceptionAction implementation to obtain a service ticket from a Kerberos
- * Key Distribution Center.
+ * This class represents a PrivilegedExceptionAction implementation to
+ * a service ticket from a Kerberos Key Distribution Center.
*/
private class KerberosClientExceptionAction implements PrivilegedExceptionAction<byte[]> {
@@ -140,12 +104,10 @@ public class GssInteropTest extends KdcTestBase {
GSSName.NT_USER_NAME);
GSSCredential credentials = gssManager.createCredential(
gssClient, GSSCredential.DEFAULT_LIFETIME, oid,
- GSSCredential.INITIATE_ONLY
- );
+ GSSCredential.INITIATE_ONLY);
GSSContext secContext = gssManager.createContext(
- gssService, oid, credentials,
- GSSContext.DEFAULT_LIFETIME
+ gssService, oid, credentials, GSSContext.DEFAULT_LIFETIME
);
secContext.requestMutualAuth(false);
@@ -176,18 +138,15 @@ public class GssInteropTest extends KdcTestBase {
}
public byte[] run() throws GSSException {
-
GSSManager gssManager = GSSManager.getInstance();
-
- GSSContext secContext = null;
+ GSSContext secContext;
GSSName gssService = gssManager.createName(serviceName,
GSSName.NT_USER_NAME);
Oid oid = new Oid(JGSS_KERBEROS_TICKET_OID);
- GSSCredential credentials =
- gssManager.createCredential(
- gssService, GSSCredential.DEFAULT_LIFETIME, oid, GSSCredential.ACCEPT_ONLY
- );
+ GSSCredential credentials = gssManager.createCredential(
+ gssService, GSSCredential.DEFAULT_LIFETIME,
+ oid, GSSCredential.ACCEPT_ONLY);
secContext = gssManager.createContext(credentials);
try {
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/d3c8272d/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/GssTcpInteropTest.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/GssTcpInteropTest.java b/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/GssTcpInteropTest.java
new file mode 100644
index 0000000..bc28b90
--- /dev/null
+++ b/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/GssTcpInteropTest.java
@@ -0,0 +1,36 @@
+/**
+ * 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;
+
+/**
+ * This is an interop test using the Java GSS APIs against the Kerby KDC (using TCP)
+ */
+public class GssTcpInteropTest extends GssInteropTest {
+
+ @Override
+ protected boolean allowUdp() {
+ return false;
+ }
+
+ @Override
+ protected boolean allowTcp() {
+ return true;
+ }
+}
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/d3c8272d/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/GssUdpInteropTest.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/GssUdpInteropTest.java b/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/GssUdpInteropTest.java
new file mode 100644
index 0000000..9f2e328
--- /dev/null
+++ b/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/GssUdpInteropTest.java
@@ -0,0 +1,36 @@
+/**
+ * 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;
+
+/**
+ * This is an interop test using the Java GSS APIs against the Kerby KDC (using UDP)
+ */
+public class GssUdpInteropTest extends GssInteropTest {
+
+ @Override
+ protected boolean allowUdp() {
+ return true;
+ }
+
+ @Override
+ protected boolean allowTcp() {
+ return false;
+ }
+}
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/d3c8272d/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 59b163e..06fd502 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
@@ -91,6 +91,10 @@ public abstract class KdcTestBase {
return serverPrincipal;
}
+ protected String getHostname() {
+ return hostname;
+ }
+
protected boolean allowUdp() {
return true;
}
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/d3c8272d/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/LoginTestBase.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/LoginTestBase.java b/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/LoginTestBase.java
index a7d2dc6..cd67926 100644
--- a/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/LoginTestBase.java
+++ b/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/LoginTestBase.java
@@ -30,6 +30,7 @@ import javax.security.auth.login.LoginException;
import java.io.File;
import java.security.Principal;
import java.util.Set;
+
import static org.assertj.core.api.Assertions.assertThat;
@@ -62,14 +63,12 @@ public class LoginTestBase extends KdcTestBase {
}
protected Subject loginServiceUsingKeytab() throws Exception {
- getKdcServer().exportPrincipals(serviceKeytabFile);
-
- return JaasKrbUtil.loginUsingKeytab(getClientPrincipal(),
+ getKdcServer().exportPrincipal(getServerPrincipal(), serviceKeytabFile);
+ return JaasKrbUtil.loginUsingKeytab(getServerPrincipal(),
serviceKeytabFile);
}
protected void checkSubject(Subject subject) {
-
Set<Principal> clientPrincipals = subject.getPrincipals();
assertThat(clientPrincipals);
}
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/d3c8272d/kerby-kerb/kerb-simplekdc/src/main/java/org/apache/kerby/kerberos/kerb/server/SimpleKdcServer.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-simplekdc/src/main/java/org/apache/kerby/kerberos/kerb/server/SimpleKdcServer.java b/kerby-kerb/kerb-simplekdc/src/main/java/org/apache/kerby/kerberos/kerb/server/SimpleKdcServer.java
index d5ed8ff..393b006 100644
--- a/kerby-kerb/kerb-simplekdc/src/main/java/org/apache/kerby/kerberos/kerb/server/SimpleKdcServer.java
+++ b/kerby-kerb/kerb-simplekdc/src/main/java/org/apache/kerby/kerberos/kerb/server/SimpleKdcServer.java
@@ -165,4 +165,14 @@ public class SimpleKdcServer extends KdcServer {
public void exportPrincipals(File keytabFile) throws KrbException {
kadmin.exportKeytab(keytabFile);
}
+
+ /**
+ * Export the keys of the specified principal into keytab file.
+ * @param principal
+ * @param keytabFile
+ * @throws KrbException
+ */
+ public void exportPrincipal(String principal, File keytabFile) throws KrbException {
+ kadmin.exportKeytab(keytabFile, principal);
+ }
}