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/06/15 16:32:23 UTC
[1/2] directory-kerby git commit: Spelling typo
Repository: directory-kerby
Updated Branches:
refs/heads/trunk 952938a69 -> 8aae07614
Spelling typo
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/83ebd608
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/83ebd608
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/83ebd608
Branch: refs/heads/trunk
Commit: 83ebd6083b6568facf5596ae0230051ba493a6be
Parents: 952938a
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Wed Jun 15 17:22:54 2016 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Wed Jun 15 17:22:54 2016 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/kerby/kerberos/kerb/KrbErrorCode.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/83ebd608/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/KrbErrorCode.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/KrbErrorCode.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/KrbErrorCode.java
index b7f3df3..30ddc0b 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/KrbErrorCode.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/KrbErrorCode.java
@@ -98,7 +98,7 @@ public enum KrbErrorCode implements EnumType {
TOKEN_PREAUTH_NOT_ALLOWED(82, "Token preauth is not allowed"),
KRB_TIMEOUT(5000, "Network timeout"),
- UNKNOWN_ERR(5001, "Unknow error");
+ UNKNOWN_ERR(5001, "Unknown error");
private final int value;
private final String message;
[2/2] directory-kerby git commit: DIRKRB-587 - Load JWT verification
key from classpath as well
Posted by co...@apache.org.
DIRKRB-587 - Load JWT verification key from classpath as well
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/8aae0761
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/8aae0761
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/8aae0761
Branch: refs/heads/trunk
Commit: 8aae07614df706a85490c3f303ea8cf075b29dba
Parents: 83ebd60
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Wed Jun 15 17:29:55 2016 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Wed Jun 15 17:29:55 2016 +0100
----------------------------------------------------------------------
.../kerb/server/preauth/token/TokenPreauth.java | 50 ++++++++++----------
1 file changed, 24 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/8aae0761/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 f4580fc..34fec85 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
@@ -48,6 +48,7 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
+import java.io.InputStream;
import java.security.PrivateKey;
import java.security.PublicKey;
import java.util.List;
@@ -123,39 +124,35 @@ public class TokenPreauth extends AbstractPreauthPlugin {
private void configureKeys(TokenDecoder tokenDecoder, KdcRequest kdcRequest, String issuer) {
String verifyKeyPath = kdcRequest.getKdcContext().getConfig().getVerifyKeyConfig();
if (verifyKeyPath != null) {
- File verifyKeyFile = getKeyFile(verifyKeyPath, issuer);
- if (verifyKeyFile != null) {
- PublicKey verifyKey = null;
- try {
- FileInputStream fis = new FileInputStream(verifyKeyFile);
- verifyKey = PublicKeyReader.loadPublicKey(fis);
- } catch (FileNotFoundException e) {
- e.printStackTrace();
- } catch (Exception e) {
- e.printStackTrace();
+ try {
+ InputStream verifyKeyFile = getKeyFileStream(verifyKeyPath, issuer);
+ if (verifyKeyFile != null) {
+ PublicKey verifyKey = PublicKeyReader.loadPublicKey(verifyKeyFile);
+ tokenDecoder.setVerifyKey(verifyKey);
}
- tokenDecoder.setVerifyKey(verifyKey);
+ } catch (FileNotFoundException e) {
+ e.printStackTrace();
+ } catch (Exception e) {
+ e.printStackTrace();
}
}
String decryptionKeyPath = kdcRequest.getKdcContext().getConfig().getDecryptionKeyConfig();
if (decryptionKeyPath != null) {
- File decryptionKeyFile = getKeyFile(decryptionKeyPath, issuer);
- if (decryptionKeyFile != null) {
- PrivateKey decryptionKey = null;
- try {
- FileInputStream fis = new FileInputStream(decryptionKeyFile);
- decryptionKey = PrivateKeyReader.loadPrivateKey(fis);
- } catch (FileNotFoundException e) {
- e.printStackTrace();
- } catch (Exception e) {
- e.printStackTrace();
+ try {
+ InputStream decryptionKeyFile = getKeyFileStream(decryptionKeyPath, issuer);
+ if (decryptionKeyFile != null) {
+ PrivateKey decryptionKey = PrivateKeyReader.loadPrivateKey(decryptionKeyFile);
+ tokenDecoder.setDecryptionKey(decryptionKey);
}
- tokenDecoder.setDecryptionKey(decryptionKey);
+ } catch (FileNotFoundException e) {
+ e.printStackTrace();
+ } catch (Exception e) {
+ e.printStackTrace();
}
}
}
- private File getKeyFile(String path, String issuer) {
+ private InputStream getKeyFileStream(String path, String issuer) throws FileNotFoundException {
File file = new File(path);
if (file.isDirectory()) {
File[] listOfFiles = file.listFiles();
@@ -170,11 +167,12 @@ public class TokenPreauth extends AbstractPreauthPlugin {
break;
}
}
- return verifyKeyFile;
+ return new FileInputStream(verifyKeyFile);
} else if (file.isFile()) {
- return file;
+ return new FileInputStream(file);
}
- return null;
+ // Not a directory or a file...maybe it's a resource on the classpath
+ return this.getClass().getClassLoader().getResourceAsStream(path);
}
}