Index: lams_build/lib/lams/lams.jar
===================================================================
RCS file: /usr/local/cvsroot/lams_build/lib/lams/lams.jar,v
diff -u -r1.420.2.11 -r1.420.2.12
Binary files differ
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtServerOrgMap.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/Attic/ExtServerOrgMap.hbm.xml,v
diff -u -r1.6.2.2 -r1.6.2.3
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtServerOrgMap.hbm.xml	15 Oct 2014 07:48:47 -0000	1.6.2.2
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtServerOrgMap.hbm.xml	27 Nov 2014 12:25:50 -0000	1.6.2.3
@@ -125,6 +125,14 @@
             length="1"
             not-null="true"
         />
+        
+		<property
+            name="timeToLiveLoginRequest"
+            type="int"
+            update="true"
+            insert="true"
+            column="time_to_live_login_request"
+        />
 
         <many-to-one
             name="organisation"
Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040034.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_common/src/java/org/lamsfoundation/lams/integration/ExtServerOrgMap.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/integration/Attic/ExtServerOrgMap.java,v
diff -u -r1.6 -r1.6.2.1
--- lams_common/src/java/org/lamsfoundation/lams/integration/ExtServerOrgMap.java	25 Dec 2012 12:38:35 -0000	1.6
+++ lams_common/src/java/org/lamsfoundation/lams/integration/ExtServerOrgMap.java	27 Nov 2014 12:25:50 -0000	1.6.2.1
@@ -41,6 +41,9 @@
 
     /** persistent field */
     private Boolean disabled;
+    
+    /** persistent field */
+    private int timeToLiveLoginRequest;
 
     /** persistent field */
     private Organisation organisation;
@@ -51,44 +54,11 @@
     /** persistent field */
     private Set extUserUseridMaps;
 
-    /** full constructor */
-    public ExtServerOrgMap(String serverid, String serverkey, String servername, String serverdesc, String prefix,
-	    String userinfoUrl, String serverUrl, String timeoutUrl, Boolean disabled, Organisation organisation, Set extCourseClassMaps,
-	    Set extUserUseridMaps) {
-	this.serverid = serverid;
-	this.serverkey = serverkey;
-	this.servername = servername;
-	this.serverdesc = serverdesc;
-	this.prefix = prefix;
-	this.userinfoUrl = userinfoUrl;
-	this.serverUrl = serverUrl;
-	this.timeoutUrl = timeoutUrl;
-	this.disabled = disabled;
-	this.organisation = organisation;
-	this.extCourseClassMaps = extCourseClassMaps;
-	this.extUserUseridMaps = extUserUseridMaps;
-    }
-
     /** default constructor */
     public ExtServerOrgMap() {
+	timeToLiveLoginRequest = 80;
     }
 
-    /** minimal constructor */
-    public ExtServerOrgMap(String serverid, String serverkey, String servername, String prefix, String userinfoUrl,
-	    String timeoutUrl, Boolean disabled, Organisation organisation, Set extCourseClassMaps,
-	    Set extUserUseridMaps) {
-	this.serverid = serverid;
-	this.serverkey = serverkey;
-	this.servername = servername;
-	this.prefix = prefix;
-	this.userinfoUrl = userinfoUrl;
-	this.timeoutUrl = timeoutUrl;
-	this.disabled = disabled;
-	this.organisation = organisation;
-	this.extCourseClassMaps = extCourseClassMaps;
-	this.extUserUseridMaps = extUserUseridMaps;
-    }
-
     public Integer getSid() {
 	return this.sid;
     }
@@ -176,7 +146,20 @@
     public void setDisabled(Boolean disabled) {
 	this.disabled = disabled;
     }
+    
+    /**
+     * Measured in minutes.
+     * 
+     * @return
+     */
+    public int getTimeToLiveLoginRequest() {
+	return this.timeToLiveLoginRequest;
+    }
 
+    public void setTimeToLiveLoginRequest(int timeToLiveLoginRequest) {
+	this.timeToLiveLoginRequest = timeToLiveLoginRequest;
+    }
+
     public Organisation getOrganisation() {
 	return this.organisation;
     }
Index: lams_common/src/java/org/lamsfoundation/lams/integration/security/Authenticator.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/integration/security/Authenticator.java,v
diff -u -r1.4.24.1 -r1.4.24.2
--- lams_common/src/java/org/lamsfoundation/lams/integration/security/Authenticator.java	12 Sep 2014 21:00:53 -0000	1.4.24.1
+++ lams_common/src/java/org/lamsfoundation/lams/integration/security/Authenticator.java	27 Nov 2014 12:25:50 -0000	1.4.24.2
@@ -23,6 +23,8 @@
 
 package org.lamsfoundation.lams.integration.security;
 
+import java.util.Date;
+
 import org.lamsfoundation.lams.integration.ExtServerOrgMap;
 import org.lamsfoundation.lams.util.HashUtil;
 
@@ -47,6 +49,7 @@
      */
     public static void authenticate(ExtServerOrgMap map, String datetime, String username, String method,
 	    String hashValue) throws AuthenticationException {
+	
 	if (map == null) {
 	    throw new AuthenticationException("The third party server is not configured on LAMS server");
 	}
@@ -60,29 +63,53 @@
     }
 
     /**
-     * Checks hash. Differs from the method above (the one without lsid parameter) in a way that hash is expected to also
-     * contain lsidx: [ts + uid + method + lsid + serverID + serverKey]
+     * Checks hash for LoginRequest calls. Differs from the method above in a way that datetime is expected to contain
+     * real value and it must be quite recent one.
      * 
      * @param map
      * @param datetime
      * @param username
      * @param method
      * @param lsid
+     *            this parameter provided only if coming from learnerStrictAuth
      * @param hashValue
      * @throws AuthenticationException
      */
-    public static void authenticate(ExtServerOrgMap map, String datetime, String username, String method, String lsid,
-	    String hashValue) throws AuthenticationException {
+    public static void authenticateLoginRequest(ExtServerOrgMap map, String datetime, String username, String method,
+	    String lsid, String hashValue) throws AuthenticationException {
+
 	if (map == null) {
 	    throw new AuthenticationException("The third party server is not configured on LAMS server");
 	}
 	if (map.getDisabled()) {
 	    throw new AuthenticationException("The third party server is disabled");
 	}
 
-	String plaintext = datetime.toLowerCase().trim() + username.toLowerCase().trim() + method.toLowerCase().trim()
-		+ lsid.toLowerCase().trim() + map.getServerid().toLowerCase().trim()
-		+ map.getServerkey().toLowerCase().trim();
+	// check if datetime parameter is not too old
+	long datetimeParam;
+	try {
+	    datetimeParam = Long.parseLong(datetime);
+	} catch (NumberFormatException e) {
+	    throw new AuthenticationException("The third party server provided wrong format of datetime, datetime = "
+		    + datetime, e);
+	}
+
+	int timeToLiveLoginRequest = map.getTimeToLiveLoginRequest();
+	//sum up request time and maximum allowed request's time to live
+	Date requestTimePlusTimeToLive = new Date(datetimeParam + timeToLiveLoginRequest * 60 * 1000);
+	Date now = new Date();
+	if (requestTimePlusTimeToLive.before(now)) {
+	    throw new AuthenticationException("Login Request can't be older than " + timeToLiveLoginRequest
+		    + "minutes. Request time is: " + new Date(datetimeParam));
+	}
+
+	//learnerStrictAuth hash [ts + uid + method + lsid + serverID + serverKey]
+	//otherwise [ts + uid + method + serverID + serverKey]
+	String plaintext = (lsid == null) ? datetime.toLowerCase().trim() + username.toLowerCase().trim()
+		+ method.toLowerCase().trim() + map.getServerid().toLowerCase().trim()
+		+ map.getServerkey().toLowerCase().trim() : datetime.toLowerCase().trim()
+		+ username.toLowerCase().trim() + method.toLowerCase().trim() + lsid.toLowerCase().trim()
+		+ map.getServerid().toLowerCase().trim() + map.getServerkey().toLowerCase().trim();
 	checkHash(plaintext, hashValue);
     }