use the new session manager interface

git-svn-id: https://subversion.switch.ch/svn/shibboleth/java-idp/trunk@2155 ab3bd59b-922f-494d-bb5f-6f0a3c29deca

diff --git a/src/edu/internet2/middleware/shibboleth/idp/authn/AuthenticationManager.java b/src/edu/internet2/middleware/shibboleth/idp/authn/AuthenticationManager.java
index 3dbe8de..f07439d 100644 (file)
--- a/src/edu/internet2/middleware/shibboleth/idp/authn/AuthenticationManager.java
+++ b/src/edu/internet2/middleware/shibboleth/idp/authn/AuthenticationManager.java
@@ -17,6 +17,7 @@
 package edu.internet2.middleware.shibboleth.idp.authn;
 
 import java.io.IOException;
+import java.net.InetAddress;
 import java.util.List;
 import java.util.Map;
 
@@ -27,16 +28,14 @@ import javax.servlet.http.HttpSession;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import edu.internet2.middleware.shibboleth.idp.session.impl.AuthenticationMethodInformationImpl;
-
+import edu.internet2.middleware.shibboleth.common.session.SessionManager;
 import edu.internet2.middleware.shibboleth.idp.session.AuthenticationMethodInformation;
 import edu.internet2.middleware.shibboleth.idp.session.Session;
-import edu.internet2.middleware.shibboleth.idp.session.SessionManager;
+import edu.internet2.middleware.shibboleth.idp.session.impl.AuthenticationMethodInformationImpl;
 
 import javolution.util.FastMap;
 
 import org.apache.log4j.Logger;
-
 import org.springframework.web.servlet.HttpServletBean;
 
 
@@ -291,11 +290,22 @@ public class AuthenticationManager extends HttpServletBean {
         if (loginContext.getAuthenticationOK()) {
         
             AuthenticationMethodInformationImpl authMethodInfo =
-                new AuthenticationMethodInformationImpl(loginContext.getAuthenticationMethod(),
-                    loginContext.getAuthenticationInstant(), loginContext.getAuthenticationDuration());
+                new AuthenticationMethodInformationImpl(
+                    loginContext.getAuthenticationMethod(),
+                    loginContext.getAuthenticationInstant(),
+                    loginContext.getAuthenticationDuration());
         
-            Session shibSession = getSessionManager().createSession();
-            List<AuthenticationMethodInformation> authMethods = shibSession.getAuthenticationMethods();
+            InetAddress addr;
+            try {
+                addr = InetAddress.getByName(servletRequest.getRemoteAddr());
+            } catch (Exception ex) {
+                addr = null;
+            }
+            
+            Session shibSession = sessionMgr.createSession(addr,
+                    loginContext.getUserID());
+            List<AuthenticationMethodInformation> authMethods =
+                    shibSession.getAuthenticationMethods();
             authMethods.add(authMethodInfo);
             loginContext.setSessionID(shibSession.getSessionID());
         }