1 files changed, 15 insertions, 18 deletions

diff --git a/frontend/gamma/js/Clipperz/PM/Connection.js b/frontend/gamma/js/Clipperz/PM/Connection.js
index a05a310..6a8f15e 100644
--- a/frontend/gamma/js/Clipperz/PM/Connection.js
+++ b/frontend/gamma/js/Clipperz/PM/Connection.js
@@ -1,137 +1,136 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * 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/>.
+  License along with Clipperz. 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;
                         connectionVersions = Clipperz.PM.Connection.communicationProtocol.versions;
                         versions = MochiKit.Base.keys(connectionVersions);
                         c = versions.length;
                         for (i=0; i<c; i++) {
                                 if (! (versions[i] == 'current')) {
                                         if (this instanceof connectionVersions[versions[i]]) {
                                                 version = versions[i];
                                         };
                                 }
                         }
                         
                         this._clipperz_pm_crypto_version = version;
                 }
                 
                 return this._clipperz_pm_crypto_version;
         },
 
         //-------------------------------------------------------------------------
 
         'defaultErrorHandler': function(anErrorString, anException) {
-MochiKit.Logging.logError("### Connection.defaultErrorHandler: " + anErrorString + " (" + anException + ")");
+        //      Clipperz.logError("### Connection.defaultErrorHandler: " + anErrorString, anException);
+                Clipperz.logError("### Connection.defaultErrorHandler: " + anErrorString + " (" + anException + ")");
         },
         
         //-------------------------------------------------------------------------
 
         'getCredentialsFunction': function () {
                 return this._getCredentialsFunction;
         },
 
         'normalizedCredentials': function(someValues) {
                 throw Clipperz.Base.exception.AbstractMethod;
         },
         
         //=========================================================================
 
         'proxy': function () {
                 return this._proxy;
         },
 
         //=========================================================================
 
         'register': function () {
                 throw Clipperz.Base.exception.AbstractMethod;
         },
 
         'login': function() {
                 throw Clipperz.Base.exception.AbstractMethod;
         },
 
         //-------------------------------------------------------------------------
 
         'message': function(someArguments, aCallback) {
                 throw Clipperz.Base.exception.AbstractMethod;
         },
 
         //-------------------------------------------------------------------------
 
         'serverSideUserCredentials': function() {
                 throw Clipperz.Base.exception.AbstractMethod;
         },
 
         //=========================================================================
 
         'sharedSecret': function () {
                 return this._sharedSecret;
         },
         
         'setSharedSecret': function (aValue) {
                 this._sharedSecret = aValue;
@@ -228,97 +227,96 @@ Clipperz.PM.Connection.SRP['1.0'].prototype = MochiKit.Base.update(new Clipperz.
                         ],
                                 'user':         MochiKit.Base.partial(MochiKit.Async.succeed, someUserData),
                                 'version':MochiKit.Base.partial(MochiKit.Async.succeed, Clipperz.PM.Connection.communicationProtocol.currentVersion),
                                 'message':MochiKit.Base.partial(MochiKit.Async.succeed, 'completeRegistration')
                 });
                 deferredResult.addCallbackPass(MochiKit.Signal.signal, Clipperz.Signal.NotificationCenter, 'advanceProgress');
                 deferredResult.addMethod(this.proxy(), 'registration');
                 deferredResult.addCallbackPass(MochiKit.Signal.signal, Clipperz.Signal.NotificationCenter, 'advanceProgress');
 
                 deferredResult.callback();
                 
                 return deferredResult;
         },
 
         //-------------------------------------------------------------------------
 
         'updateCredentials': function (aUsername, aPassphrase, someUserData) {
                         vardeferredResult;
 
                 deferredResult = new Clipperz.Async.Deferred("Connection.updateCredentials", {trace:false});
                 deferredResult.collectResults({
                         'credentials': [
                                 MochiKit.Base.method(this, 'normalizedCredentials', {username:aUsername, password:aPassphrase}),
                                 MochiKit.Base.bind(function(someCredentials) {
                                         var srpConnection;
                                         var result;
 
                                         srpConnection = new Clipperz.Crypto.SRP.Connection({ C:someCredentials['username'], P:someCredentials['password'], hash:this.hash() });
                                         result = srpConnection.serverSideCredentials();
                                         result['version'] = Clipperz.PM.Connection.communicationProtocol.currentVersion;
 
                                         return result;
                                 }, this)
                         ],
                                 'user':         MochiKit.Base.partial(MochiKit.Async.succeed, someUserData)
                 });
                 deferredResult.addCallbackPass(MochiKit.Signal.signal, Clipperz.Signal.NotificationCenter, 'advanceProgress');
                 deferredResult.addMethod(this, 'message', 'upgradeUserCredentials');
                 deferredResult.addCallbackPass(MochiKit.Signal.signal, Clipperz.Signal.NotificationCenter, 'advanceProgress');
                 deferredResult.callback();
                 
                 return deferredResult;
                 
         },
 
         //=========================================================================
 
         'redeemOneTimePassword': function (someParameters) {
-//console.log("Connections.redeemOneTimePassword", someParameters['username'], someParameters['password']);
 /*
         //=========================================================================
                         //LOGIN WITH PASSPHRASE, extracted from the TRUNK version (LoginPanel.js)
                 deferredResult.addCallback(function(anUsername, aOneTimePassword) {
                         var args;
                         
                         args = {
                                 'message': 'oneTimePassword',
                                 'version': Clipperz.PM.Crypto.communicationProtocol.currentVersion,
                                 'parameters': {
                                         'oneTimePasswordKey': Clipperz.PM.DataModel.OneTimePassword.computeKeyWithUsernameAndPassword(anUsername, aOneTimePassword),
                                         'oneTimePasswordKeyChecksum': Clipperz.PM.DataModel.OneTimePassword.computeKeyChecksumWithUsernameAndPassword(anUsername, aOneTimePassword)
                                 }
                         }
                         
                         return args;
                 }, anUsername, oneTimePassword);
                 deferredResult.addCallback(Clipperz.NotificationCenter.deferredNotification, this, 'updatedProgressState', 'OTP_login_loadingOTP');
                 deferredResult.addCallback(MochiKit.Base.method(Clipperz.PM.Proxy.defaultProxy, 'handshake'));
                 deferredResult.addCallback(Clipperz.NotificationCenter.deferredNotification, this, 'updatedProgressState', 'OTP_login_extractingPassphrase');
                 deferredResult.addCallback(function(aResult) {
                         return Clipperz.PM.Crypto.deferredDecrypt(oneTimePassword, aResult['data'], aResult['version']);
                 });
                 deferredResult.addCallback(function(aResult) {
                         return (new Clipperz.ByteArray().appendBase64String(aResult['passphrase'])).asString();
                 });
                 deferredResult.addMethod(this, 'doLoginWithUsernameAndPassphrase', anUsername),
 */
                 var args;
                 var normalizedOTP;
 
                 normalizedOTP = Clipperz.PM.DataModel.OneTimePassword.normalizedOneTimePassword(someParameters['password']);
 
                 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,
@@ -408,148 +406,147 @@ Clipperz.PM.Connection.SRP['1.0'].prototype = MochiKit.Base.update(new Clipperz.
         //      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: 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') {
                                 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);
+Clipperz.log(">>> Connection.messageExceptionHandler:  " + anError.message, anError);
                 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') {
                                 MochiKit.Signal.signal(this, 'EXCEPTION');
                         } else {
                                 result = anError;
                         }
                 }
-console.log("<<< Connection.messageExceptionHandler", anError)
-                
+Clipperz.log("<<< Connection.messageExceptionHandler")
+
                 return result;;
         },
         
         //=========================================================================
 
         'reestablishConnection': function(anOriginalMessageArguments) {
                 var deferredResult;
 
                 deferredResult = new Clipperz.Async.Deferred("Connection.reestablishConnection");
                 deferredResult.addMethod(this, 'reset');
                 deferredResult.addMethod(this, 'login', true);
                 deferredResult.addCallback(MochiKit.Base.bind(function(aMessage) {
                         aMessage['srpSharedSecret'] = this.sharedSecret();
                         return aMessage;
                 }, this), anOriginalMessageArguments);
                 deferredResult.addMethod(this, 'sendMessage');
                 deferredResult.addErrback(MochiKit.Signal.signal, this, 'EXCEPTION', null);
                 deferredResult.callback();
 
                 return deferredResult;
         },
 
         //=========================================================================
 
         'serverSideUserCredentials': function(aUsername, aPassword) {
                         varresult;
                         varnewSrpConnection;
                 var normalizedAttributes;
                 
                 normalizedAttributes = this.normalizedCredentials({username:aUsername, password:aPassword});
                 newSrpConnection = new Clipperz.Crypto.SRP.Connection({ C:normalizedAttributes['username'], P:normalizedAttributes['password'], hash:this.hash() });
                 result = newSrpConnection.serverSideCredentials();
                 result['version'] = this.clipperz_pm_crypto_version();
 
                 return result;
         },
 
         //=========================================================================
 
         'normalizedCredentials': function(someValues) {
                 var result;
 
                 result = {}
                 result['username'] = this.hash()(new Clipperz.ByteArray(someValues['username'])).toHexString().substring(2);
                 result['password'] = this.hash()(new Clipperz.ByteArray(someValues['password'] + someValues['username'])).toHexString().substring(2);
 
                 return result;
         },