1 files changed, 14 insertions, 34 deletions

diff --git a/frontend/gamma/js/Clipperz/PM/Proxy/Proxy.Offline.DataStore.js b/frontend/gamma/js/Clipperz/PM/Proxy/Proxy.Offline.DataStore.js
index 01ba122..326022c 100644
--- a/frontend/gamma/js/Clipperz/PM/Proxy/Proxy.Offline.DataStore.js
+++ b/frontend/gamma/js/Clipperz/PM/Proxy/Proxy.Offline.DataStore.js
@@ -1,46 +1,44 @@
 /*
 
-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/.
 
 */
 
 try { if (typeof(Clipperz.PM.Proxy.Offline) == 'undefined') { throw ""; }} catch (e) {
         throw "Clipperz.PM.Proxy.Offline.DataStore depends on Clipperz.PM.Proxy.Offline!";
 }  
 
 //=============================================================================
 
 Clipperz.PM.Proxy.Offline.DataStore = function(args) {
         args = args || {};
         
         this._data = args.data || (typeof(_clipperz_dump_data_) != 'undefined' ? _clipperz_dump_data_ : null);
         this._isReadOnly = (typeof(args.readOnly) == 'undefined' ? true : args.readOnly);
         this._shouldPayTolls = args.shouldPayTolls || false;
 
         this._tolls = {};
         this._currentStaticConnection = null;
         
         return this;
 }
 
 Clipperz.Base.extend(Clipperz.PM.Proxy.Offline.DataStore, Object, {
 
@@ -86,64 +84,62 @@ Clipperz.Base.extend(Clipperz.PM.Proxy.Offline.DataStore, Object, {
 
         'setupWithEncryptedData': function(someData) {
                 this._data = Clipperz.Base.deepClone(someData);
         },
 
         //-------------------------------------------------------------------------
 
         'setupWithData': function(someData) {
                 var deferredResult;
                 var resultData;
                 var i, c;
 
 //Clipperz.log(">>> Proxy.Test.setupWithData");
                 resultData = this._data;
 
                 deferredResult = new Clipperz.Async.Deferred("Proxy.Test.seupWithData", {trace:false});
                 c = someData['users'].length;
 
                 for (i=0; i<c; i++) {
                                 varnewConnection;
                                 varrecordConfiguration;
 
                         deferredResult.addMethod(this, 'userSerializedEncryptedData', someData['users'][i]);
                         deferredResult.addCallback(MochiKit.Base.bind(function(aUserSerializationContext) {
-//console.log("SERIALIZED USER", aUserSerializationContext);
                                 resultData['users'][aUserSerializationContext['credentials']['C']] = {
                                                 's':    aUserSerializationContext['credentials']['s'],
                                                 'v':    aUserSerializationContext['credentials']['v'],
                                                 'version':                      aUserSerializationContext['data']['connectionVersion'],
                                                 'userDetails':          aUserSerializationContext['encryptedData']['user']['header'],
                                                 'userDetailsVersion':aUserSerializationContext['encryptedData']['user']['version'],
                                                 'statistics':           aUserSerializationContext['encryptedData']['user']['statistics'],
                                                 'lock':                                 aUserSerializationContext['encryptedData']['user']['lock'],
                                                 'records':                      this.rearrangeRecordsData(aUserSerializationContext['encryptedData']['records'])
                                 }
                         }, this));
                 }
                 
                 deferredResult.addCallback(MochiKit.Base.bind(function() {
-//console.log("this._data", resultData);
                         this._data = resultData;
                 }, this));
                 
                 deferredResult.callback();
 //Clipperz.log("<<< Proxy.Test.setupWithData");
 
                 return deferredResult;
         },
 
         //=========================================================================
 
         'getTollForRequestType': function (aRequestType) {
                         varresult;
                         vartargetValue;
                 var cost;
                 
                 targetValue = Clipperz.Crypto.PRNG.defaultRandomGenerator().getRandomBytes(32).toHexString().substring(2);
                 switch (aRequestType) {
                         case 'REGISTER':
                                 cost = 5;
                                 break;
                         case 'CONNECT':
                                 cost = 5;
                                 break;
@@ -374,49 +370,49 @@ Clipperz.Base.extend(Clipperz.PM.Proxy.Offline.DataStore, Object, {
                                                         result = {
                                                                         'data':         otpData['data'],
                                                                         'version':otpData['version']
                                                         }
 
                                                         otpData['status'] = 'REQUESTED';
                                                 } else {
                                                         otpData['status'] = 'DISABLED';
                                                         throw "The requested One Time Password has been disabled, due to a wrong keyChecksum";
                                                 }
                                         } else {
                                                 throw "The requested One Time Password was not active";
                                         }
                                 } else {
                                         throw "The requested One Time Password has not been found"
                                 }
                         } catch (exception) {
                                 result = {
                                                 'data':         Clipperz.PM.Crypto.randomKey(),
                                                 'version':Clipperz.PM.Connection.communicationProtocol.currentVersion
                                 }
                         }
                         nextTollRequestType = 'CONNECT';
                 } else {
-                        MochiKit.Logging.logError("Clipperz.PM.Proxy.Test.handshake - unhandled message: " + someParameters.message);
+                        Clipperz.logError("Clipperz.PM.Proxy.Test.handshake - unhandled message: " + someParameters.message);
                 }
 
                 result = {
                         result: result,
                         toll:   this.getTollForRequestType(nextTollRequestType)
                 }
 
                 return result;
         },
 
         //-------------------------------------------------------------------------
 
         '_message': function(aConnection, someParameters) {
                 var result;
 
                 result = {};
 
                 //=====================================================================
                 //
                         //              R       E       A       D       -       O       N       L       Y       M e t h o d s
                 //
                 //=====================================================================
                 if (someParameters.message == 'getUserDetails') {
                         var recordsStats;
@@ -504,215 +500,201 @@ Clipperz.Base.extend(Clipperz.PM.Proxy.Offline.DataStore, Object, {
                                         aConnection['C'] = credentials['C'];
 
                                         aConnection['userData']['s'] = credentials['s'];
                                         aConnection['userData']['v'] = credentials['v'];
                                         aConnection['userData']['version'] = credentials['version'];
 
                                         aConnection['userData']['userDetails'] = parameters['user']['header'];
                                         aConnection['userData']['userDetailsVersion'] = parameters['user']['version'];
                                         aConnection['userData']['statistics'] = parameters['user']['statistics'];
 
                                         aConnection['userData']['lock'] = parameters['user']['lock'];
                                         
                                         delete this.data()['users'][oldCValue];
 
                                         result = {result:"done", parameters:parameters};
                                 }
                         } else {
                                 throw Clipperz.PM.Proxy.Offline.DataStore.exception.ReadOnly;
                         }
                 //=====================================================================
         /*      } else if (someParameters.message == 'updateData') {
                         if (this.isReadOnly() == false) {
                                 var i, c;
 
-//console.log("###===============================================================");
-//console.log("###>>>", Clipperz.Base.serializeJSON(someParameters));
-//console.log("###--- userData", Clipperz.Base.serializeJSON(this.userData()));
                                         if (this.userData()['lock']!= someParameters['parameters']['user']['lock']) {
                                         throw "the lock attribute is not processed correctly"
                                 }
 
                                         this.userData()['userDetails']          = someParameters['parameters']['user']['header'];
                                         this.userData()['statistics']           = someParameters['parameters']['user']['statistics'];
                                         this.userData()['userDetailsVersions']= someParameters['parameters']['user']['version'];
 
                                 c = someParameters['parameters']['records'].length;
                                 for (i=0; i<c; i++) {
                                         var currentRecord;
                                         var currentRecordData;
 
                                         currentRecordData = someParameters['parameters']['records'][i];
                                         currentRecord = this.userData()['records'][currentRecordData['record']['reference']];
                                         
                                         if (currentRecord == null) {
                                         }
                                         
                                         currentRecord['data'] = currentRecordData['record']['data'];
                                         currentRecord['version'] = currentRecordData['record']['version'];
                                         currentRecord['currentVersion'] = currentRecordData['currentRecordVersion']['reference'];
                                         
                                         currentRecord['versions'][currentRecordData['currentRecordVersion']['reference']] = {
                                                         'data':                                 currentRecordData['currentRecordVersion']['data'],
                                                         'version':                      currentRecordData['currentRecordVersion']['version'],
                                                         'previousVersion':      currentRecordData['currentRecordVersion']['previousVersion'],
                                                         'previousVersionKey':currentRecordData['currentRecordVersion']['previousVersionKey']
                                         }
                                 }
 
                                 this.userData()['lock'] = Clipperz.PM.Crypto.randomKey();
                                 result['lock'] = this.userData()['lock'];
                                 result['result'] = 'done';
-//console.log("###<<< userData", Clipperz.Base.serializeJSON(this.userData()));
                         } else {
                                 throw Clipperz.PM.Proxy.Offline.DataStore.exception.ReadOnly;
                         }
         */      //=====================================================================
                 } else if (someParameters.message == 'saveChanges') {
                         if (this.isReadOnly() == false) {
                                 var i, c;
 
-//console.log("###===============================================================");
-//console.log("###>>>", someParameters);
-//console.log("###>>>", Clipperz.Base.serializeJSON(someParameters));
-//console.log("###--- userData", Clipperz.Base.serializeJSON(this.userData()));
-//console.log("###===============================================================");
-//console.log("--- userData.lock  ", this.userData()['lock']);
-//console.log("--- parameters.lock", someParameters['parameters']['user']['lock']);
                                         if (aConnection['userData']['lock']!= someParameters['parameters']['user']['lock']) {
                                         throw "the lock attribute is not processed correctly"
                                 }
 
                                         aConnection['userData']['userDetails']          = someParameters['parameters']['user']['header'];
                                         aConnection['userData']['statistics']           = someParameters['parameters']['user']['statistics'];
                                         aConnection['userData']['userDetailsVersions']= someParameters['parameters']['user']['version'];
 
                                 c = someParameters['parameters']['records']['updated'].length;
                                 for (i=0; i<c; i++) {
                                         var currentRecord;
                                         var currentRecordData;
 
                                         currentRecordData = someParameters['parameters']['records']['updated'][i];
                                         currentRecord = aConnection['userData']['records'][currentRecordData['record']['reference']];
 
                                         if (
                                                 (typeof(aConnection['userData']['records'][currentRecordData['record']['reference']]) == 'undefined')
                                                 &&
                                                 (typeof(currentRecordData['currentRecordVersion']) == 'undefined')
                                         ) {
-//console.log("######## SHIT HAPPENS");
                                                 throw "Record added without a recordVersion";
                                         }
 
                                         if (currentRecord == null) {
                                                 currentRecord = {};
                                                 currentRecord['versions'] = {};
                                                         currentRecord['creationDate']= Clipperz.PM.Date.formatDateWithUTCFormat(new Date());
                                                         currentRecord['accessDate']     = Clipperz.PM.Date.formatDateWithUTCFormat(new Date());
 
                                                 aConnection['userData']['records'][currentRecordData['record']['reference']] = currentRecord;
                                         }
                                         
                                                 currentRecord['data']   = currentRecordData['record']['data'];
                                                 currentRecord['version']= currentRecordData['record']['version'];
                                                 currentRecord['updateDate']= Clipperz.PM.Date.formatDateWithUTCFormat(new Date());
 
                                         if (typeof(currentRecordData['currentRecordVersion']) != 'undefined') {
                                                 currentRecord['currentVersion'] = currentRecordData['currentRecordVersion']['reference'];
                                                 currentRecord['versions'][currentRecordData['currentRecordVersion']['reference']] = {
                                                                 'data':                                 currentRecordData['currentRecordVersion']['data'],
                                                                 'version':                      currentRecordData['currentRecordVersion']['version'],
                                                                 'previousVersion':      currentRecordData['currentRecordVersion']['previousVersion'],
                                                                 'previousVersionKey':currentRecordData['currentRecordVersion']['previousVersionKey'],
                                                                 'creationDate':Clipperz.PM.Date.formatDateWithUTCFormat(new Date()),
                                                                 'updateDate':Clipperz.PM.Date.formatDateWithUTCFormat(new Date()),
                                                                 'accessDate':Clipperz.PM.Date.formatDateWithUTCFormat(new Date())
                                                 }
                                         }
                                 }
 
                                 c = someParameters['parameters']['records']['deleted'].length;
                                 for (i=0; i<c; i++) {
                                         var currentRecordReference;
 
                                         currentRecordReference = someParameters['parameters']['records']['deleted'][i];
-//console.log("DELETING records", currentRecordReference);
                                         delete aConnection['userData']['records'][currentRecordReference];
                                 }
 
                                 aConnection['userData']['lock'] = Clipperz.PM.Crypto.randomKey();
                                 result['lock'] = aConnection['userData']['lock'];
                                 result['result'] = 'done';
-//console.log("###<<< userData", Clipperz.Base.serializeJSON(this.userData()));
                         } else {
                                 throw Clipperz.PM.Proxy.Offline.DataStore.exception.ReadOnly;
                         }
 
                 //=====================================================================
                 //
                         //              U       N       H       A       N       D       L       E       D       M e t h o d
                 //
                 //=====================================================================
                 } else {
-                        MochiKit.Logging.logError("Clipperz.PM.Proxy.Test.message - unhandled message: " + someParameters.message);
+                        Clipperz.logError("Clipperz.PM.Proxy.Test.message - unhandled message: " + someParameters.message);
                 }
         
                 result = {
                         result: result,
                         toll:   this.getTollForRequestType('MESSAGE')
                 }
 
         //      return MochiKit.Async.succeed(result);
                 return result;
         },
 
         //-------------------------------------------------------------------------
 
         '_logout': function(someParameters) {
         //      return MochiKit.Async.succeed({result: 'done'});
                 return {result: 'done'};
         },
 
         //=========================================================================
         //#########################################################################
 
         'isTestData': function(aConnection) {
                 return (typeof(aConnection['userData']['__masterkey_test_value__']) != 'undefined');
         },
 
         'userDetails': function(aConnection) {
                 var result;
                 
                 if (this.isTestData(aConnection)) {
                         var serializedHeader;
                         var version;
 
-//MochiKit.Logging.logDebug("### test data");
+//Clipperz.logDebug("### test data");
                         version = aConnection['userData']['userDetailsVersion'];
                         serializedHeader = Clipperz.Base.serializeJSON(aConnection['userData']['userDetails']);
                         result = Clipperz.PM.Crypto.encryptingFunctions.versions[version].encrypt(aConnection['userData']['__masterkey_test_value__'], serializedHeader);
                 } else {
-//MochiKit.Logging.logDebug("### NOT test data");
+//Clipperz.logDebug("### NOT test data");
                         result = aConnection['userData']['userDetails'];
                 }
                 
                 return result;
         },
         
         'statistics': function(aConnection) {
                 var result;
 
                 if (aConnection['userData']['statistics'] != null) {
                         if (this.isTestData(aConnection)) {
                                 var serializedStatistics;
                                 var version;
 
                                 version = aConnection['userData']['userDetailsVersion'];
                                 serializedStatistics = Clipperz.Base.serializeJSON(aConnection['userData']['statistics']);
                                 result = Clipperz.PM.Crypto.encryptingFunctions.versions[version].encrypt(aConnection['userData']['__masterkey_test_value__'], serializedStatistics);
                         } else {
                                  result = aConnection['userData']['statistics'];
                         }
                 } else {
                         result = null;
                 }
                 
@@ -728,53 +710,51 @@ Clipperz.Base.extend(Clipperz.PM.Proxy.Offline.DataStore, Object, {
                 
                 deferredResult = new Clipperz.Async.Deferred('Proxy.Test.serializeUserEncryptedData', {trace:false});
                 deferredResult.addCallback(MochiKit.Base.bind(function(aDeferredContext) {
                         aDeferredContext['user'] = this.createUserUsingConfigurationData(aDeferredContext['data']);
                         return aDeferredContext;
                 }, this));
                 deferredResult.addCallback(function(aDeferredContext) {
         //              return aDeferredContext['user'].encryptedDataUsingVersion(aDeferredContext['data']['version']);
                         return aDeferredContext['user'].serializedDataUsingVersion(MochiKit.Base.values(aDeferredContext['user'].records()), aDeferredContext['data']['version']);
                 });
                 deferredResult.addCallback(function(aUserEncryptedData) {
                         deferredContext['encryptedData'] = aUserEncryptedData;
                         return deferredContext;
                 });
                 deferredResult.addCallback(function(aDeferredContext) {
                         var connection;
 
                         connection = new Clipperz.PM.Connection.communicationProtocol.versions[aDeferredContext['data']['connectionVersion']]()
                         aDeferredContext['credentials'] = connection.serverSideUserCredentials(aDeferredContext['user'].username(),aDeferredContext['user'].passphrase());
 
                         return aDeferredContext;
                 });
 
         //      deferredResult.addCallback(function(aDeferredContext) {
-//console.log("#-#-#-#-#", aDeferredContext);
         //              return aDeferredContext['user'].serializedDataUsingVersion(MochiKit.Base.values(aDeferredContext['user'].records()), aDeferredContext['data']['version']);
         //      }, deferredContext);
         //      deferredResult.addCallback(function(aUserSerializedData) {
-//console.log("USER SERIALIZED DATA", aUserSerializedData);
         //      });
 //
         //      deferredResult.addCallback(MochiKit.Async.succeed, deferredContext);
                 deferredResult.callback(deferredContext);
                 
                 return deferredResult;
         },
 
         'createUserUsingConfigurationData': function(someData) {
                 var result;
                 var user;
                 var recordLabel;
 
                 user = new Clipperz.PM.DataModel.User();
                 user.initForTests();
                 user.setUsername(someData['username']);
                 user.setPassphrase(someData['passphrase']);
 
                 for (recordLabel in someData['records']) {
                         var recordData;
                         var record;
                         var i, c;
                         
                         recordData = someData['records'][recordLabel];