You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by pl...@apache.org on 2015/07/15 04:18:50 UTC
directory-kerby git commit: [DIRKRB-354]-Fix getBooleanOption return
null problem. Contributed by Yaning.
Repository: directory-kerby
Updated Branches:
refs/heads/master 1a0988743 -> 0d7b34f93
[DIRKRB-354]-Fix getBooleanOption return null problem. Contributed by Yaning.
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/0d7b34f9
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/0d7b34f9
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/0d7b34f9
Branch: refs/heads/master
Commit: 0d7b34f93588ff7b81fc9fe8c81ea185d3d26e31
Parents: 1a09887
Author: plusplusjiajia <ji...@intel.com>
Authored: Wed Jul 15 10:24:13 2015 +0800
Committer: plusplusjiajia <ji...@intel.com>
Committed: Wed Jul 15 10:24:13 2015 +0800
----------------------------------------------------------------------
.../kerby/kerberos/kerb/admin/AdminHelper.java | 4 ++--
.../kerby/kerberos/kerb/client/KrbSetting.java | 16 ++++++----------
.../kerb/client/preauth/pkinit/PkinitPreauth.java | 2 +-
.../kerb/client/preauth/token/TokenPreauth.java | 2 +-
.../kerby/kerberos/kerb/server/KdcSetting.java | 17 ++++++-----------
.../src/main/java/org/apache/kerby/KOptions.java | 4 ++--
6 files changed, 18 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/0d7b34f9/kerby-kerb/kerb-admin/src/main/java/org/apache/kerby/kerberos/kerb/admin/AdminHelper.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-admin/src/main/java/org/apache/kerby/kerberos/kerb/admin/AdminHelper.java b/kerby-kerb/kerb-admin/src/main/java/org/apache/kerby/kerberos/kerb/admin/AdminHelper.java
index fb0bfca..f0c5bd7 100644
--- a/kerby-kerb/kerb-admin/src/main/java/org/apache/kerby/kerberos/kerb/admin/AdminHelper.java
+++ b/kerby-kerb/kerb-admin/src/main/java/org/apache/kerby/kerberos/kerb/admin/AdminHelper.java
@@ -171,10 +171,10 @@ public final class AdminHelper {
identity.setExpireTime(new KerberosTime(date.getTime()));
}
if (kOptions.contains(KadminOption.DISABLED)) {
- identity.setDisabled(kOptions.getBooleanOption(KadminOption.DISABLED));
+ identity.setDisabled(kOptions.getBooleanOption(KadminOption.DISABLED, false));
}
if (kOptions.contains(KadminOption.LOCKED)) {
- identity.setLocked(kOptions.getBooleanOption(KadminOption.LOCKED));
+ identity.setLocked(kOptions.getBooleanOption(KadminOption.LOCKED, false));
}
}
}
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/0d7b34f9/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/KrbSetting.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/KrbSetting.java b/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/KrbSetting.java
index f1a51b2..7a16be7 100644
--- a/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/KrbSetting.java
+++ b/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/KrbSetting.java
@@ -100,19 +100,15 @@ public class KrbSetting {
}
public boolean allowUdp() {
- Boolean allowUdp = commonOptions.getBooleanOption(KrbOption.ALLOW_UDP);
- if (allowUdp != null) {
- return allowUdp;
- }
- return krbConfig.allowKdcUdp();
+ Boolean allowUdp = commonOptions.getBooleanOption(
+ KrbOption.ALLOW_UDP, krbConfig.allowKdcUdp());
+ return allowUdp;
}
public boolean allowTcp() {
- Boolean allowTcp = commonOptions.getBooleanOption(KrbOption.ALLOW_TCP);
- if (allowTcp != null) {
- return allowTcp;
- }
- return krbConfig.allowKdcTcp();
+ Boolean allowTcp = commonOptions.getBooleanOption(
+ KrbOption.ALLOW_TCP, krbConfig.allowKdcTcp());
+ return allowTcp;
}
public int getKdcUdpPort() {
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/0d7b34f9/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/preauth/pkinit/PkinitPreauth.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/preauth/pkinit/PkinitPreauth.java b/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/preauth/pkinit/PkinitPreauth.java
index 729c146..e185a2f 100644
--- a/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/preauth/pkinit/PkinitPreauth.java
+++ b/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/preauth/pkinit/PkinitPreauth.java
@@ -84,7 +84,7 @@ public class PkinitPreauth extends AbstractPreauthPlugin {
if (options.contains(KrbOption.PKINIT_USING_RSA)) {
pkinitContext.pluginOpts.usingRsa =
- options.getBooleanOption(KrbOption.PKINIT_USING_RSA);
+ options.getBooleanOption(KrbOption.PKINIT_USING_RSA, true);
}
}
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/0d7b34f9/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/preauth/token/TokenPreauth.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/preauth/token/TokenPreauth.java b/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/preauth/token/TokenPreauth.java
index 192513c..e43979e 100644
--- a/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/preauth/token/TokenPreauth.java
+++ b/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/preauth/token/TokenPreauth.java
@@ -82,7 +82,7 @@ public class TokenPreauth extends AbstractPreauthPlugin {
PluginRequestContext requestContext,
KOptions options) {
- tokenContext.usingIdToken = options.getBooleanOption(KrbOption.USE_TOKEN);
+ tokenContext.usingIdToken = options.getBooleanOption(KrbOption.USE_TOKEN, false);
if (tokenContext.usingIdToken) {
if (options.contains(KrbOption.TOKEN_USER_ID_TOKEN)) {
tokenContext.token =
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/0d7b34f9/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/KdcSetting.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/KdcSetting.java b/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/KdcSetting.java
index 920c5a0..1b40513 100644
--- a/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/KdcSetting.java
+++ b/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/KdcSetting.java
@@ -119,20 +119,15 @@ public class KdcSetting {
}
public boolean allowTcp() {
- Boolean allowTcp = startupOptions.getBooleanOption(KdcServerOption.ALLOW_TCP);
- if (allowTcp == null) {
- allowTcp = kdcConfig.allowTcp();
- }
-
- return allowTcp != null ? allowTcp : false;
+ Boolean allowTcp = startupOptions.getBooleanOption(
+ KdcServerOption.ALLOW_TCP, kdcConfig.allowTcp());
+ return allowTcp;
}
public boolean allowUdp() {
- Boolean allowUdp = startupOptions.getBooleanOption(KdcServerOption.ALLOW_UDP);
- if (allowUdp == null) {
- allowUdp = kdcConfig.allowUdp();
- }
- return allowUdp != null ? allowUdp : false;
+ Boolean allowUdp = startupOptions.getBooleanOption(
+ KdcServerOption.ALLOW_UDP, kdcConfig.allowUdp());
+ return allowUdp;
}
public int getKdcUdpPort() {
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/0d7b34f9/lib/kerby-util/src/main/java/org/apache/kerby/KOptions.java
----------------------------------------------------------------------
diff --git a/lib/kerby-util/src/main/java/org/apache/kerby/KOptions.java b/lib/kerby-util/src/main/java/org/apache/kerby/KOptions.java
index eba79a2..f55deaa 100644
--- a/lib/kerby-util/src/main/java/org/apache/kerby/KOptions.java
+++ b/lib/kerby-util/src/main/java/org/apache/kerby/KOptions.java
@@ -131,7 +131,7 @@ public class KOptions {
return null;
}
- public Boolean getBooleanOption(KOption option) {
+ public boolean getBooleanOption(KOption option, Boolean defaultValue) {
Object value = getOptionValue(option);
if (value instanceof String) {
String strVal = (String) value;
@@ -148,7 +148,7 @@ public class KOptions {
return (Boolean) value;
}
- return null;
+ return defaultValue;
}
public int getIntegerOption(KOption option) {