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 2017/08/03 14:36:06 UTC
[1/3] directory-kerby git commit: Removing Ticket stuff from
GssAcceptCred
Repository: directory-kerby
Updated Branches:
refs/heads/trunk ea45cc80f -> 337af9b72
Removing Ticket stuff from GssAcceptCred
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/daa1771c
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/daa1771c
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/daa1771c
Branch: refs/heads/trunk
Commit: daa1771cd75280fab567941c96c6f0fb5911c072
Parents: ea45cc8
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Thu Aug 3 14:50:39 2017 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Thu Aug 3 14:50:39 2017 +0100
----------------------------------------------------------------------
.../kerberos/kerb/gss/impl/GssAcceptCred.java | 29 +++-----------------
.../kerberos/kerb/gss/impl/GssContext.java | 4 ---
2 files changed, 4 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/daa1771c/kerby-kerb/kerb-gssapi/src/main/java/org/apache/kerby/kerberos/kerb/gss/impl/GssAcceptCred.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-gssapi/src/main/java/org/apache/kerby/kerberos/kerb/gss/impl/GssAcceptCred.java b/kerby-kerb/kerb-gssapi/src/main/java/org/apache/kerby/kerberos/kerb/gss/impl/GssAcceptCred.java
index 7a361fc..d92af63 100644
--- a/kerby-kerb/kerb-gssapi/src/main/java/org/apache/kerby/kerberos/kerb/gss/impl/GssAcceptCred.java
+++ b/kerby-kerb/kerb-gssapi/src/main/java/org/apache/kerby/kerberos/kerb/gss/impl/GssAcceptCred.java
@@ -20,7 +20,6 @@
package org.apache.kerby.kerberos.kerb.gss.impl;
-import org.apache.kerby.kerberos.kerb.type.base.EncryptionKey;
import org.ietf.jgss.GSSException;
import org.ietf.jgss.GSSName;
@@ -28,14 +27,12 @@ import sun.security.jgss.GSSCaller;
import javax.security.auth.kerberos.KerberosKey;
import javax.security.auth.kerberos.KerberosPrincipal;
-import javax.security.auth.kerberos.KerberosTicket;
import javax.security.auth.kerberos.KeyTab;
import java.util.Set;
public final class GssAcceptCred extends GssCredElement {
private final KeyTab keyTab;
- private final KerberosTicket ticket;
private final Set<KerberosKey> kerberosKeySet;
public static GssAcceptCred getInstance(final GSSCaller caller,
@@ -43,20 +40,17 @@ public final class GssAcceptCred extends GssCredElement {
// Try to get a keytab first
KeyTab keyTab = getKeyTab(name);
- KerberosTicket ticket = null;
Set<KerberosKey> kerberosKeySet = null;
if (keyTab == null) {
- // Otherwise try to get a kerberos ticket
+ // Otherwise try to get a kerberos key
if (name == null) {
- ticket = CredUtils.getKerberosTicketFromContext(caller, null, null);
kerberosKeySet = CredUtils.getKerberosKeysFromContext(caller, null, null);
} else {
- ticket = CredUtils.getKerberosTicketFromContext(caller, name.getPrincipalName().getName(), null);
kerberosKeySet = CredUtils.getKerberosKeysFromContext(caller, name.getPrincipalName().getName(), null);
}
}
- if (keyTab == null && ticket == null && kerberosKeySet == null) {
+ if (keyTab == null && kerberosKeySet == null) {
String error = "Failed to find any Kerberos credential";
if (name != null) {
error += " for " + name.getPrincipalName().getName();
@@ -68,9 +62,6 @@ public final class GssAcceptCred extends GssCredElement {
if (keyTab != null) {
name = GssNameElement.getInstance(keyTab.getPrincipal().getName(),
GSSName.NT_HOSTBASED_SERVICE);
- } else if (ticket != null) {
- name = GssNameElement.getInstance(ticket.getClient().getName(),
- GSSName.NT_HOSTBASED_SERVICE);
} else if (kerberosKeySet != null) {
name = GssNameElement.getInstance(
kerberosKeySet.iterator().next().getPrincipal().getName(),
@@ -78,7 +69,7 @@ public final class GssAcceptCred extends GssCredElement {
}
}
- return new GssAcceptCred(caller, name, keyTab, ticket, lifeTime, kerberosKeySet);
+ return new GssAcceptCred(caller, name, keyTab, lifeTime, kerberosKeySet);
}
private static KeyTab getKeyTab(GssNameElement name) throws GSSException {
@@ -92,10 +83,9 @@ public final class GssAcceptCred extends GssCredElement {
}
private GssAcceptCred(GSSCaller caller, GssNameElement name, KeyTab keyTab,
- KerberosTicket ticket, int lifeTime, Set<KerberosKey> kerberosKeySet) {
+ int lifeTime, Set<KerberosKey> kerberosKeySet) {
super(caller, name);
this.keyTab = keyTab;
- this.ticket = ticket;
this.accLifeTime = lifeTime;
this.kerberosKeySet = kerberosKeySet;
}
@@ -112,10 +102,6 @@ public final class GssAcceptCred extends GssCredElement {
return this.keyTab;
}
- public KerberosTicket getKerberosTicket() {
- return ticket;
- }
-
public KerberosKey[] getKeys() {
KerberosPrincipal princ = new KerberosPrincipal(name.getPrincipalName().getName(),
name.getPrincipalName().getNameType().getValue());
@@ -126,13 +112,6 @@ public final class GssAcceptCred extends GssCredElement {
return null;
}
- public EncryptionKey getKeyFromTicket() {
- if (ticket != null) {
- return new EncryptionKey(ticket.getSessionKeyType(), ticket.getSessionKey().getEncoded());
- }
- return null;
- }
-
public KerberosKey[] getKerberosKeys() {
if (kerberosKeySet != null) {
return kerberosKeySet.toArray(new KerberosKey[kerberosKeySet.size()]);
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/daa1771c/kerby-kerb/kerb-gssapi/src/main/java/org/apache/kerby/kerberos/kerb/gss/impl/GssContext.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-gssapi/src/main/java/org/apache/kerby/kerberos/kerb/gss/impl/GssContext.java b/kerby-kerb/kerb-gssapi/src/main/java/org/apache/kerby/kerberos/kerb/gss/impl/GssContext.java
index 92e67d4..52abfc3 100644
--- a/kerby-kerb/kerb-gssapi/src/main/java/org/apache/kerby/kerberos/kerb/gss/impl/GssContext.java
+++ b/kerby-kerb/kerb-gssapi/src/main/java/org/apache/kerby/kerberos/kerb/gss/impl/GssContext.java
@@ -438,10 +438,6 @@ public class GssContext implements GSSContextSpi {
EncryptionKey serverKey = GssUtil.getEncryptionKey(acceptCred.getKerberosKeys(), encryptType, kvno);
if (serverKey == null) {
- // Get server key from ticket
- serverKey = acceptCred.getKeyFromTicket();
- }
- if (serverKey == null) {
// Otherwise get it from the keytab
serverKey = GssUtil.getEncryptionKey(acceptCred.getKeys(), encryptType, kvno);
}
[2/3] directory-kerby git commit: Change GssAcceptCred to return the
correction EncryptionKey
Posted by co...@apache.org.
Change GssAcceptCred to return the correction EncryptionKey
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/e23f0c9e
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/e23f0c9e
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/e23f0c9e
Branch: refs/heads/trunk
Commit: e23f0c9eb8a9466a146d4f65bbb697b85d5f244c
Parents: daa1771
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Thu Aug 3 15:11:42 2017 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Thu Aug 3 15:11:42 2017 +0100
----------------------------------------------------------------------
.../kerberos/kerb/gss/impl/GssAcceptCred.java | 26 +++++++++-----------
.../kerberos/kerb/gss/impl/GssContext.java | 7 +-----
.../kerby/kerberos/kerb/gss/impl/GssUtil.java | 12 +++++++++
3 files changed, 25 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/e23f0c9e/kerby-kerb/kerb-gssapi/src/main/java/org/apache/kerby/kerberos/kerb/gss/impl/GssAcceptCred.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-gssapi/src/main/java/org/apache/kerby/kerberos/kerb/gss/impl/GssAcceptCred.java b/kerby-kerb/kerb-gssapi/src/main/java/org/apache/kerby/kerberos/kerb/gss/impl/GssAcceptCred.java
index d92af63..de198d8 100644
--- a/kerby-kerb/kerb-gssapi/src/main/java/org/apache/kerby/kerberos/kerb/gss/impl/GssAcceptCred.java
+++ b/kerby-kerb/kerb-gssapi/src/main/java/org/apache/kerby/kerberos/kerb/gss/impl/GssAcceptCred.java
@@ -20,6 +20,7 @@
package org.apache.kerby.kerberos.kerb.gss.impl;
+import org.apache.kerby.kerberos.kerb.type.base.EncryptionKey;
import org.ietf.jgss.GSSException;
import org.ietf.jgss.GSSName;
@@ -62,7 +63,7 @@ public final class GssAcceptCred extends GssCredElement {
if (keyTab != null) {
name = GssNameElement.getInstance(keyTab.getPrincipal().getName(),
GSSName.NT_HOSTBASED_SERVICE);
- } else if (kerberosKeySet != null) {
+ } else {
name = GssNameElement.getInstance(
kerberosKeySet.iterator().next().getPrincipal().getName(),
GSSName.NT_HOSTBASED_SERVICE);
@@ -102,21 +103,18 @@ public final class GssAcceptCred extends GssCredElement {
return this.keyTab;
}
- public KerberosKey[] getKeys() {
- KerberosPrincipal princ = new KerberosPrincipal(name.getPrincipalName().getName(),
- name.getPrincipalName().getNameType().getValue());
- if (keyTab != null) {
- return keyTab.getKeys(princ);
- }
-
- return null;
- }
+ public EncryptionKey getEncryptionKey(int encryptType, int kvno) {
- public KerberosKey[] getKerberosKeys() {
if (kerberosKeySet != null) {
- return kerberosKeySet.toArray(new KerberosKey[kerberosKeySet.size()]);
+ KerberosKey[] keys = kerberosKeySet.toArray(new KerberosKey[kerberosKeySet.size()]);
+ // We don't check the kvno here - see DIRKRB-638
+ return GssUtil.getEncryptionKey(keys, encryptType);
}
- return null;
- }
+ // Otherwise get it from the keytab
+ KerberosPrincipal princ = new KerberosPrincipal(name.getPrincipalName().getName(),
+ name.getPrincipalName().getNameType().getValue());
+ KerberosKey[] keys = keyTab.getKeys(princ);
+ return GssUtil.getEncryptionKey(keys, encryptType, kvno);
+ }
}
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/e23f0c9e/kerby-kerb/kerb-gssapi/src/main/java/org/apache/kerby/kerberos/kerb/gss/impl/GssContext.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-gssapi/src/main/java/org/apache/kerby/kerberos/kerb/gss/impl/GssContext.java b/kerby-kerb/kerb-gssapi/src/main/java/org/apache/kerby/kerberos/kerb/gss/impl/GssContext.java
index 52abfc3..1300836 100644
--- a/kerby-kerb/kerb-gssapi/src/main/java/org/apache/kerby/kerberos/kerb/gss/impl/GssContext.java
+++ b/kerby-kerb/kerb-gssapi/src/main/java/org/apache/kerby/kerberos/kerb/gss/impl/GssContext.java
@@ -435,12 +435,7 @@ public class GssContext implements GSSContextSpi {
int kvno = apReq.getTicket().getEncryptedEncPart().getKvno();
int encryptType = apReq.getTicket().getEncryptedEncPart().getEType().getValue();
- EncryptionKey serverKey = GssUtil.getEncryptionKey(acceptCred.getKerberosKeys(), encryptType, kvno);
-
- if (serverKey == null) {
- // Otherwise get it from the keytab
- serverKey = GssUtil.getEncryptionKey(acceptCred.getKeys(), encryptType, kvno);
- }
+ EncryptionKey serverKey = acceptCred.getEncryptionKey(encryptType, kvno);
if (serverKey == null) {
throw new GSSException(GSSException.FAILURE, -1, "Server key not found");
}
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/e23f0c9e/kerby-kerb/kerb-gssapi/src/main/java/org/apache/kerby/kerberos/kerb/gss/impl/GssUtil.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-gssapi/src/main/java/org/apache/kerby/kerberos/kerb/gss/impl/GssUtil.java b/kerby-kerb/kerb-gssapi/src/main/java/org/apache/kerby/kerberos/kerb/gss/impl/GssUtil.java
index 08e47df..099c79b 100644
--- a/kerby-kerb/kerb-gssapi/src/main/java/org/apache/kerby/kerberos/kerb/gss/impl/GssUtil.java
+++ b/kerby-kerb/kerb-gssapi/src/main/java/org/apache/kerby/kerberos/kerb/gss/impl/GssUtil.java
@@ -348,6 +348,18 @@ public class GssUtil {
return null;
}
for (KerberosKey krbKey : krbKeys) {
+ if (krbKey.getKeyType() == encType && krbKey.getVersionNumber() == kvno && !krbKey.isDestroyed()) {
+ return new EncryptionKey(krbKey.getKeyType(), krbKey.getEncoded());
+ }
+ }
+ return null;
+ }
+
+ public static EncryptionKey getEncryptionKey(KerberosKey[] krbKeys, int encType) {
+ if (krbKeys == null) {
+ return null;
+ }
+ for (KerberosKey krbKey : krbKeys) {
if (krbKey.getKeyType() == encType && !krbKey.isDestroyed()) {
return new EncryptionKey(krbKey.getKeyType(), krbKey.getEncoded());
}
[3/3] directory-kerby git commit: Set the peer name for the GSSAccept
case
Posted by co...@apache.org.
Set the peer name for the GSSAccept case
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/337af9b7
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/337af9b7
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/337af9b7
Branch: refs/heads/trunk
Commit: 337af9b72accf789e80f7bc0736efa6146ba818c
Parents: e23f0c9
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Thu Aug 3 15:35:54 2017 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Thu Aug 3 15:35:54 2017 +0100
----------------------------------------------------------------------
.../java/org/apache/kerby/kerberos/kerb/gss/impl/GssContext.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/337af9b7/kerby-kerb/kerb-gssapi/src/main/java/org/apache/kerby/kerberos/kerb/gss/impl/GssContext.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-gssapi/src/main/java/org/apache/kerby/kerberos/kerb/gss/impl/GssContext.java b/kerby-kerb/kerb-gssapi/src/main/java/org/apache/kerby/kerberos/kerb/gss/impl/GssContext.java
index 1300836..138bdd2 100644
--- a/kerby-kerb/kerb-gssapi/src/main/java/org/apache/kerby/kerberos/kerb/gss/impl/GssContext.java
+++ b/kerby-kerb/kerb-gssapi/src/main/java/org/apache/kerby/kerberos/kerb/gss/impl/GssContext.java
@@ -439,6 +439,7 @@ public class GssContext implements GSSContextSpi {
if (serverKey == null) {
throw new GSSException(GSSException.FAILURE, -1, "Server key not found");
}
+ peerName = (GssNameElement) acceptCred.getName();
try {
ApRequest.validate(serverKey, apReq,