Renamed some KDC tests
diff --git a/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/WithAccessTokenKdcTest.java b/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/AccessTokenKdcTest.java
similarity index 90%
rename from kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/WithAccessTokenKdcTest.java
rename to kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/AccessTokenKdcTest.java
index e829625..57b2b1b 100644
--- a/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/WithAccessTokenKdcTest.java
+++ b/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/AccessTokenKdcTest.java
@@ -34,7 +34,7 @@
import org.junit.Assert;
import org.junit.Test;
-public class WithAccessTokenKdcTest extends WithTokenKdcTestBase {
+public class AccessTokenKdcTest extends TokenKdcTestBase {
@Test
public void testRequestServiceTicketWithAccessToken() throws Exception {
@@ -44,7 +44,7 @@
@Test
public void testBadIssuer() throws Exception {
- InputStream is = WithTokenKdcTestBase.class.getResourceAsStream("/private_key.pem");
+ InputStream is = TokenKdcTestBase.class.getResourceAsStream("/private_key.pem");
PrivateKey privateKey = PrivateKeyReader.loadPrivateKey(is);
prepareToken(getServerPrincipal(), "oauth1.com", privateKey, null);
@@ -59,7 +59,7 @@
@Test
public void testBadAudienceRestriction() throws Exception {
- InputStream is = WithTokenKdcTestBase.class.getResourceAsStream("/private_key.pem");
+ InputStream is = TokenKdcTestBase.class.getResourceAsStream("/private_key.pem");
PrivateKey privateKey = PrivateKeyReader.loadPrivateKey(is);
prepareToken("bad-service" + "/" + getHostname() + "@" + TestKdcServer.KDC_REALM,
ISSUER, privateKey, null);
@@ -103,10 +103,10 @@
@Test
public void testSignedEncryptedToken() throws Exception {
- InputStream is = WithTokenKdcTestBase.class.getResourceAsStream("/private_key.pem");
+ InputStream is = TokenKdcTestBase.class.getResourceAsStream("/private_key.pem");
PrivateKey privateKey = PrivateKeyReader.loadPrivateKey(is);
- is = WithTokenKdcTestBase.class.getResourceAsStream("/oauth2.com_public_key.pem");
+ is = TokenKdcTestBase.class.getResourceAsStream("/oauth2.com_public_key.pem");
PublicKey publicKey = PublicKeyReader.loadPublicKey(is);
prepareToken(getServerPrincipal(), ISSUER, privateKey, publicKey);
@@ -119,7 +119,7 @@
KeyPairGenerator keyGen = KeyPairGenerator.getInstance("RSA");
KeyPair keyPair = keyGen.generateKeyPair();
- InputStream is = WithTokenKdcTestBase.class.getResourceAsStream("/oauth2.com_public_key.pem");
+ InputStream is = TokenKdcTestBase.class.getResourceAsStream("/oauth2.com_public_key.pem");
PublicKey publicKey = PublicKeyReader.loadPublicKey(is);
prepareToken(getServerPrincipal(), ISSUER, keyPair.getPrivate(), publicKey);
diff --git a/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/AnonymousPkinitKdcTest.java b/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/AnonymousPkinitKdcTest.java
index bfd8746..215d8b0 100644
--- a/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/AnonymousPkinitKdcTest.java
+++ b/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/AnonymousPkinitKdcTest.java
@@ -33,6 +33,9 @@
import static org.assertj.core.api.Assertions.assertThat;
+/**
+ * Anonymous PKINIT test.
+ */
public class AnonymousPkinitKdcTest extends KdcTestBase {
private String serverPrincipal;
private KrbPkinitClient pkinitClient;
diff --git a/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/WithIdentityTokenKdcTest.java b/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/IdentityTokenKdcTest.java
similarity index 90%
rename from kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/WithIdentityTokenKdcTest.java
rename to kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/IdentityTokenKdcTest.java
index acac0a0..5aa2115 100644
--- a/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/WithIdentityTokenKdcTest.java
+++ b/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/IdentityTokenKdcTest.java
@@ -35,7 +35,7 @@
import java.security.PrivateKey;
import java.security.PublicKey;
-public class WithIdentityTokenKdcTest extends WithTokenKdcTestBase {
+public class IdentityTokenKdcTest extends TokenKdcTestBase {
@Test
public void testKdc() throws Exception {
@@ -45,7 +45,7 @@
@Test
public void testBadIssuer() throws Exception {
- InputStream is = WithTokenKdcTestBase.class.getResourceAsStream("/private_key.pem");
+ InputStream is = TokenKdcTestBase.class.getResourceAsStream("/private_key.pem");
PrivateKey privateKey = PrivateKeyReader.loadPrivateKey(is);
prepareToken(getAudience("krbtgt"), "oauth1.com", privateKey, null);
@@ -60,7 +60,7 @@
@Test
public void testBadAudienceRestriction() throws Exception {
- InputStream is = WithTokenKdcTestBase.class.getResourceAsStream("/private_key.pem");
+ InputStream is = TokenKdcTestBase.class.getResourceAsStream("/private_key.pem");
PrivateKey privateKey = PrivateKeyReader.loadPrivateKey(is);
prepareToken("krbtgt2@EXAMPLE.COM", ISSUER, privateKey, null);
@@ -102,10 +102,10 @@
@Test
public void testSignedEncryptedToken() throws Exception {
- InputStream is = WithTokenKdcTestBase.class.getResourceAsStream("/private_key.pem");
+ InputStream is = TokenKdcTestBase.class.getResourceAsStream("/private_key.pem");
PrivateKey privateKey = PrivateKeyReader.loadPrivateKey(is);
- is = WithTokenKdcTestBase.class.getResourceAsStream("/oauth2.com_public_key.pem");
+ is = TokenKdcTestBase.class.getResourceAsStream("/oauth2.com_public_key.pem");
PublicKey publicKey = PublicKeyReader.loadPublicKey(is);
prepareToken(getAudience("krbtgt"), ISSUER, privateKey, publicKey);
@@ -118,7 +118,7 @@
KeyPairGenerator keyGen = KeyPairGenerator.getInstance("RSA");
KeyPair keyPair = keyGen.generateKeyPair();
- InputStream is = WithTokenKdcTestBase.class.getResourceAsStream("/oauth2.com_public_key.pem");
+ InputStream is = TokenKdcTestBase.class.getResourceAsStream("/oauth2.com_public_key.pem");
PublicKey publicKey = PublicKeyReader.loadPublicKey(is);
prepareToken(getAudience("krbtgt"), ISSUER, keyPair.getPrivate(), publicKey);
diff --git a/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/WithCertKdcTest.java b/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/PkinitKdcTest.java
similarity index 97%
rename from kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/WithCertKdcTest.java
rename to kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/PkinitKdcTest.java
index 05183ea..7a11eff 100644
--- a/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/WithCertKdcTest.java
+++ b/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/PkinitKdcTest.java
@@ -36,6 +36,10 @@
import static org.assertj.core.api.Assertions.assertThat;
/**
+ * RSA PKINIT test.
+ */
+
+/**
openssl genrsa -out cakey.pem 2048
openssl req -key cakey.pem -new -x509 -out cacert.pem -days 3650
vi extensions.kdc
@@ -44,7 +48,7 @@
env REALM=SH.INTEL.COM openssl x509 -req -in kdc.req -CAkey cakey.pem \
-CA cacert.pem -out kdc.pem -days 365 -extfile extensions.kdc -extensions kdc_cert -CAcreateserial
*/
-public class WithCertKdcTest extends KdcTestBase {
+public class PkinitKdcTest extends KdcTestBase {
private PkiLoader pkiLoader;
private String serverPrincipal;
private Certificate userCert;
diff --git a/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/WithTokenKdcTestBase.java b/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/TokenKdcTestBase.java
similarity index 96%
rename from kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/WithTokenKdcTestBase.java
rename to kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/TokenKdcTestBase.java
index bed9e7d..387ad52 100644
--- a/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/WithTokenKdcTestBase.java
+++ b/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/TokenKdcTestBase.java
@@ -48,7 +48,7 @@
import static org.assertj.core.api.Assertions.assertThat;
-public class WithTokenKdcTestBase extends KdcTestBase {
+public class TokenKdcTestBase extends KdcTestBase {
static final String SUBJECT = "test-sub";
static final String ISSUER = "oauth2.com";
static final String GROUP = "sales-group";
@@ -68,7 +68,7 @@
String verifyKeyPath = this.getClass().getResource("/").getPath();
getKdcServer().getKdcConfig().setString(KdcConfigKey.TOKEN_VERIFY_KEYS, verifyKeyPath);
- URL privateKeyPath = WithTokenKdcTestBase.class.getResource("/private_key.pem");
+ URL privateKeyPath = TokenKdcTestBase.class.getResource("/private_key.pem");
getKdcServer().getKdcConfig().setString(KdcConfigKey.TOKEN_DECRYPTION_KEYS, privateKeyPath.getPath());
getKdcServer().getKdcConfig().setString(KdcConfigKey.TOKEN_ISSUERS, ISSUER);
}
@@ -82,7 +82,7 @@
}
protected AuthToken prepareToken(String audience) {
- InputStream is = WithTokenKdcTestBase.class.getResourceAsStream("/private_key.pem");
+ InputStream is = TokenKdcTestBase.class.getResourceAsStream("/private_key.pem");
PrivateKey privateKey = null;
try {
privateKey = PrivateKeyReader.loadPrivateKey(is);
