directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From plusplusjia...@apache.org
Subject [03/26] directory-kerby git commit: DIRKRB-484 Refactor configuration items for TokenPreauth in KDC side
Date Mon, 07 Dec 2015 03:33:33 GMT
DIRKRB-484 Refactor configuration items for TokenPreauth in KDC side


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

Branch: refs/heads/pkinit-support
Commit: dbc73db7a9cca2bc216e56f9a0021755c4a9567f
Parents: 27038b8
Author: Lin <linchen7@foxmail.com>
Authored: Mon Nov 30 20:56:17 2015 +0800
Committer: Lin <linchen7@foxmail.com>
Committed: Mon Nov 30 20:56:17 2015 +0800

----------------------------------------------------------------------
 .../org/apache/kerby/kerberos/kdc/WithTokenKdcTestBase.java    | 6 +++---
 .../kerberos/kerb/integration/test/TokenLoginTestBase.java     | 4 ++--
 .../java/org/apache/kerby/kerberos/kerb/server/KdcConfig.java  | 6 +++---
 .../org/apache/kerby/kerberos/kerb/server/KdcConfigKey.java    | 6 +++---
 4 files changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/dbc73db7/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/WithTokenKdcTestBase.java
----------------------------------------------------------------------
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/WithTokenKdcTestBase.java
index 27bdc50..f33309f 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/WithTokenKdcTestBase.java
@@ -66,11 +66,11 @@ public class WithTokenKdcTestBase extends KdcTestBase {
     protected void configKdcSeverAndClient() {
         super.configKdcSeverAndClient();
         String verifyKeyPath = this.getClass().getResource("/").getPath();
-        getKdcServer().getKdcConfig().setString(KdcConfigKey.VERIFY_KEY, verifyKeyPath);
+        getKdcServer().getKdcConfig().setString(KdcConfigKey.TOKEN_VERIFY_KEYS, verifyKeyPath);
         
         URL privateKeyPath = WithTokenKdcTestBase.class.getResource("/private_key.pem");
-        getKdcServer().getKdcConfig().setString(KdcConfigKey.DECRYPTION_KEY, privateKeyPath.getPath());
-        getKdcServer().getKdcConfig().setString(KdcConfigKey.ISSUERS, ISSUER);
+        getKdcServer().getKdcConfig().setString(KdcConfigKey.TOKEN_DECRYPTION_KEYS, privateKeyPath.getPath());
+        getKdcServer().getKdcConfig().setString(KdcConfigKey.TOKEN_ISSUERS, ISSUER);
     }
 
     protected AuthToken getKrbToken() {

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/dbc73db7/kerby-kerb/integration-test/src/test/java/org/apache/kerby/kerberos/kerb/integration/test/TokenLoginTestBase.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/integration-test/src/test/java/org/apache/kerby/kerberos/kerb/integration/test/TokenLoginTestBase.java
b/kerby-kerb/integration-test/src/test/java/org/apache/kerby/kerberos/kerb/integration/test/TokenLoginTestBase.java
index 6ee1f8a..025a9fa 100644
--- a/kerby-kerb/integration-test/src/test/java/org/apache/kerby/kerberos/kerb/integration/test/TokenLoginTestBase.java
+++ b/kerby-kerb/integration-test/src/test/java/org/apache/kerby/kerberos/kerb/integration/test/TokenLoginTestBase.java
@@ -67,8 +67,8 @@ public class TokenLoginTestBase extends LoginTestBase {
         getKdcServer().getKdcConfig().setBoolean(KdcConfigKey.ALLOW_TOKEN_PREAUTH,
             isTokenPreauthAllowed());
         String verifyKeyFile = this.getClass().getResource("/").getPath();
-        getKdcServer().getKdcConfig().setString(KdcConfigKey.VERIFY_KEY, verifyKeyFile);
-        getKdcServer().getKdcConfig().setString(KdcConfigKey.ISSUERS, "token-service");
+        getKdcServer().getKdcConfig().setString(KdcConfigKey.TOKEN_VERIFY_KEYS, verifyKeyFile);
+        getKdcServer().getKdcConfig().setString(KdcConfigKey.TOKEN_ISSUERS, "token-service");
     }
 
     protected Boolean isTokenPreauthAllowed() {

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/dbc73db7/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/KdcConfig.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/KdcConfig.java
b/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/KdcConfig.java
index e53ddc9..18e8b3d 100644
--- a/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/KdcConfig.java
+++ b/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/KdcConfig.java
@@ -160,14 +160,14 @@ public class KdcConfig extends Krb5Conf {
     }
 
     public String getVerifyKeyConfig() {
-        return getString(KdcConfigKey.VERIFY_KEY, true, KDCDEFAULT);
+        return getString(KdcConfigKey.TOKEN_VERIFY_KEYS, true, KDCDEFAULT);
     }
 
     public String getDecryptionKeyConfig() {
-        return getString(KdcConfigKey.DECRYPTION_KEY, true, KDCDEFAULT);
+        return getString(KdcConfigKey.TOKEN_DECRYPTION_KEYS, true, KDCDEFAULT);
     }
     
     public List<String> getIssuers() {
-        return Arrays.asList(getStringArray(KdcConfigKey.ISSUERS, true, KDCDEFAULT));
+        return Arrays.asList(getStringArray(KdcConfigKey.TOKEN_ISSUERS, true, KDCDEFAULT));
     }
 }

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/dbc73db7/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/KdcConfigKey.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/KdcConfigKey.java
b/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/KdcConfigKey.java
index e9c736d..6cae218 100644
--- a/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/KdcConfigKey.java
+++ b/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/KdcConfigKey.java
@@ -49,9 +49,9 @@ public enum KdcConfigKey implements ConfigKey {
     ENCRYPTION_TYPES("aes128-cts-hmac-sha1-96 des3-cbc-sha1-kd"),
     RESTRICT_ANONYMOUS_TO_TGT(false),
     KDC_MAX_DGRAM_REPLY_SIZE(4096),
-    VERIFY_KEY(),
-    DECRYPTION_KEY(),
-    ISSUERS();
+    TOKEN_VERIFY_KEYS(),
+    TOKEN_DECRYPTION_KEYS(),
+    TOKEN_ISSUERS();
 
     private Object defaultValue;
 


Mime
View raw message