From 8d11bd6d22e4631f07f26abd29b527b5aed1661f Mon Sep 17 00:00:00 2001 From: Rajith Muditha Attapattu Date: Tue, 12 Jan 2010 20:53:51 +0000 Subject: This is a fix for QPID-2174 I couldn't find any straight forward way to grab the proper ID from the SASL client. Therefore I had to use the java GSSAPI classes to create a security context to grab the ID. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@898505 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/qpid/transport/ClientDelegate.java | 51 ++++++++++++++++++++++ .../java/org/apache/qpid/transport/Connection.java | 15 ++++++- 2 files changed, 64 insertions(+), 2 deletions(-) (limited to 'java/common/src') diff --git a/java/common/src/main/java/org/apache/qpid/transport/ClientDelegate.java b/java/common/src/main/java/org/apache/qpid/transport/ClientDelegate.java index 934d8f2949..2f15ba1f15 100644 --- a/java/common/src/main/java/org/apache/qpid/transport/ClientDelegate.java +++ b/java/common/src/main/java/org/apache/qpid/transport/ClientDelegate.java @@ -34,6 +34,11 @@ import javax.security.sasl.SaslException; import org.apache.qpid.security.UsernamePasswordCallbackHandler; import org.apache.qpid.transport.util.Logger; +import org.ietf.jgss.GSSContext; +import org.ietf.jgss.GSSException; +import org.ietf.jgss.GSSManager; +import org.ietf.jgss.GSSName; +import org.ietf.jgss.Oid; /** @@ -45,6 +50,15 @@ public class ClientDelegate extends ConnectionDelegate { private static final Logger log = Logger.get(ClientDelegate.class); + private static final String KRB5_OID_STR = "1.2.840.113554.1.2.2"; + protected static Oid KRB5_OID; + + static { + try { + KRB5_OID = new Oid(KRB5_OID_STR); + } catch (GSSException ignore) {} + } + private String vhost; private String username; private String password; @@ -144,6 +158,11 @@ public class ClientDelegate extends ConnectionDelegate @Override public void connectionOpenOk(Connection conn, ConnectionOpenOk ok) { + SaslClient sc = conn.getSaslClient(); + if (sc.getMechanismName().equals("GSSAPI") && getUserID() != null) + { + conn.setUserID(getUserID()); + } conn.setState(OPEN); } @@ -203,4 +222,36 @@ public class ClientDelegate extends ConnectionDelegate } } + + private String getUserID() + { + log.debug("Obtaining userID from kerberos"); + String service = protocol + "@" + serverName; + GSSManager manager = GSSManager.getInstance(); + + try + { + GSSName acceptorName = manager.createName(service, + GSSName.NT_HOSTBASED_SERVICE, KRB5_OID); + + GSSContext secCtx = manager.createContext(acceptorName, + KRB5_OID, + null, + GSSContext.INDEFINITE_LIFETIME); + + secCtx.initSecContext(new byte[0], 0, 1); + + if (secCtx.getSrcName() != null) + { + return secCtx.getSrcName().toString(); + } + + } + catch (GSSException e) + { + log.warn("Unable to retrieve userID from Kerberos due to error",e); + } + + return null; + } } diff --git a/java/common/src/main/java/org/apache/qpid/transport/Connection.java b/java/common/src/main/java/org/apache/qpid/transport/Connection.java index 773746af79..7d0010f34d 100644 --- a/java/common/src/main/java/org/apache/qpid/transport/Connection.java +++ b/java/common/src/main/java/org/apache/qpid/transport/Connection.java @@ -85,7 +85,8 @@ public class Connection extends ConnectionInvoker private SaslClient saslClient; private long idleTimeout = 0; private String _authorizationID; - + private String userID; + // want to make this final private int _connectionId; @@ -173,7 +174,7 @@ public class Connection extends ConnectionInvoker synchronized (lock) { state = OPENING; - + userID = username; delegate = new ClientDelegate(vhost, username, password,saslMechs); IoTransport.connect(host, port, ConnectionBinding.get(this), ssl); @@ -544,6 +545,16 @@ public class Connection extends ConnectionInvoker { return _authorizationID; } + + public String getUserID() + { + return userID; + } + + public void setUserID(String id) + { + userID = id; + } public String toString() { -- cgit v1.2.1