IDEMPIERE-2944 Preserve iDempiere session between sucessive webservice calls

org.idempiere.webservices/WEB-INF/src/org/idempiere/adinterface/CompiereService.java

@@ -16,9 +16,13 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Timestamp;
 import java.text.SimpleDateFormat;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.Properties;
 import java.util.logging.Level;
 
+import javax.servlet.http.HttpServletRequest;
+
 import org.adempiere.util.ServerContext;
 import org.compiere.model.MSession;
 import org.compiere.model.MUser;
@@ -29,6 +33,7 @@ import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 import org.compiere.util.Language;
 import org.compiere.util.Login;
+import org.idempiere.adInterface.x10.ADLoginRequest;
 
 /**
  * @author deepak
@@ -46,6 +51,12 @@ public class CompiereService {
 	private int m_M_Warehouse_ID;
 	private String m_locale;
 	private String m_userName;
+	private String m_password;
+	private int m_expiryMinutes;
+	private long m_lastAuthorizationTime;
+	private String m_IPAddress;
+	private static Map<String,CompiereService> csMap = new HashMap<String, CompiereService>();
+	private static Map<String,Properties> ctxMap = new HashMap<String, Properties>();
 
 	private boolean m_loggedin = false; 
 	
@@ -131,12 +142,23 @@ public class CompiereService {
 	 */
 	public void disconnect() 
 	{
-		if (m_connected) 
+		// TODO: create a thread that checks expired connected compiereservices and log them out
-		{
+		if (! isExpired()) {
-			Env.logout();
+			// do not close, save session in cache
-			ServerContext.dispose();
+			if (! csMap.containsValue(this)) {
-			m_loggedin = false;
+				String key = getKey(m_AD_Client_ID,
-			m_connected = false;
+						m_AD_Org_ID,
+						m_userName,
+						m_AD_Role_ID,
+						m_M_Warehouse_ID,
+						m_locale,
+						m_password,
+						m_IPAddress);
+				csMap.put(key.toString(), this);
+				Properties savedCache = new Properties();
+				savedCache.putAll(Env.getCtx());
+				ctxMap.put(key.toString(), savedCache);
+			}
 		}
 	}
 	
@@ -328,4 +350,101 @@ public class CompiereService {
 		return m_userName;
 	}
 
+	/**
+	 * @return set password
+	 */
+	public void setPassword(String pass) {
+		m_password = pass;
+	}
+
+	/**
+	 * @return logged in password of current request
+	 */
+	public String getPassword() {
+		return m_password;
+	}
+
+	/**
+	 * @return set expiry minutes
+	 */
+	public void setExpiryMinutes(int expiryMinutes) {
+		m_expiryMinutes = expiryMinutes;
+	}
+
+	/**
+	 * @return logged in expiry minutes of current request
+	 */
+	public int getExpiryMinutes() {
+		return m_expiryMinutes;
+	}
+
+	public void refreshLastAuthorizationTime() {
+		m_lastAuthorizationTime = System.currentTimeMillis();
+	}
+
+	public void setIPAddress(String remoteAddr) {
+		m_IPAddress = remoteAddr;
+	}
+
+	public static CompiereService get(HttpServletRequest req, ADLoginRequest loginRequest) {
+		String key = getKey(loginRequest.getClientID(),
+				loginRequest.getOrgID(),
+				loginRequest.getUser(),
+				loginRequest.getRoleID(),
+				loginRequest.getWarehouseID(),
+				loginRequest.getLang(),
+				loginRequest.getPass(),
+				req.getRemoteAddr());
+		CompiereService l_cs = null;
+		if (csMap.containsKey(key)) {
+			l_cs = csMap.get(key);
+			if (l_cs != null) {
+				if (l_cs.isExpired()) {
+					l_cs = null;
+				} else {
+					Properties cachedCtx = ctxMap.get(key);
+					Env.getCtx().putAll(cachedCtx);
+				}
+			}
+		}
+		return l_cs;
+	}
+
+	private static String getKey(
+			int aD_Client_ID,
+			int aD_Org_ID,
+			String userName,
+			int aD_Role_ID,
+			int m_Warehouse_ID,
+			String locale,
+			String password,
+			String iPAddress) {
+		StringBuilder key = new StringBuilder()
+			.append(aD_Client_ID).append("|")
+			.append(aD_Org_ID).append("|")
+			.append(userName).append("|")
+			.append(aD_Role_ID).append("|")
+			.append(m_Warehouse_ID).append("|")
+			.append(locale).append("|")
+			.append(password).append("|")
+			.append(iPAddress);
+		return key.toString();
+	}
+	
+	private boolean isExpired() {
+		boolean expired =
+			   (
+				   (getExpiryMinutes() <= 0)
+				|| (m_lastAuthorizationTime + (getExpiryMinutes() * 60000) <= System.currentTimeMillis())
+			   );
+		if (m_connected && expired) 
+		{
+			Env.logout();
+			ServerContext.dispose();
+			m_loggedin = false;
+			m_connected = false;
+		}
+		return expired;
+	}
+
 }

org.idempiere.webservices/WEB-INF/src/org/idempiere/webservices/AbstractService.java

@@ -85,6 +85,16 @@ public class AbstractService {
 	protected String login(ADLoginRequest loginRequest, String webService, String method, String serviceType) {
 
 		CompiereService m_cs = getCompiereService();
+		if (m_cs.getUserName() == null) {
+			HttpServletRequest req = getHttpServletRequest();
+			// search for a non-expired CompiereService with same login data
+			CompiereService cachedCs = CompiereService.get(req, loginRequest);
+			if (cachedCs != null) {
+				m_cs = cachedCs;
+				req.setAttribute(COMPIERE_SERVICE, cachedCs);
+				return authenticate(webService, method, serviceType, cachedCs); // already logged with same data
+			}
+		}
 
 		if (m_cs.isLoggedIn() && m_cs.getAD_Client_ID() == loginRequest.getClientID() && loginRequest.getClientID() == Env.getAD_Client_ID(Env.getCtx())
 				&& m_cs.getAD_Org_ID() == loginRequest.getOrgID() && m_cs.getAD_Role_ID() == loginRequest.getRoleID()
@@ -99,6 +109,9 @@ public class AbstractService {
 		KeyNamePair[] clients = login.getClients(loginRequest.getUser(), loginRequest.getPass());
 		if (clients == null)
 			return "Error login - User invalid";
+		m_cs.setPassword(loginRequest.getPass());
+		m_cs.setExpiryMinutes(loginRequest.getStage());
+		m_cs.setIPAddress(getHttpServletRequest().getRemoteAddr());
 
 		boolean okclient = false;
 		KeyNamePair selectedClient = null;
@@ -249,6 +262,8 @@ public class AbstractService {
 		if(ret!=null && ret.length()>0)
 			return ret;
 
+		m_cs.refreshLastAuthorizationTime();
+
 		return null;
 	}