X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Fauth%2FSpnegoLoginModule.java;h=a01daf6e0adef7228725ef66833a99d62d66aabb;hb=e023e9027edc0d734d11cb759259eaebb6d68bc9;hp=dad0dad4be64a0600fd3d3298e6a3e5c8761efa4;hpb=3d3c654c9d973c62ca22f1c9010bb2e7e1847d09;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/auth/SpnegoLoginModule.java b/org.argeo.cms/src/org/argeo/cms/auth/SpnegoLoginModule.java
index dad0dad4b..a01daf6e0 100644
--- a/org.argeo.cms/src/org/argeo/cms/auth/SpnegoLoginModule.java
+++ b/org.argeo.cms/src/org/argeo/cms/auth/SpnegoLoginModule.java
@@ -12,6 +12,7 @@ import org.argeo.cms.internal.runtime.CmsContextImpl;
 import org.ietf.jgss.GSSContext;
 import org.ietf.jgss.GSSException;
 import org.ietf.jgss.GSSManager;
+import org.ietf.jgss.GSSName;
 
 import com.sun.security.jgss.GSSUtil;
 
@@ -41,32 +42,20 @@ public class SpnegoLoginModule implements LoginModule {
 		if (gssContext == null)
 			return false;
 		else {
-//			if (!sharedState.containsKey(CmsAuthUtils.SHARED_STATE_NAME)) {
-//				try {
-//					GSSName name = gssContext.getSrcName();
-//					String username = name.toString();
-//					// TODO deal with connecting service
-//					// TODO generate IPA DN?
-//					username = username.substring(0, username.lastIndexOf('@'));
-//					sharedState.put(CmsAuthUtils.SHARED_STATE_NAME, username);
-//				} catch (GSSException e) {
-//					throw new IllegalStateException("Cannot retrieve SPNEGO name", e);
-//				}
-//			}
+			if (!sharedState.containsKey(CmsAuthUtils.SHARED_STATE_NAME)) {
+				try {
+					if (gssContext.getCredDelegState()) {
+						// commit will succeeed only if we have credential delegation
+						GSSName name = gssContext.getSrcName();
+						String username = name.toString();
+						sharedState.put(CmsAuthUtils.SHARED_STATE_NAME, username);
+					}
+				} catch (GSSException e) {
+					throw new IllegalStateException("Cannot retrieve SPNEGO name", e);
+				}
+			}
 			return true;
 		}
-		// try {
-		// String clientName = gssContext.getSrcName().toString();
-		// String role = clientName.substring(clientName.indexOf('@') + 1);
-		//
-		// log.debug("SpnegoUserRealm: established a security context");
-		// log.debug("Client Principal is: " + gssContext.getSrcName());
-		// log.debug("Server Principal is: " + gssContext.getTargName());
-		// log.debug("Client Default Role: " + role);
-		// } catch (GSSException e) {
-		// // TODO Auto-generated catch block
-		// e.printStackTrace();
-		// }
 	}
 
 	@Override
@@ -75,13 +64,12 @@ public class SpnegoLoginModule implements LoginModule {
 			return false;
 
 		try {
-//			Class<?> gssUtilsClass = Class.forName("com.sun.security.jgss.GSSUtil");
-//			Method createSubjectMethod = gssUtilsClass.getMethod("createSubject", GSSName.class, GSSCredential.class);
 			Subject gssSubject;
 			if (gssContext.getCredDelegState())
 				gssSubject = (Subject) GSSUtil.createSubject(gssContext.getSrcName(), gssContext.getDelegCred());
 			else
 				gssSubject = (Subject) GSSUtil.createSubject(gssContext.getSrcName(), null);
+			// without credential delegation we won't have access to the Kerberos key
 			subject.getPrincipals().addAll(gssSubject.getPrincipals());
 			subject.getPrivateCredentials().addAll(gssSubject.getPrivateCredentials());
 			return true;
@@ -122,8 +110,7 @@ public class SpnegoLoginModule implements LoginModule {
 	private GSSContext checkToken(byte[] authToken) {
 		GSSManager manager = GSSManager.getInstance();
 		try {
-			GSSContext gContext = manager.createContext(CmsContextImpl.getAcceptorCredentials());
-
+			GSSContext gContext = manager.createContext(CmsContextImpl.getCmsContext().getAcceptorCredentials());
 			if (gContext == null) {
 				log.debug("SpnegoUserRealm: failed to establish GSSContext");
 			} else {
@@ -143,8 +130,4 @@ public class SpnegoLoginModule implements LoginModule {
 
 	}
 
-	@Deprecated
-	public static boolean hasAcceptorCredentials() {
-		return CmsContextImpl.getAcceptorCredentials() != null;
-	}
 }