X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Fauth%2FHttpSessionLoginModule.java;h=d2f0fe738d751957b684925d67dfaf895403f829;hb=b257f54d9d6d3a7b181c76c0b74b0e780800faa7;hp=d3103627c294259f8d4218e3534f2a8d98ce89c1;hpb=89cd1a458823bbbbb1a5167a953f3d03ef1d2e05;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/auth/HttpSessionLoginModule.java b/org.argeo.cms/src/org/argeo/cms/auth/HttpSessionLoginModule.java
index d3103627c..d2f0fe738 100644
--- a/org.argeo.cms/src/org/argeo/cms/auth/HttpSessionLoginModule.java
+++ b/org.argeo.cms/src/org/argeo/cms/auth/HttpSessionLoginModule.java
@@ -20,7 +20,6 @@ import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.cms.CmsException;
-import org.argeo.naming.LdapAttrs;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.FrameworkUtil;
 import org.osgi.framework.InvalidSyntaxException;
@@ -178,21 +177,21 @@ public class HttpSessionLoginModule implements LoginModule {
 		}
 
 		// auth token
-//		String mail = request.getParameter(LdapAttrs.mail.name());
-//		String authPassword = request.getParameter(LdapAttrs.authPassword.name());
-//		if (authPassword != null) {
-//			sharedState.put(CmsAuthUtils.SHARED_STATE_PWD, authPassword);
-//			if (mail != null)
-//				sharedState.put(CmsAuthUtils.SHARED_STATE_NAME, mail);
-//		}
+		// String mail = request.getParameter(LdapAttrs.mail.name());
+		// String authPassword = request.getParameter(LdapAttrs.authPassword.name());
+		// if (authPassword != null) {
+		// sharedState.put(CmsAuthUtils.SHARED_STATE_PWD, authPassword);
+		// if (mail != null)
+		// sharedState.put(CmsAuthUtils.SHARED_STATE_NAME, mail);
+		// }
 	}
 
-	private X509Certificate[] extractClientCertificate(HttpServletRequest req) {
+	private void extractClientCertificate(HttpServletRequest req) {
 		X509Certificate[] certs = (X509Certificate[]) req.getAttribute("javax.servlet.request.X509Certificate");
 		if (null != certs && certs.length > 0) {
-			return certs;
+			sharedState.put(CmsAuthUtils.SHARED_STATE_NAME, certs[0].getSubjectX500Principal().getName());
+			sharedState.put(CmsAuthUtils.SHARED_STATE_CERTIFICATE_CHAIN, certs);
 		}
-		return null;
 	}
 
 }