1 files changed, 29 insertions, 5 deletions

diff --git a/frontend/gamma/js/Clipperz/PM/Connection.js b/frontend/gamma/js/Clipperz/PM/Connection.js
index b4e8aaa..a05a310 100644
--- a/frontend/gamma/js/Clipperz/PM/Connection.js
+++ b/frontend/gamma/js/Clipperz/PM/Connection.js
@@ -20,48 +20,49 @@ refer to http://www.clipperz.com.
 * You should have received a copy of the GNU Affero General Public
   License along with Clipperz Community Edition.  If not, see
   <http://www.gnu.org/licenses/>.
 
 */
 
 if (typeof(Clipperz) == 'undefined') { Clipperz = {}; }
 if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; }
 
 //-----------------------------------------------------------------------------
 //
         //      Abstract   C O N N E C T I O N   class
 //
 //-----------------------------------------------------------------------------
 
 Clipperz.PM.Connection = function (args) {
         args = args || {};
 
         this._proxy = args.proxy || Clipperz.PM.Proxy.defaultProxy;
         this._getCredentialsFunction = args.getCredentialsFunction;
 
         this._clipperz_pm_crypto_version = null;
         this._connectionId = null;
         this._sharedSecret = null;
+        this._serverLockValue = null;
 
         return this;
 }
 
 Clipperz.PM.Connection.prototype = MochiKit.Base.update(null, {
 
         'toString': function() {
                 return "Connection [" + this.version() + "]";
         },
         
         //=========================================================================
 
         'version': function() {
                 throw Clipperz.Base.exception.AbstractMethod;
         },
         
         'clipperz_pm_crypto_version': function() {
                 if (this._clipperz_pm_crypto_version == null) {
                         var connectionVersions;
                                 varversions;
                                 varversion;
                         var i, c;
 
                         version = null;
@@ -125,48 +126,58 @@ MochiKit.Logging.logError("### Connection.defaultErrorHandler: " + anErrorString
         'serverSideUserCredentials': function() {
                 throw Clipperz.Base.exception.AbstractMethod;
         },
 
         //=========================================================================
 
         'sharedSecret': function () {
                 return this._sharedSecret;
         },
         
         'setSharedSecret': function (aValue) {
                 this._sharedSecret = aValue;
         },
 
         //-------------------------------------------------------------------------
 
         'connectionId': function() {
                 return this._connectionId;
         },
         
         'setConnectionId': function(aValue) {
                 this._connectionId = aValue;
         },
 
+        //-------------------------------------------------------------------------
+
+        'serverLockValue': function () {
+                return this._serverLockValue;
+        },
+        
+        'setServerLockValue': function (aValue) {
+                this._serverLockValue = aValue;
+        },
+
         //=========================================================================
 /*
         //TODO: ?????
         'oneTimePassword': function() {
                 return this._oneTimePassword;
         },
         
         'setOneTimePassword': function(aValue) {
                 this._oneTimePassword = aValue;
         },
 */
         //=========================================================================
 
         'reset': function() {
                 this.setSharedSecret(null);
                 this.setConnectionId(null);
         },
         
         //=========================================================================
         __syntaxFix__: "syntax fix"
 
 }
 );
 
@@ -299,55 +310,54 @@ Clipperz.PM.Connection.SRP['1.0'].prototype = MochiKit.Base.update(new Clipperz.
                 args = {
                         'message': 'oneTimePassword',
                         'version': Clipperz.PM.Connection.communicationProtocol.currentVersion,
                         'parameters': {
                                         'oneTimePasswordKey':           Clipperz.PM.DataModel.OneTimePassword.computeKeyWithUsernameAndPassword(someParameters['username'], normalizedOTP),
                                         'oneTimePasswordKeyChecksum':Clipperz.PM.DataModel.OneTimePassword.computeKeyChecksumWithUsernameAndPassword(someParameters['username'], normalizedOTP)
                         }
                 }
 
                 return Clipperz.Async.callbacks("Connction.redeemOTP", [
                         MochiKit.Base.method(this.proxy(), 'handshake', args),
                         function(aResult) {
                                 return Clipperz.PM.Crypto.deferredDecrypt({
                                                 value:aResult['data'],
                                                 key:normalizedOTP,
                                         version:aResult['version']
                                 });
                         },
                         function(aResult) {
                                 return (new Clipperz.ByteArray().appendBase64String(aResult['passphrase'])).asString();
                                 }               
                 ], {trace:false})
         },
 
-        'login': function(/*anUsername, aPassphrase*/) {
+        'login': function(isReconnecting) {
                         vardeferredResult;
                 var cryptoVersion;
                 var srpConnection;
 
                 cryptoVersion = this.clipperz_pm_crypto_version();
-
                 deferredResult = new Clipperz.Async.Deferred("Connection.login", {trace:false});
                 deferredResult.addCallback(this.getCredentialsFunction());
                 deferredResult.addMethod(this, 'normalizedCredentials');
         //      deferredResult.addCallbackPass(MochiKit.Signal.signal, this, 'updatedProgressState', 'connection_sendingCredentials');
                 deferredResult.addCallbackPass(MochiKit.Signal.signal, Clipperz.Signal.NotificationCenter, 'advanceProgress');
                 deferredResult.addCallback(MochiKit.Base.bind(function(someCredentials) {
                         srpConnection = new Clipperz.Crypto.SRP.Connection({ C:someCredentials['username'], P:someCredentials['password'], hash:this.hash() });
                 }, this));
                 deferredResult.addCallback(function() {
                         var result;
 
                         result = {
                                 message: 'connect',
                                 version: cryptoVersion,
                                 parameters: {
                                         C: srpConnection.C(),
                                         A: srpConnection.A().asString(16)
         //                                      reconnecting: this.connectionId()
                                 }
                         };
 
         //      TODO: ?????             
         //              if (isReconnecting == true) {
         //                      args.parameters['reconnecting'] = aConnection.connectionId();
@@ -378,100 +388,113 @@ Clipperz.PM.Connection.SRP['1.0'].prototype = MochiKit.Base.update(new Clipperz.
                         };
 
                         return result;
                 });
                 deferredResult.addMethod(this.proxy(), 'handshake');
                 deferredResult.addCallback(function(someParameters) {
                         var result;
 
                         if (someParameters['M2'] == srpConnection.M2()) {
                                 result = MochiKit.Async.succeed(someParameters);
                         } else {
                                 result = MochiKit.Async.fail(Clipperz.PM.Connection.exception.WrongChecksum);
                         }
 
                         return result;
                 });
                 deferredResult.addCallback(MochiKit.Base.bind(function(someParameters) {
                         this.setConnectionId(someParameters['connectionId']);
                         this.setSharedSecret(srpConnection.K());
                         
         //      TODO: ?????             
         //              if (this.oneTimePassword() != null) {
         ///     ??              result = this.user().oneTimePasswordManager().archiveOneTimePassword(this.oneTimePassword()));
         //              }
+
+                        if ((isReconnecting == true) && (this.serverLockValue() != someParameters['lock'])) {
+                                throw Clipperz.PM.Connection.exception.StaleData;
+                        } else {
+                                this.setServerLockValue(someParameters['lock']);
+                        }
+
                         return someParameters;
                 }, this));
         //      deferredResult.addCallbackPass(MochiKit.Signal.signal, this, 'updatedProgressState', 'connection_loggedIn');
                 deferredResult.addCallbackPass(MochiKit.Signal.signal, Clipperz.Signal.NotificationCenter, 'advanceProgress');
                 deferredResult.addCallback(MochiKit.Async.succeed, {result:"done"});
 
                 deferredResult.callback();
                 
                 return deferredResult;
         },
 
         //=========================================================================
 
         'logout': function() {
                 return Clipperz.Async.callbacks("Connection.logout", [
                         MochiKit.Base.method(this, 'setSharedSecret'),
                         MochiKit.Base.method(this.proxy(), 'logout', {})
                 ], {trace:false});
         },
 
         //=========================================================================
 
         'ping': function () {
                         //TODO: ping the server in order to have a valid session
         },
 
         //=========================================================================
 
         'message': function(aMessageName, someParameters) {
                 var args;
+                var parameters;
+
+                parameters = someParameters || {};
+                if (typeof(parameters['user']) != 'undefined') {
+                        parameters['user']['lock'] = this.serverLockValue();
+                }
 
 //console.log(">>> Connection.message", aMessageName, someParameters);
                 args = {
                         message: aMessageName,
                         srpSharedSecret: this.sharedSecret(),
-                        parameters: (someParameters || {})
+        //              parameters: (someParameters || {})
+                        parameters: parameters
                 }
 
                 return this.sendMessage(args);
         },
 
         //-------------------------------------------------------------------------
 
         'sendMessage': function(someArguments) {
                         vardeferredResult;
                 
                 deferredResult = new Clipperz.Async.Deferred("Connection.sendMessage", {trace:false});
                 deferredResult.addMethod(this.proxy(), 'message', someArguments);
                 deferredResult.addCallback(MochiKit.Base.bind(function(res) {
                         if (typeof(res['lock']) != 'undefined') {
-        //TODO: ?????
-        //      ??              this.user().setLock(res['lock']);
+                                this.setServerLockValue(res['lock']);
                         }
                         return res;
                 }, this));
 
                 deferredResult.addErrback(MochiKit.Base.method(this, 'messageExceptionHandler'), someArguments);
                 deferredResult.callback();
                 
                 return deferredResult
         },
         
         //-------------------------------------------------------------------------
 
         'messageExceptionHandler': function(anOriginalMessageArguments, anError) {
                 var result;
 
 console.log(">>> Connection.messageExceptionHandler", anError, anError.message);
                 if (anError instanceof MochiKit.Async.CancelledError) {
                         result = anError;
                 } else {
                                 if ((anError.message == 'Trying to communicate without an active connection')||
                                         (anError.message == 'No tollManager available for current session')     
                         ) {
                                 result = this.reestablishConnection(anOriginalMessageArguments);
                         } else if (anError.message == 'Session with stale data') {
@@ -566,48 +589,49 @@ Clipperz.PM.Connection.SRP['1.1'].prototype = MochiKit.Base.update(new Clipperz.
 
         'normalizedCredentials': function(someValues) {
                 var result;
                 
                 result = {}
                 result['username'] = this.hash()(new Clipperz.ByteArray(someValues['username'] + someValues['password'])).toHexString().substring(2);
                 result['password'] = this.hash()(new Clipperz.ByteArray(someValues['password'] + someValues['username'])).toHexString().substring(2);
 
                 return result;
         },
 
         //-----------------------------------------------------------------------------
 
         'hash': function() {
                 return Clipperz.PM.Crypto.encryptingFunctions.versions['0.2'].hash;
         },
 
         //-----------------------------------------------------------------------------
         __syntaxFix__: "syntax fix"
 
 });
 
 Clipperz.PM.Connection.exception = {
                 WrongChecksum:  new MochiKit.Base.NamedError("Clipperz.ByteArray.exception.InvalidValue"),
+                StaleData:              new MochiKit.Base.NamedError("Stale data"),
                 UnexpectedRequest:new MochiKit.Base.NamedError("Clipperz.ByteArray.exception.UnexpectedRequest")
 };
 
 
 Clipperz.PM.Connection.communicationProtocol = {
         'currentVersion': '0.2',
         'versions': {
                         '0.1': Clipperz.PM.Connection.SRP['1.0'],//Clipperz.Crypto.SRP.versions['1.0'].Connection,
                         '0.2': Clipperz.PM.Connection.SRP['1.1']//Clipperz.Crypto.SRP.versions['1.1'].Connection
         },
         'fallbackVersions': {
         //              'current':'0.1',
                         '0.2':  '0.1',
                         '0.1':  null
         }
 };
 
 MochiKit.Base.update(Clipperz.PM.Connection.communicationProtocol.versions, {
         'current': Clipperz.PM.Connection.communicationProtocol.versions[Clipperz.PM.Connection.communicationProtocol.currentVersion]
 });
 
 MochiKit.Base.update(Clipperz.PM.Connection.communicationProtocol.fallbackVersions, {
         'current': Clipperz.PM.Connection.communicationProtocol.fallbackVersions[Clipperz.PM.Connection.communicationProtocol.currentVersion]
 });