You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by co...@apache.org on 2016/07/28 14:44:36 UTC
[1/3] directory-kerby git commit: NPE fix
Repository: directory-kerby
Updated Branches:
refs/heads/trunk aeb3fc0c9 -> 67d67c916
NPE fix
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/5badde01
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/5badde01
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/5badde01
Branch: refs/heads/trunk
Commit: 5badde01c0210e11e4d2b87ff023c7341a8888ba
Parents: aeb3fc0
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Thu Jul 28 14:49:03 2016 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Thu Jul 28 14:49:03 2016 +0100
----------------------------------------------------------------------
.../kerberos/kerb/server/preauth/token/TokenPreauth.java | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/5badde01/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/preauth/token/TokenPreauth.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/preauth/token/TokenPreauth.java b/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/preauth/token/TokenPreauth.java
index 81ce5dd..0dcc3d3 100644
--- a/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/preauth/token/TokenPreauth.java
+++ b/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/preauth/token/TokenPreauth.java
@@ -77,7 +77,7 @@ public class TokenPreauth extends AbstractPreauthPlugin {
List<String> issuers = kdcRequest.getKdcContext().getConfig().getIssuers();
TokenInfo tokenInfo = paTokenRequest.getTokenInfo();
String issuer = tokenInfo.getTokenVendor();
- if (!(issuers.contains(issuer))) {
+ if (!issuers.contains(issuer)) {
throw new KrbException("Unconfigured issuer: " + issuer);
}
@@ -118,6 +118,7 @@ public class TokenPreauth extends AbstractPreauthPlugin {
if (verifyKeyPath != null) {
try {
InputStream verifyKeyFile = getKeyFileStream(verifyKeyPath, issuer);
+ System.out.println("VER: " + (verifyKeyFile != null));
if (verifyKeyFile != null) {
PublicKey verifyKey = PublicKeyReader.loadPublicKey(verifyKeyFile);
tokenDecoder.setVerifyKey(verifyKey);
@@ -151,7 +152,7 @@ public class TokenPreauth extends AbstractPreauthPlugin {
File verifyKeyFile = null;
if (listOfFiles == null) {
- throw new RuntimeException("List of files is null.");
+ throw new FileNotFoundException("The key path is incorrect");
}
for (int i = 0; i < listOfFiles.length; i++) {
if (listOfFiles[i].isFile() && listOfFiles[i].getName().contains(issuer)) {
@@ -159,6 +160,9 @@ public class TokenPreauth extends AbstractPreauthPlugin {
break;
}
}
+ if (verifyKeyFile == null) {
+ throw new FileNotFoundException("No key found that matches the issuer name");
+ }
return new FileInputStream(verifyKeyFile);
} else if (file.isFile()) {
return new FileInputStream(file);
[2/3] directory-kerby git commit: Removing println
Posted by co...@apache.org.
Removing println
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/ab8fa35a
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/ab8fa35a
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/ab8fa35a
Branch: refs/heads/trunk
Commit: ab8fa35ab2c5e206268cf8c2c31c74b1ceeaeec4
Parents: 5badde0
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Thu Jul 28 14:49:33 2016 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Thu Jul 28 14:49:33 2016 +0100
----------------------------------------------------------------------
.../kerby/kerberos/kerb/server/preauth/token/TokenPreauth.java | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/ab8fa35a/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/preauth/token/TokenPreauth.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/preauth/token/TokenPreauth.java b/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/preauth/token/TokenPreauth.java
index 0dcc3d3..8245115 100644
--- a/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/preauth/token/TokenPreauth.java
+++ b/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/preauth/token/TokenPreauth.java
@@ -118,7 +118,6 @@ public class TokenPreauth extends AbstractPreauthPlugin {
if (verifyKeyPath != null) {
try {
InputStream verifyKeyFile = getKeyFileStream(verifyKeyPath, issuer);
- System.out.println("VER: " + (verifyKeyFile != null));
if (verifyKeyFile != null) {
PublicKey verifyKey = PublicKeyReader.loadPublicKey(verifyKeyFile);
tokenDecoder.setVerifyKey(verifyKey);
[3/3] directory-kerby git commit: Avoid throwing NPE
Posted by co...@apache.org.
Avoid throwing NPE
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/67d67c91
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/67d67c91
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/67d67c91
Branch: refs/heads/trunk
Commit: 67d67c9165da21a255a8067a1c3e3ca42de55dd9
Parents: ab8fa35
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Thu Jul 28 14:57:42 2016 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Thu Jul 28 14:57:42 2016 +0100
----------------------------------------------------------------------
.../org/apache/kerby/kerberos/kerb/common/PrivateKeyReader.java | 4 ----
1 file changed, 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/67d67c91/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/common/PrivateKeyReader.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/common/PrivateKeyReader.java b/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/common/PrivateKeyReader.java
index c4c6273..a3a7a4e 100644
--- a/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/common/PrivateKeyReader.java
+++ b/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/common/PrivateKeyReader.java
@@ -50,8 +50,6 @@ public class PrivateKeyReader {
return loadPrivateKey(sb.toString());
} catch (IOException e) {
throw e;
- } catch (NullPointerException e) {
- throw e;
}
}
@@ -66,8 +64,6 @@ public class PrivateKeyReader {
throw e;
} catch (InvalidKeySpecException e) {
throw e;
- } catch (NullPointerException e) {
- throw e;
}
}