summaryrefslogtreecommitdiff
authorGiulio Cesare Solaroli <giulio.cesare@clipperz.com>2014-06-02 11:39:16 (UTC)
committer Giulio Cesare Solaroli <giulio.cesare@clipperz.com>2014-06-02 16:35:38 (UTC)
commit0422224521f62da210d1ae6ee15ecdf09f47f1f8 (patch) (unidiff)
treedf7c0394fbcd1f8bc588ca8aab3ee83f5dc9f0cf
parent7fdb41fa2b1f621636882ad9059c1f3ecfb74083 (diff)
downloadclipperz-0422224521f62da210d1ae6ee15ecdf09f47f1f8.zip
clipperz-0422224521f62da210d1ae6ee15ecdf09f47f1f8.tar.gz
clipperz-0422224521f62da210d1ae6ee15ecdf09f47f1f8.tar.bz2
Fixed authentication procedure for offline copy
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--frontend/beta/js/Clipperz/PM/Proxy/Proxy.Offline.DataStore.js47
-rw-r--r--frontend/delta/js/Clipperz/PM/Proxy/Proxy.Offline.LocalStorageDataStore.js27
-rw-r--r--frontend/gamma/js/Clipperz/PM/Proxy/Proxy.Offline.DataStore.js35
3 files changed, 83 insertions, 26 deletions
diff --git a/frontend/beta/js/Clipperz/PM/Proxy/Proxy.Offline.DataStore.js b/frontend/beta/js/Clipperz/PM/Proxy/Proxy.Offline.DataStore.js
index 1a5caff..b0b9b63 100644
--- a/frontend/beta/js/Clipperz/PM/Proxy/Proxy.Offline.DataStore.js
+++ b/frontend/beta/js/Clipperz/PM/Proxy/Proxy.Offline.DataStore.js
@@ -1,752 +1,779 @@
1/* 1/*
2 2
3Copyright 2008-2013 Clipperz Srl 3Copyright 2008-2013 Clipperz Srl
4 4
5This file is part of Clipperz, the online password manager. 5This file is part of Clipperz, the online password manager.
6For further information about its features and functionalities please 6For further information about its features and functionalities please
7refer to http://www.clipperz.com. 7refer to http://www.clipperz.com.
8 8
9* Clipperz is free software: you can redistribute it and/or modify it 9* Clipperz is free software: you can redistribute it and/or modify it
10 under the terms of the GNU Affero General Public License as published 10 under the terms of the GNU Affero General Public License as published
11 by the Free Software Foundation, either version 3 of the License, or 11 by the Free Software Foundation, either version 3 of the License, or
12 (at your option) any later version. 12 (at your option) any later version.
13 13
14* Clipperz is distributed in the hope that it will be useful, but 14* Clipperz is distributed in the hope that it will be useful, but
15 WITHOUT ANY WARRANTY; without even the implied warranty of 15 WITHOUT ANY WARRANTY; without even the implied warranty of
16 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. 16 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
17 See the GNU Affero General Public License for more details. 17 See the GNU Affero General Public License for more details.
18 18
19* You should have received a copy of the GNU Affero General Public 19* You should have received a copy of the GNU Affero General Public
20 License along with Clipperz. If not, see http://www.gnu.org/licenses/. 20 License along with Clipperz. If not, see http://www.gnu.org/licenses/.
21 21
22*/ 22*/
23 23
24try { if (typeof(Clipperz.PM.Proxy.Offline) == 'undefined') { throw ""; }} catch (e) { 24try { if (typeof(Clipperz.PM.Proxy.Offline) == 'undefined') { throw ""; }} catch (e) {
25 throw "Clipperz.PM.Proxy.Offline.DataStore depends on Clipperz.PM.Proxy.Offline!"; 25 throw "Clipperz.PM.Proxy.Offline.DataStore depends on Clipperz.PM.Proxy.Offline!";
26} 26}
27 27
28//============================================================================= 28//=============================================================================
29 29
30Clipperz.PM.Proxy.Offline.DataStore = function(args) { 30Clipperz.PM.Proxy.Offline.DataStore = function(args) {
31 args = args || {}; 31 args = args || {};
32 32
33 this._data = args.data || (typeof(_clipperz_dump_data_) != 'undefined' ? _clipperz_dump_data_ : null); 33 this._data = args.data || (typeof(_clipperz_dump_data_) != 'undefined' ? _clipperz_dump_data_ : null);
34 this._isReadOnly = (typeof(args.readOnly) == 'undefined' ? true : args.readOnly); 34 this._isReadOnly = (typeof(args.readOnly) == 'undefined' ? true : args.readOnly);
35 this._shouldPayTolls = args.shouldPayTolls || false; 35 this._shouldPayTolls = args.shouldPayTolls || false;
36 36
37 this._tolls = {}; 37 this._tolls = {};
38 this._connections = {}; 38 this._connections = {};
39 39
40 this._C = null;
40 this._b = null; 41 this._b = null;
41 this._B = null; 42 this._B = null;
42 this._A = null; 43 this._A = null;
43 this._userData = null; 44 this._userData = null;
44 45
45 return this; 46 return this;
46} 47}
47 48
48//Clipperz.Base.extend(Clipperz.PM.Proxy.Offline.DataStore, Object, { 49//Clipperz.Base.extend(Clipperz.PM.Proxy.Offline.DataStore, Object, {
49Clipperz.PM.Proxy.Offline.DataStore.prototype = MochiKit.Base.update(null, { 50Clipperz.PM.Proxy.Offline.DataStore.prototype = MochiKit.Base.update(null, {
50 51
51 //------------------------------------------------------------------------- 52 //-------------------------------------------------------------------------
52 53
53 'isReadOnly': function () { 54 'isReadOnly': function () {
54 return this._isReadOnly; 55 return this._isReadOnly;
55 }, 56 },
56 57
57 //------------------------------------------------------------------------- 58 //-------------------------------------------------------------------------
58 59
59 'shouldPayTolls': function() { 60 'shouldPayTolls': function() {
60 return this._shouldPayTolls; 61 return this._shouldPayTolls;
61 }, 62 },
62 63
63 //------------------------------------------------------------------------- 64 //-------------------------------------------------------------------------
64 65
65 'data': function () { 66 'data': function () {
66 return this._data; 67 return this._data;
67 }, 68 },
68 69
69 //------------------------------------------------------------------------- 70 //-------------------------------------------------------------------------
70 71
71 'tolls': function () { 72 'tolls': function () {
72 return this._tolls; 73 return this._tolls;
73 }, 74 },
74 75
75 //------------------------------------------------------------------------- 76 //-------------------------------------------------------------------------
76 77
77 'connections': function () { 78 'connections': function () {
78 return this._connections; 79 return this._connections;
79 }, 80 },
80 81
81 //========================================================================= 82 //=========================================================================
82 83
83 'resetData': function() { 84 'resetData': function() {
84 this._data = { 85 this._data = {
85 'users': { 86 'users': {
86 'catchAllUser': { 87 'catchAllUser': {
87 __masterkey_test_value__: 'masterkey', 88 __masterkey_test_value__: 'masterkey',
88 s: '112233445566778899aabbccddeeff00112233445566778899aabbccddeeff00', 89 s: '112233445566778899aabbccddeeff00112233445566778899aabbccddeeff00',
89 v: '112233445566778899aabbccddeeff00112233445566778899aabbccddeeff00' 90 v: '112233445566778899aabbccddeeff00112233445566778899aabbccddeeff00'
90 } 91 }
91 } 92 }
92 }; 93 };
93 }, 94 },
94 95
95 //------------------------------------------------------------------------- 96 //-------------------------------------------------------------------------
96 97
97 'setupWithEncryptedData': function(someData) { 98 'setupWithEncryptedData': function(someData) {
98 this._data = Clipperz.Base.deepClone(someData); 99 this._data = Clipperz.Base.deepClone(someData);
99 }, 100 },
100 101
101 //------------------------------------------------------------------------- 102 //-------------------------------------------------------------------------
102 103
103 'setupWithData': function(someData) { 104 'setupWithData': function(someData) {
104 var deferredResult; 105 var deferredResult;
105 var resultData; 106 var resultData;
106 var i, c; 107 var i, c;
107 108
108//Clipperz.log(">>> Proxy.Test.setupWithData"); 109//Clipperz.log(">>> Proxy.Test.setupWithData");
109 resultData = this._data; 110 resultData = this._data;
110 111
111 deferredResult = new MochiKit.Async.Deferred(); 112 deferredResult = new MochiKit.Async.Deferred();
112 c = someData['users'].length; 113 c = someData['users'].length;
113 114
114 for (i=0; i<c; i++) { 115 for (i=0; i<c; i++) {
115 varnewConnection; 116 varnewConnection;
116 varrecordConfiguration; 117 varrecordConfiguration;
117 118
118 deferredResult.addCallback(MochiKit.Base.method(this, 'userSerializedEncryptedData', someData['users'][i])); 119 deferredResult.addCallback(MochiKit.Base.method(this, 'userSerializedEncryptedData', someData['users'][i]));
119 deferredResult.addCallback(MochiKit.Base.bind(function(aUserSerializationContext) { 120 deferredResult.addCallback(MochiKit.Base.bind(function(aUserSerializationContext) {
120//console.log("SERIALIZED USER", aUserSerializationContext); 121//console.log("SERIALIZED USER", aUserSerializationContext);
121 resultData['users'][aUserSerializationContext['credentials']['C']] = { 122 resultData['users'][aUserSerializationContext['credentials']['C']] = {
122 's': aUserSerializationContext['credentials']['s'], 123 's': aUserSerializationContext['credentials']['s'],
123 'v': aUserSerializationContext['credentials']['v'], 124 'v': aUserSerializationContext['credentials']['v'],
124 'version': aUserSerializationContext['data']['connectionVersion'], 125 'version': aUserSerializationContext['data']['connectionVersion'],
125 'userDetails': aUserSerializationContext['encryptedData']['user']['header'], 126 'userDetails': aUserSerializationContext['encryptedData']['user']['header'],
126 'userDetailsVersion':aUserSerializationContext['encryptedData']['user']['version'], 127 'userDetailsVersion':aUserSerializationContext['encryptedData']['user']['version'],
127 'statistics': aUserSerializationContext['encryptedData']['user']['statistics'], 128 'statistics': aUserSerializationContext['encryptedData']['user']['statistics'],
128 'lock': aUserSerializationContext['encryptedData']['user']['lock'], 129 'lock': aUserSerializationContext['encryptedData']['user']['lock'],
129 'records': this.rearrangeRecordsData(aUserSerializationContext['encryptedData']['records']) 130 'records': this.rearrangeRecordsData(aUserSerializationContext['encryptedData']['records'])
130 } 131 }
131 }, this)); 132 }, this));
132 } 133 }
133 134
134 deferredResult.addCallback(MochiKit.Base.bind(function() { 135 deferredResult.addCallback(MochiKit.Base.bind(function() {
135//console.log("this._data", resultData); 136//console.log("this._data", resultData);
136 this._data = resultData; 137 this._data = resultData;
137 }, this)); 138 }, this));
138 139
139 deferredResult.callback(); 140 deferredResult.callback();
140//Clipperz.log("<<< Proxy.Test.setupWithData"); 141//Clipperz.log("<<< Proxy.Test.setupWithData");
141 142
142 return deferredResult; 143 return deferredResult;
143 }, 144 },
144 145
145 //========================================================================= 146 //=========================================================================
146 147
148 'C': function() {
149 return this._C;
150 },
151
152 'set_C': function(aValue) {
153 this._C = aValue;
154 },
155
156 //-------------------------------------------------------------------------
157
147 'b': function() { 158 'b': function() {
148 return this._b; 159 return this._b;
149 }, 160 },
150 161
151 'set_b': function(aValue) { 162 'set_b': function(aValue) {
152 this._b = aValue; 163 this._b = aValue;
153 }, 164 },
154 165
155 //------------------------------------------------------------------------- 166 //-------------------------------------------------------------------------
156 167
157 'B': function() { 168 'B': function() {
158 return this._B; 169 return this._B;
159 }, 170 },
160 171
161 'set_B': function(aValue) { 172 'set_B': function(aValue) {
162 this._B = aValue; 173 this._B = aValue;
163 }, 174 },
164 175
165 //------------------------------------------------------------------------- 176 //-------------------------------------------------------------------------
166 177
167 'A': function() { 178 'A': function() {
168 return this._A; 179 return this._A;
169 }, 180 },
170 181
171 'set_A': function(aValue) { 182 'set_A': function(aValue) {
172 this._A = aValue; 183 this._A = aValue;
173 }, 184 },
174 185
175 //------------------------------------------------------------------------- 186 //-------------------------------------------------------------------------
176 187
177 'userData': function() { 188 'userData': function() {
178 return this._userData; 189 return this._userData;
179 }, 190 },
180 191
181 'setUserData': function(aValue) { 192 'setUserData': function(aValue) {
182 this._userData = aValue; 193 this._userData = aValue;
183 }, 194 },
184 195
185 //========================================================================= 196 //=========================================================================
186 197
187 'getTollForRequestType': function (aRequestType) { 198 'getTollForRequestType': function (aRequestType) {
188 varresult; 199 varresult;
189 vartargetValue; 200 vartargetValue;
190 var cost; 201 var cost;
191 202
192 targetValue = Clipperz.Crypto.PRNG.defaultRandomGenerator().getRandomBytes(32).toHexString().substring(2); 203 targetValue = Clipperz.Crypto.PRNG.defaultRandomGenerator().getRandomBytes(32).toHexString().substring(2);
193 switch (aRequestType) { 204 switch (aRequestType) {
194 case 'REGISTER': 205 case 'REGISTER':
195 cost = 5; 206 cost = 5;
196 break; 207 break;
197 case 'CONNECT': 208 case 'CONNECT':
198 cost = 5; 209 cost = 5;
199 break; 210 break;
200 case 'MESSAGE': 211 case 'MESSAGE':
201 cost = 2; 212 cost = 2;
202 break; 213 break;
203 } 214 }
204 215
205 result = { 216 result = {
206 requestType: aRequestType, 217 requestType: aRequestType,
207 targetValue: targetValue, 218 targetValue: targetValue,
208 cost: cost 219 cost: cost
209 } 220 }
210 221
211 if (this.shouldPayTolls()) { 222 if (this.shouldPayTolls()) {
212 this.tolls()[targetValue] = result; 223 this.tolls()[targetValue] = result;
213 } 224 }
214 225
215 return result; 226 return result;
216 }, 227 },
217 228
218 //------------------------------------------------------------------------- 229 //-------------------------------------------------------------------------
219 230
220 'checkToll': function (aFunctionName, someParameters) { 231 'checkToll': function (aFunctionName, someParameters) {
221 if (this.shouldPayTolls()) { 232 if (this.shouldPayTolls()) {
222 var localToll; 233 var localToll;
223 vartollParameters; 234 vartollParameters;
224 235
225 tollParameters = someParameters['toll']; 236 tollParameters = someParameters['toll'];
226 localToll = this.tolls()[tollParameters['targetValue']]; 237 localToll = this.tolls()[tollParameters['targetValue']];
227 238
228 if (localToll != null) { 239 if (localToll != null) {
229 if (! Clipperz.PM.Toll.validate(tollParameters['targetValue'], tollParameters['toll'], localToll['cost'])) { 240 if (! Clipperz.PM.Toll.validate(tollParameters['targetValue'], tollParameters['toll'], localToll['cost'])) {
230 throw "Toll value too low."; 241 throw "Toll value too low.";
231 }; 242 };
232 } else { 243 } else {
233 throw "Missing toll"; 244 throw "Missing toll";
234 } 245 }
235 } 246 }
236 }, 247 },
237 248
238 //========================================================================= 249 //=========================================================================
239 250
240 'processMessage': function(aFunctionName, someParameters) { 251 'processMessage': function (aFunctionName, someParameters) {
241 var result; 252 var result;
242 253
243 switch(aFunctionName) { 254 switch(aFunctionName) {
244 case 'knock': 255 case 'knock':
245 result = this._knock(someParameters); 256 result = this._knock(someParameters);
246 break; 257 break;
247 case 'registration': 258 case 'registration':
248 this.checkToll(aFunctionName, someParameters); 259 this.checkToll(aFunctionName, someParameters);
249 result = this._registration(someParameters.parameters); 260 result = this._registration(someParameters.parameters);
250 break; 261 break;
251 case 'handshake': 262 case 'handshake':
252 this.checkToll(aFunctionName, someParameters); 263 this.checkToll(aFunctionName, someParameters);
253 result = this._handshake(someParameters.parameters); 264 result = this._handshake(someParameters.parameters);
254 break; 265 break;
255 case 'message': 266 case 'message':
256 this.checkToll(aFunctionName, someParameters); 267 this.checkToll(aFunctionName, someParameters);
257 result = this._message(someParameters.parameters); 268 result = this._message(someParameters.parameters);
258 break; 269 break;
259 case 'logout': 270 case 'logout':
260 result = this._logout(someParameters.parameters); 271 result = this._logout(someParameters.parameters);
261 break; 272 break;
262 } 273 }
263 274
264 return result; 275 return result;
265 }, 276 },
266 277
267 //========================================================================= 278 //=========================================================================
268 279
269 '_knock': function(someParameters) { 280 '_knock': function(someParameters) {
270 var result; 281 var result;
271 282
272 result = { 283 result = {
273 toll: this.getTollForRequestType(someParameters['requestType']) 284 toll: this.getTollForRequestType(someParameters['requestType'])
274 // toll: { 285 // toll: {
275 // requestType: someParameters['requestType'], 286 // requestType: someParameters['requestType'],
276 // targetValue: "3a1ba0be23580f902885c6c8a6b035e228ed1ca74d77de5f9bb0e0c899f07cfe", 287 // targetValue: "3a1ba0be23580f902885c6c8a6b035e228ed1ca74d77de5f9bb0e0c899f07cfe",
277 // cost: 288 // cost:
278 // } 289 // }
279 } 290 }
280 291
281 return result; 292 return result;
282 }, 293 },
283 294
284 //------------------------------------------------------------------------- 295 //-------------------------------------------------------------------------
285 296
286 '_registration': function(someParameters) { 297 '_registration': function(someParameters) {
287//console.log("_registration", someParameters); 298//console.log("_registration", someParameters);
288 if (this.isReadOnly() == false) { 299 if (this.isReadOnly() == false) {
289 if (typeof(this.data()['users'][someParameters['credentials']['C']]) == 'undefined') { 300 if (typeof(this.data()['users'][someParameters['credentials']['C']]) == 'undefined') {
290 this.data()['users'][someParameters['credentials']['C']] = { 301 this.data()['users'][someParameters['credentials']['C']] = {
291 's': someParameters['credentials']['s'], 302 's': someParameters['credentials']['s'],
292 'v': someParameters['credentials']['v'], 303 'v': someParameters['credentials']['v'],
293 'version':someParameters['credentials']['version'], 304 'version':someParameters['credentials']['version'],
294 // 'lock': someParameters['user']['lock'], 305 // 'lock': someParameters['user']['lock'],
295 'lock': Clipperz.Crypto.Base.generateRandomSeed(), 306 'lock': Clipperz.Crypto.Base.generateRandomSeed(),
296 // 'maxNumberOfRecords':'100', 307 // 'maxNumberOfRecords':'100',
297 'userDetails': someParameters['user']['header'], 308 'userDetails': someParameters['user']['header'],
298 'statistics': someParameters['user']['statistics'], 309 'statistics': someParameters['user']['statistics'],
299 'userDetailsVersion':someParameters['user']['version'], 310 'userDetailsVersion':someParameters['user']['version'],
300 'records':{} 311 'records':{}
301 } 312 }
302 } else { 313 } else {
303 throw "user already exists"; 314 throw "user already exists";
304 } 315 }
305 } else { 316 } else {
306 throw Clipperz.PM.Proxy.Offline.DataStore.exception.ReadOnly; 317 throw Clipperz.PM.Proxy.Offline.DataStore.exception.ReadOnly;
307 } 318 }
308 319
309 result = { 320 result = {
310 result: { 321 result: {
311 'lock': this.data()['users'][someParameters['credentials']['C']]['lock'], 322 'lock': this.data()['users'][someParameters['credentials']['C']]['lock'],
312 'result':'done' 323 'result':'done'
313 }, 324 },
314 toll: this.getTollForRequestType('CONNECT') 325 toll: this.getTollForRequestType('CONNECT')
315 } 326 }
316 327
317 return MochiKit.Async.succeed(result); 328 return MochiKit.Async.succeed(result);
318 }, 329 },
319 330
320 //------------------------------------------------------------------------- 331 //-------------------------------------------------------------------------
321 332
322 '_handshake': function(someParameters) { 333 '_handshake': function(someParameters) {
323 var result; 334 var result;
324 varnextTollRequestType; 335 varnextTollRequestType;
325 336
326//Clipperz.log(">>> Proxy.Offline.DataStore._handshake"); 337//Clipperz.log(">>> Proxy.Offline.DataStore._handshake");
327 result = {}; 338 result = {};
328 if (someParameters.message == "connect") { 339 if (someParameters.message == "connect") {
329 var userData; 340 var userData;
330 var randomBytes; 341 var randomBytes;
331 var b, B, v; 342 var b, B, v;
332 343
333//console.log(">>> Proxy.Offline.DataStore._handshake.connect", someParameters); 344//console.log(">>> Proxy.Offline.DataStore._handshake.connect", someParameters);
334 userData = this.data()['users'][someParameters.parameters.C]; 345 userData = this.data()['users'][someParameters.parameters.C];
335 346
336 if ((typeof(userData) != 'undefined') && (userData['version'] == someParameters.version)) { 347 if ((typeof(userData) != 'undefined') && (userData['version'] == someParameters.version)) {
337 this.setUserData(userData); 348 this.setUserData(userData);
338 } else { 349 } else {
339 this.setUserData(this.data()['users']['catchAllUser']); 350 this.setUserData(this.data()['users']['catchAllUser']);
340 } 351 }
341 352
342 randomBytes = Clipperz.Crypto.Base.generateRandomSeed(); 353 randomBytes = Clipperz.Crypto.Base.generateRandomSeed();
354 this.set_C(someParameters.parameters.C);
343 this.set_b(new Clipperz.Crypto.BigInt(randomBytes, 16)); 355 this.set_b(new Clipperz.Crypto.BigInt(randomBytes, 16));
344 v = new Clipperz.Crypto.BigInt(this.userData()['v'], 16); 356 v = new Clipperz.Crypto.BigInt(this.userData()['v'], 16);
345 this.set_B(v.add(Clipperz.Crypto.SRP.g().powerModule(this.b(), Clipperz.Crypto.SRP.n()))); 357 this.set_B((Clipperz.Crypto.SRP.k().multiply(v)).add(Clipperz.Crypto.SRP.g().powerModule(this.b(), Clipperz.Crypto.SRP.n())));
346 358
347 this.set_A(someParameters.parameters.A); 359 this.set_A(someParameters.parameters.A);
348 360
349 result['s'] = this.userData()['s']; 361 result['s'] = this.userData()['s'];
350 result['B'] = this.B().asString(16); 362 result['B'] = this.B().asString(16);
351 363
352 nextTollRequestType = 'CONNECT'; 364 nextTollRequestType = 'CONNECT';
353 } else if (someParameters.message == "credentialCheck") { 365 } else if (someParameters.message == "credentialCheck") {
354 var v, u, S, A, K, M1; 366 var v, u, s, S, A, K, M1;
367 var stringHash = function (aValue) {
368 return Clipperz.PM.Crypto.encryptingFunctions.versions[someParameters.version].hash(new Clipperz.ByteArray(aValue)).toHexString().substring(2);
369 };
355 370
356//console.log(">>> Proxy.Offline.DataStore._handshake.credentialCheck", someParameters); 371//console.log(">>> Proxy.Offline.DataStore._handshake.credentialCheck", someParameters);
357 v = new Clipperz.Crypto.BigInt(this.userData()['v'], 16); 372 v = new Clipperz.Crypto.BigInt(this.userData()['v'], 16);
358 u = new Clipperz.Crypto.BigInt(Clipperz.PM.Crypto.encryptingFunctions.versions[someParameters.version].hash(new Clipperz.ByteArray(this.B().asString(10))).toHexString(), 16);
359 A = new Clipperz.Crypto.BigInt(this.A(), 16); 373 A = new Clipperz.Crypto.BigInt(this.A(), 16);
374 u = new Clipperz.Crypto.BigInt(Clipperz.PM.Crypto.encryptingFunctions.versions[someParameters.version].hash(new Clipperz.ByteArray(A.asString(10) + this.B().asString(10))).toHexString(), 16);
375 s = new Clipperz.Crypto.BigInt(this.userData()['s'], 16);
360 S = (A.multiply(v.powerModule(u, Clipperz.Crypto.SRP.n()))).powerModule(this.b(), Clipperz.Crypto.SRP.n()); 376 S = (A.multiply(v.powerModule(u, Clipperz.Crypto.SRP.n()))).powerModule(this.b(), Clipperz.Crypto.SRP.n());
361 377
362 K = Clipperz.PM.Crypto.encryptingFunctions.versions[someParameters.version].hash(new Clipperz.ByteArray(S.asString(10))).toHexString().slice(2); 378 K = stringHash(S.asString(10));
363 379
364 M1 = Clipperz.PM.Crypto.encryptingFunctions.versions[someParameters.version].hash(new Clipperz.ByteArray(A.asString(10) + this.B().asString(10) + K)).toHexString().slice(2); 380 M1 = stringHash(
381 "597626870978286801440197562148588907434001483655788865609375806439877501869636875571920406529" +
382 stringHash(this.C()) +
383 s.asString(10) +
384 A.asString(10) +
385 this.B().asString(10) +
386 K
387 );
365 if (someParameters.parameters.M1 == M1) { 388 if (someParameters.parameters.M1 == M1) {
366 var M2; 389 var M2;
367 390
368 M2 = Clipperz.PM.Crypto.encryptingFunctions.versions[someParameters.version].hash(new Clipperz.ByteArray(A.asString(10) + someParameters.parameters.M1 + K)).toHexString().slice(2); 391 M2 = stringHash(
392 A.asString(10) +
393 someParameters.parameters.M1 +
394 K
395 );
369 result['M2'] = M2; 396 result['M2'] = M2;
370 } else { 397 } else {
371 throw new Error("Client checksum verification failed! Expected <" + M1 + ">, received <" + someParameters.parameters.M1 + ">.", "Error"); 398 throw new Error("Client checksum verification failed! Expected <" + M1 + ">, received <" + someParameters.parameters.M1 + ">.", "Error");
372 } 399 }
373 400
374 nextTollRequestType = 'MESSAGE'; 401 nextTollRequestType = 'MESSAGE';
375 } else if (someParameters.message == "oneTimePassword") { 402 } else if (someParameters.message == "oneTimePassword") {
376 var otpData; 403 var otpData;
377 404
378//console.log("HANDSHAKE WITH OTP", someParameters.parameters.oneTimePasswordKey); 405//console.log("HANDSHAKE WITH OTP", someParameters.parameters.oneTimePasswordKey);
379//console.log("someParameters", someParameters); 406//console.log("someParameters", someParameters);
380//console.log("data.OTP", Clipperz.Base.serializeJSON(this.data()['onetimePasswords'])); 407//console.log("data.OTP", Clipperz.Base.serializeJSON(this.data()['onetimePasswords']));
381 otpData = this.data()['onetimePasswords'][someParameters.parameters.oneTimePasswordKey]; 408 otpData = this.data()['onetimePasswords'][someParameters.parameters.oneTimePasswordKey];
382 409
383 try { 410 try {
384 if (typeof(otpData) != 'undefined') { 411 if (typeof(otpData) != 'undefined') {
385 if (otpData['status'] == 'ACTIVE') { 412 if (otpData['status'] == 'ACTIVE') {
386 if (otpData['key_checksum'] == someParameters.parameters.oneTimePasswordKeyChecksum) { 413 if (otpData['key_checksum'] == someParameters.parameters.oneTimePasswordKeyChecksum) {
387 result = { 414 result = {
388 'data': otpData['data'], 415 'data': otpData['data'],
389 'version':otpData['version'] 416 'version':otpData['version']
390 } 417 }
391 418
392 otpData['status'] = 'REQUESTED'; 419 otpData['status'] = 'REQUESTED';
393 } else { 420 } else {
394 otpData['status'] = 'DISABLED'; 421 otpData['status'] = 'DISABLED';
395 throw "The requested One Time Password has been disabled, due to a wrong keyChecksum"; 422 throw "The requested One Time Password has been disabled, due to a wrong keyChecksum";
396 } 423 }
397 } else { 424 } else {
398 throw "The requested One Time Password was not active"; 425 throw "The requested One Time Password was not active";
399 } 426 }
400 } else { 427 } else {
401 throw "The requested One Time Password has not been found" 428 throw "The requested One Time Password has not been found"
402 } 429 }
403 } catch (exception) { 430 } catch (exception) {
404 result = { 431 result = {
405 'data': Clipperz.PM.Crypto.randomKey(), 432 'data': Clipperz.PM.Crypto.randomKey(),
406 'version':Clipperz.PM.Connection.communicationProtocol.currentVersion 433 'version':Clipperz.PM.Connection.communicationProtocol.currentVersion
407 } 434 }
408 } 435 }
409 nextTollRequestType = 'CONNECT'; 436 nextTollRequestType = 'CONNECT';
410 } else { 437 } else {
411 MochiKit.Logging.logError("Clipperz.PM.Proxy.Test.handshake - unhandled message: " + someParameters.message); 438 MochiKit.Logging.logError("Clipperz.PM.Proxy.Test.handshake - unhandled message: " + someParameters.message);
412 } 439 }
413//console.log("<<< Proxy.Offline._handshake", result); 440//console.log("<<< Proxy.Offline._handshake", result);
414 441
415 result = { 442 result = {
416 result: result, 443 result: result,
417 toll: this.getTollForRequestType(nextTollRequestType) 444 toll: this.getTollForRequestType(nextTollRequestType)
418 } 445 }
419 446
420 return MochiKit.Async.succeed(result); 447 return MochiKit.Async.succeed(result);
421 }, 448 },
422 449
423 //------------------------------------------------------------------------- 450 //-------------------------------------------------------------------------
424 451
425 '_message': function(someParameters) { 452 '_message': function(someParameters) {
426 var result; 453 var result;
427 454
428 result = {}; 455 result = {};
429 456
430 //===================================================================== 457 //=====================================================================
431 // 458 //
432 // R E A D - O N L Y M e t h o d s 459 // R E A D - O N L Y M e t h o d s
433 // 460 //
434 //===================================================================== 461 //=====================================================================
435 if (someParameters.message == 'getUserDetails') { 462 if (someParameters.message == 'getUserDetails') {
436 var recordsStats; 463 var recordsStats;
437 var recordReference; 464 var recordReference;
438 465
439 //try { 466 //try {
440 recordsStats = {}; 467 recordsStats = {};
441 for (recordReference in this.userData()['records']) { 468 for (recordReference in this.userData()['records']) {
442 recordsStats[recordReference] = { 469 recordsStats[recordReference] = {
443 'updateDate': this.userData()['records'][recordReference]['updateDate'] 470 'updateDate': this.userData()['records'][recordReference]['updateDate']
444 } 471 }
445 } 472 }
446 473
447 result['header'] = this.userDetails(); 474 result['header'] = this.userDetails();
448 result['statistics'] = this.statistics(); 475 result['statistics'] = this.statistics();
449 result['maxNumberOfRecords'] = this.userData()['maxNumberOfRecords']; 476 result['maxNumberOfRecords'] = this.userData()['maxNumberOfRecords'];
450 result['version'] = this.userData()['userDetailsVersion']; 477 result['version'] = this.userData()['userDetailsVersion'];
451 result['recordsStats'] = recordsStats; 478 result['recordsStats'] = recordsStats;
452 479
453 if (this.isReadOnly() == false) { 480 if (this.isReadOnly() == false) {
454 varlock; 481 varlock;
455 482
456 if (typeof(this.userData()['lock']) == 'undefined') { 483 if (typeof(this.userData()['lock']) == 'undefined') {
457 this.userData()['lock'] = "<<LOCK>>"; 484 this.userData()['lock'] = "<<LOCK>>";
458 } 485 }
459 486
460 result['lock'] = this.userData()['lock']; 487 result['lock'] = this.userData()['lock'];
461 } 488 }
462//} catch (exception) { 489//} catch (exception) {
463 //console.log("*#*#*#*#*#*#*", exception); 490 //console.log("*#*#*#*#*#*#*", exception);
464 //throw exception; 491 //throw exception;
465//} 492//}
466 //===================================================================== 493 //=====================================================================
467 } else if (someParameters.message == 'getRecordDetail') { 494 } else if (someParameters.message == 'getRecordDetail') {
468 recordData = this.userData()['records'][someParameters['parameters']['reference']]; 495 recordData = this.userData()['records'][someParameters['parameters']['reference']];
469 496
470 result['reference'] = someParameters['parameters']['reference']; 497 result['reference'] = someParameters['parameters']['reference'];
471 result['data'] = recordData['data']; 498 result['data'] = recordData['data'];
472 result['version'] = recordData['version']; 499 result['version'] = recordData['version'];
473 result['creationData'] = recordData['creationDate']; 500 result['creationData'] = recordData['creationDate'];
474 result['updateDate'] = recordData['updateDate']; 501 result['updateDate'] = recordData['updateDate'];
475 result['accessDate'] = recordData['accessDate']; 502 result['accessDate'] = recordData['accessDate'];
476 503
477 currentVersionData = recordData['versions'][recordData['currentVersion']]; 504 currentVersionData = recordData['versions'][recordData['currentVersion']];
478 505
479 result['currentVersion'] = {}; 506 result['currentVersion'] = {};
480 result['currentVersion']['reference'] = recordData['currentVersion']; 507 result['currentVersion']['reference'] = recordData['currentVersion'];
481 result['currentVersion']['version'] = currentVersionData['version']; 508 result['currentVersion']['version'] = currentVersionData['version'];
482 result['currentVersion']['header'] = currentVersionData['header']; 509 result['currentVersion']['header'] = currentVersionData['header'];
483 result['currentVersion']['data'] = currentVersionData['data']; 510 result['currentVersion']['data'] = currentVersionData['data'];
484 result['currentVersion']['creationData'] = currentVersionData['creationDate']; 511 result['currentVersion']['creationData'] = currentVersionData['creationDate'];
485 result['currentVersion']['updateDate'] = currentVersionData['updateDate']; 512 result['currentVersion']['updateDate'] = currentVersionData['updateDate'];
486 result['currentVersion']['accessDate'] = currentVersionData['accessDate']; 513 result['currentVersion']['accessDate'] = currentVersionData['accessDate'];
487 if (typeof(currentVersionData['previousVersion']) != 'undefined') { 514 if (typeof(currentVersionData['previousVersion']) != 'undefined') {
488 result['currentVersion']['previousVersionKey'] = currentVersionData['previousVersionKey']; 515 result['currentVersion']['previousVersionKey'] = currentVersionData['previousVersionKey'];
489 result['currentVersion']['previousVersion'] = currentVersionData['previousVersion']; 516 result['currentVersion']['previousVersion'] = currentVersionData['previousVersion'];
490 } 517 }
491 518
492 //===================================================================== 519 //=====================================================================
493 // 520 //
494 // R E A D - W R I T E M e t h o d s 521 // R E A D - W R I T E M e t h o d s
495 // 522 //
496 //===================================================================== 523 //=====================================================================
497 } else if (someParameters.message == 'upgradeUserCredentials') { 524 } else if (someParameters.message == 'upgradeUserCredentials') {
498 if (this.isReadOnly() == false) { 525 if (this.isReadOnly() == false) {
499 var parameters; 526 var parameters;
500 parameters = someParameters.parameters; 527 parameters = someParameters.parameters;
501 528
502 if (parameters['C'] == null) { 529 if (parameters['C'] == null) {
503 result = Clipperz.PM.DataModel.User.exception.CredentialUpgradeFailed; 530 result = Clipperz.PM.DataModel.User.exception.CredentialUpgradeFailed;
504 } else if (parameters['s'] == null) { 531 } else if (parameters['s'] == null) {
505 result = Clipperz.PM.DataModel.User.exception.CredentialUpgradeFailed; 532 result = Clipperz.PM.DataModel.User.exception.CredentialUpgradeFailed;
506 } else if (parameters['v'] == null) { 533 } else if (parameters['v'] == null) {
507 result = Clipperz.PM.DataModel.User.exception.CredentialUpgradeFailed; 534 result = Clipperz.PM.DataModel.User.exception.CredentialUpgradeFailed;
508 } else if (parameters['version'] != Clipperz.PM.Connection.communicationProtocol.currentVersion) { 535 } else if (parameters['version'] != Clipperz.PM.Connection.communicationProtocol.currentVersion) {
509 result = Clipperz.PM.DataModel.User.exception.CredentialUpgradeFailed; 536 result = Clipperz.PM.DataModel.User.exception.CredentialUpgradeFailed;
510 } else { 537 } else {
511 result = {result:"done", parameters:parameters}; 538 result = {result:"done", parameters:parameters};
512 } 539 }
513 } else { 540 } else {
514 throw Clipperz.PM.Proxy.Offline.DataStore.exception.ReadOnly; 541 throw Clipperz.PM.Proxy.Offline.DataStore.exception.ReadOnly;
515 } 542 }
516 //===================================================================== 543 //=====================================================================
517 /* } else if (someParameters.message == 'updateData') { 544 /* } else if (someParameters.message == 'updateData') {
518 if (this.isReadOnly() == false) { 545 if (this.isReadOnly() == false) {
519 var i, c; 546 var i, c;
520 547
521//console.log("###==============================================================="); 548//console.log("###===============================================================");
522//console.log("###>>>", Clipperz.Base.serializeJSON(someParameters)); 549//console.log("###>>>", Clipperz.Base.serializeJSON(someParameters));
523//console.log("###--- userData", Clipperz.Base.serializeJSON(this.userData())); 550//console.log("###--- userData", Clipperz.Base.serializeJSON(this.userData()));
524 if (this.userData()['lock']!= someParameters['parameters']['user']['lock']) { 551 if (this.userData()['lock']!= someParameters['parameters']['user']['lock']) {
525 throw "the lock attribute is not processed correctly" 552 throw "the lock attribute is not processed correctly"
526 } 553 }
527 554
528 this.userData()['userDetails'] = someParameters['parameters']['user']['header']; 555 this.userData()['userDetails'] = someParameters['parameters']['user']['header'];
529 this.userData()['statistics'] = someParameters['parameters']['user']['statistics']; 556 this.userData()['statistics'] = someParameters['parameters']['user']['statistics'];
530 this.userData()['userDetailsVersions']= someParameters['parameters']['user']['version']; 557 this.userData()['userDetailsVersions']= someParameters['parameters']['user']['version'];
531 558
532 c = someParameters['parameters']['records'].length; 559 c = someParameters['parameters']['records'].length;
533 for (i=0; i<c; i++) { 560 for (i=0; i<c; i++) {
534 var currentRecord; 561 var currentRecord;
535 var currentRecordData; 562 var currentRecordData;
536 563
537 currentRecordData = someParameters['parameters']['records'][i]; 564 currentRecordData = someParameters['parameters']['records'][i];
538 currentRecord = this.userData()['records'][currentRecordData['record']['reference']]; 565 currentRecord = this.userData()['records'][currentRecordData['record']['reference']];
539 566
540 if (currentRecord == null) { 567 if (currentRecord == null) {
541 } 568 }
542 569
543 currentRecord['data'] = currentRecordData['record']['data']; 570 currentRecord['data'] = currentRecordData['record']['data'];
544 currentRecord['version'] = currentRecordData['record']['version']; 571 currentRecord['version'] = currentRecordData['record']['version'];
545 currentRecord['currentVersion'] = currentRecordData['currentRecordVersion']['reference']; 572 currentRecord['currentVersion'] = currentRecordData['currentRecordVersion']['reference'];
546 573
547 currentRecord['versions'][currentRecordData['currentRecordVersion']['reference']] = { 574 currentRecord['versions'][currentRecordData['currentRecordVersion']['reference']] = {
548 'data': currentRecordData['currentRecordVersion']['data'], 575 'data': currentRecordData['currentRecordVersion']['data'],
549 'version': currentRecordData['currentRecordVersion']['version'], 576 'version': currentRecordData['currentRecordVersion']['version'],
550 'previousVersion': currentRecordData['currentRecordVersion']['previousVersion'], 577 'previousVersion': currentRecordData['currentRecordVersion']['previousVersion'],
551 'previousVersionKey':currentRecordData['currentRecordVersion']['previousVersionKey'] 578 'previousVersionKey':currentRecordData['currentRecordVersion']['previousVersionKey']
552 } 579 }
553 } 580 }
554 581
555 this.userData()['lock'] = Clipperz.PM.Crypto.randomKey(); 582 this.userData()['lock'] = Clipperz.PM.Crypto.randomKey();
556 result['lock'] = this.userData()['lock']; 583 result['lock'] = this.userData()['lock'];
557 result['result'] = 'done'; 584 result['result'] = 'done';
558//console.log("###<<< userData", Clipperz.Base.serializeJSON(this.userData())); 585//console.log("###<<< userData", Clipperz.Base.serializeJSON(this.userData()));
559 } else { 586 } else {
560 throw Clipperz.PM.Proxy.Offline.DataStore.exception.ReadOnly; 587 throw Clipperz.PM.Proxy.Offline.DataStore.exception.ReadOnly;
561 } 588 }
562 */ //===================================================================== 589 */ //=====================================================================
563 } else if (someParameters.message == 'saveChanges') { 590 } else if (someParameters.message == 'saveChanges') {
564 if (this.isReadOnly() == false) { 591 if (this.isReadOnly() == false) {
565 var i, c; 592 var i, c;
566 593
567//console.log("###==============================================================="); 594//console.log("###===============================================================");
568//console.log("###>>>", someParameters); 595//console.log("###>>>", someParameters);
569//console.log("###>>>", Clipperz.Base.serializeJSON(someParameters)); 596//console.log("###>>>", Clipperz.Base.serializeJSON(someParameters));
570//console.log("###--- userData", Clipperz.Base.serializeJSON(this.userData())); 597//console.log("###--- userData", Clipperz.Base.serializeJSON(this.userData()));
571//console.log("###==============================================================="); 598//console.log("###===============================================================");
572//console.log("--- userData.lock ", this.userData()['lock']); 599//console.log("--- userData.lock ", this.userData()['lock']);
573//console.log("--- parameters.lock", someParameters['parameters']['user']['lock']); 600//console.log("--- parameters.lock", someParameters['parameters']['user']['lock']);
574 if (this.userData()['lock']!= someParameters['parameters']['user']['lock']) { 601 if (this.userData()['lock']!= someParameters['parameters']['user']['lock']) {
575 throw "the lock attribute is not processed correctly" 602 throw "the lock attribute is not processed correctly"
576 } 603 }
577 604
578 this.userData()['userDetails'] = someParameters['parameters']['user']['header']; 605 this.userData()['userDetails'] = someParameters['parameters']['user']['header'];
579 this.userData()['statistics'] = someParameters['parameters']['user']['statistics']; 606 this.userData()['statistics'] = someParameters['parameters']['user']['statistics'];
580 this.userData()['userDetailsVersions']= someParameters['parameters']['user']['version']; 607 this.userData()['userDetailsVersions']= someParameters['parameters']['user']['version'];
581 608
582 c = someParameters['parameters']['records']['updated'].length; 609 c = someParameters['parameters']['records']['updated'].length;
583 for (i=0; i<c; i++) { 610 for (i=0; i<c; i++) {
584 var currentRecord; 611 var currentRecord;
585 var currentRecordData; 612 var currentRecordData;
586 613
587 currentRecordData = someParameters['parameters']['records']['updated'][i]; 614 currentRecordData = someParameters['parameters']['records']['updated'][i];
588 currentRecord = this.userData()['records'][currentRecordData['record']['reference']]; 615 currentRecord = this.userData()['records'][currentRecordData['record']['reference']];
589 616
590 if ( 617 if (
591 (typeof(this.userData()['records'][currentRecordData['record']['reference']]) == 'undefined') 618 (typeof(this.userData()['records'][currentRecordData['record']['reference']]) == 'undefined')
592 && 619 &&
593 (typeof(currentRecordData['currentRecordVersion']) == 'undefined') 620 (typeof(currentRecordData['currentRecordVersion']) == 'undefined')
594 ) { 621 ) {
595//console.log("######## SHIT HAPPENS"); 622//console.log("######## SHIT HAPPENS");
596 throw "Record added without a recordVersion"; 623 throw "Record added without a recordVersion";
597 } 624 }
598 625
599 if (currentRecord == null) { 626 if (currentRecord == null) {
600 currentRecord = {}; 627 currentRecord = {};
601 currentRecord['versions'] = {}; 628 currentRecord['versions'] = {};
602 currentRecord['creationDate']= Clipperz.PM.Date.formatDateWithUTCFormat(new Date()); 629 currentRecord['creationDate']= Clipperz.PM.Date.formatDateWithUTCFormat(new Date());
603 currentRecord['accessDate'] = Clipperz.PM.Date.formatDateWithUTCFormat(new Date()); 630 currentRecord['accessDate'] = Clipperz.PM.Date.formatDateWithUTCFormat(new Date());
604 631
605 this.userData()['records'][currentRecordData['record']['reference']] = currentRecord; 632 this.userData()['records'][currentRecordData['record']['reference']] = currentRecord;
606 } 633 }
607 634
608 currentRecord['data'] = currentRecordData['record']['data']; 635 currentRecord['data'] = currentRecordData['record']['data'];
609 currentRecord['version']= currentRecordData['record']['version']; 636 currentRecord['version']= currentRecordData['record']['version'];
610 currentRecord['updateDate']= Clipperz.PM.Date.formatDateWithUTCFormat(new Date()); 637 currentRecord['updateDate']= Clipperz.PM.Date.formatDateWithUTCFormat(new Date());
611 638
612 if (typeof(currentRecordData['currentRecordVersion']) != 'undefined') { 639 if (typeof(currentRecordData['currentRecordVersion']) != 'undefined') {
613 currentRecord['currentVersion'] = currentRecordData['currentRecordVersion']['reference']; 640 currentRecord['currentVersion'] = currentRecordData['currentRecordVersion']['reference'];
614 currentRecord['versions'][currentRecordData['currentRecordVersion']['reference']] = { 641 currentRecord['versions'][currentRecordData['currentRecordVersion']['reference']] = {
615 'data': currentRecordData['currentRecordVersion']['data'], 642 'data': currentRecordData['currentRecordVersion']['data'],
616 'version': currentRecordData['currentRecordVersion']['version'], 643 'version': currentRecordData['currentRecordVersion']['version'],
617 'previousVersion': currentRecordData['currentRecordVersion']['previousVersion'], 644 'previousVersion': currentRecordData['currentRecordVersion']['previousVersion'],
618 'previousVersionKey':currentRecordData['currentRecordVersion']['previousVersionKey'], 645 'previousVersionKey':currentRecordData['currentRecordVersion']['previousVersionKey'],
619 'creationDate':Clipperz.PM.Date.formatDateWithUTCFormat(new Date()), 646 'creationDate':Clipperz.PM.Date.formatDateWithUTCFormat(new Date()),
620 'updateDate':Clipperz.PM.Date.formatDateWithUTCFormat(new Date()), 647 'updateDate':Clipperz.PM.Date.formatDateWithUTCFormat(new Date()),
621 'accessDate':Clipperz.PM.Date.formatDateWithUTCFormat(new Date()) 648 'accessDate':Clipperz.PM.Date.formatDateWithUTCFormat(new Date())
622 } 649 }
623 } 650 }
624 } 651 }
625 652
626 c = someParameters['parameters']['records']['deleted'].length; 653 c = someParameters['parameters']['records']['deleted'].length;
627 for (i=0; i<c; i++) { 654 for (i=0; i<c; i++) {
628 var currentRecordReference; 655 var currentRecordReference;
629 656
630 currentRecordReference = someParameters['parameters']['records']['deleted'][i]; 657 currentRecordReference = someParameters['parameters']['records']['deleted'][i];
631//console.log("DELETING records", currentRecordReference); 658//console.log("DELETING records", currentRecordReference);
632 delete this.userData()['records'][currentRecordReference]; 659 delete this.userData()['records'][currentRecordReference];
633 } 660 }
634 661
635 this.userData()['lock'] = Clipperz.PM.Crypto.randomKey(); 662 this.userData()['lock'] = Clipperz.PM.Crypto.randomKey();
636 result['lock'] = this.userData()['lock']; 663 result['lock'] = this.userData()['lock'];
637 result['result'] = 'done'; 664 result['result'] = 'done';
638//console.log("###<<< userData", Clipperz.Base.serializeJSON(this.userData())); 665//console.log("###<<< userData", Clipperz.Base.serializeJSON(this.userData()));
639 } else { 666 } else {
640 throw Clipperz.PM.Proxy.Offline.DataStore.exception.ReadOnly; 667 throw Clipperz.PM.Proxy.Offline.DataStore.exception.ReadOnly;
641 } 668 }
642 669
643 //===================================================================== 670 //=====================================================================
644 // 671 //
645 // U N H A N D L E D M e t h o d 672 // U N H A N D L E D M e t h o d
646 // 673 //
647 //===================================================================== 674 //=====================================================================
648 } else { 675 } else {
649 MochiKit.Logging.logError("Clipperz.PM.Proxy.Test.message - unhandled message: " + someParameters.message); 676 MochiKit.Logging.logError("Clipperz.PM.Proxy.Test.message - unhandled message: " + someParameters.message);
650 } 677 }
651 678
652 result = { 679 result = {
653 result: result, 680 result: result,
654 toll: this.getTollForRequestType('MESSAGE') 681 toll: this.getTollForRequestType('MESSAGE')
655 } 682 }
656 683
657 return MochiKit.Async.succeed(result); 684 return MochiKit.Async.succeed(result);
658 }, 685 },
659 686
660 //------------------------------------------------------------------------- 687 //-------------------------------------------------------------------------
661 688
662 '_logout': function(someParameters) { 689 '_logout': function(someParameters) {
663 return MochiKit.Async.succeed({result: 'done'}); 690 return MochiKit.Async.succeed({result: 'done'});
664 }, 691 },
665 692
666 //========================================================================= 693 //=========================================================================
667 //######################################################################### 694 //#########################################################################
668 695
669 'isTestData': function() { 696 'isTestData': function() {
670 return (typeof(this.userData()['__masterkey_test_value__']) != 'undefined'); 697 return (typeof(this.userData()['__masterkey_test_value__']) != 'undefined');
671 }, 698 },
672 699
673 'userDetails': function() { 700 'userDetails': function() {
674 var result; 701 var result;
675 702
676 if (this.isTestData()) { 703 if (this.isTestData()) {
677 var serializedHeader; 704 var serializedHeader;
678 var version; 705 var version;
679 706
680//MochiKit.Logging.logDebug("### test data"); 707//MochiKit.Logging.logDebug("### test data");
681 version = this.userData()['userDetailsVersion']; 708 version = this.userData()['userDetailsVersion'];
682 serializedHeader = Clipperz.Base.serializeJSON(this.userData()['userDetails']); 709 serializedHeader = Clipperz.Base.serializeJSON(this.userData()['userDetails']);
683 result = Clipperz.PM.Crypto.encryptingFunctions.versions[version].encrypt(this.userData()['__masterkey_test_value__'], serializedHeader); 710 result = Clipperz.PM.Crypto.encryptingFunctions.versions[version].encrypt(this.userData()['__masterkey_test_value__'], serializedHeader);
684 } else { 711 } else {
685//MochiKit.Logging.logDebug("### NOT test data"); 712//MochiKit.Logging.logDebug("### NOT test data");
686 result = this.userData()['userDetails']; 713 result = this.userData()['userDetails'];
687 } 714 }
688 715
689 return result; 716 return result;
690 }, 717 },
691 718
692 'statistics': function() { 719 'statistics': function() {
693 var result; 720 var result;
694 721
695 if (this.userData()['statistics'] != null) { 722 if (this.userData()['statistics'] != null) {
696 if (this.isTestData()) { 723 if (this.isTestData()) {
697 var serializedStatistics; 724 var serializedStatistics;
698 var version; 725 var version;
699 726
700 version = this.userData()['userDetailsVersion']; 727 version = this.userData()['userDetailsVersion'];
701 serializedStatistics = Clipperz.Base.serializeJSON(this.userData()['statistics']); 728 serializedStatistics = Clipperz.Base.serializeJSON(this.userData()['statistics']);
702 result = Clipperz.PM.Crypto.encryptingFunctions.versions[version].encrypt(this.userData()['__masterkey_test_value__'], serializedStatistics); 729 result = Clipperz.PM.Crypto.encryptingFunctions.versions[version].encrypt(this.userData()['__masterkey_test_value__'], serializedStatistics);
703 } else { 730 } else {
704 result = this.userData()['statistics']; 731 result = this.userData()['statistics'];
705 } 732 }
706 } else { 733 } else {
707 result = null; 734 result = null;
708 } 735 }
709 736
710 return result; 737 return result;
711 }, 738 },
712 739
713/* 740/*
714 'userSerializedEncryptedData': function(someData) { 741 'userSerializedEncryptedData': function(someData) {
715 var deferredResult; 742 var deferredResult;
716 var deferredContext; 743 var deferredContext;
717 744
718 deferredContext = { 'data': someData }; 745 deferredContext = { 'data': someData };
719 746
720 deferredResult = new Clipperz.Async.Deferred('Proxy.Test.serializeUserEncryptedData', {trace:false}); 747 deferredResult = new Clipperz.Async.Deferred('Proxy.Test.serializeUserEncryptedData', {trace:false});
721 deferredResult.addCallback(MochiKit.Base.bind(function(aDeferredContext) { 748 deferredResult.addCallback(MochiKit.Base.bind(function(aDeferredContext) {
722 aDeferredContext['user'] = this.createUserUsingConfigurationData(aDeferredContext['data']); 749 aDeferredContext['user'] = this.createUserUsingConfigurationData(aDeferredContext['data']);
723 return aDeferredContext; 750 return aDeferredContext;
724 }, this)); 751 }, this));
725 deferredResult.addCallback(function(aDeferredContext) { 752 deferredResult.addCallback(function(aDeferredContext) {
726 // return aDeferredContext['user'].encryptedDataUsingVersion(aDeferredContext['data']['version']); 753 // return aDeferredContext['user'].encryptedDataUsingVersion(aDeferredContext['data']['version']);
727 return aDeferredContext['user'].serializedDataUsingVersion(MochiKit.Base.values(aDeferredContext['user'].records()), aDeferredContext['data']['version']); 754 return aDeferredContext['user'].serializedDataUsingVersion(MochiKit.Base.values(aDeferredContext['user'].records()), aDeferredContext['data']['version']);
728 }); 755 });
729 deferredResult.addCallback(function(aUserEncryptedData) { 756 deferredResult.addCallback(function(aUserEncryptedData) {
730 deferredContext['encryptedData'] = aUserEncryptedData; 757 deferredContext['encryptedData'] = aUserEncryptedData;
731 return deferredContext; 758 return deferredContext;
732 }); 759 });
733 deferredResult.addCallback(function(aDeferredContext) { 760 deferredResult.addCallback(function(aDeferredContext) {
734 var connection; 761 var connection;
735 762
736 connection = new Clipperz.PM.Connection.communicationProtocol.versions[aDeferredContext['data']['connectionVersion']]() 763 connection = new Clipperz.PM.Connection.communicationProtocol.versions[aDeferredContext['data']['connectionVersion']]()
737 aDeferredContext['credentials'] = connection.serverSideUserCredentials(aDeferredContext['user'].username(),aDeferredContext['user'].passphrase()); 764 aDeferredContext['credentials'] = connection.serverSideUserCredentials(aDeferredContext['user'].username(),aDeferredContext['user'].passphrase());
738 765
739 return aDeferredContext; 766 return aDeferredContext;
740 }); 767 });
741 768
742 // deferredResult.addCallback(function(aDeferredContext) { 769 // deferredResult.addCallback(function(aDeferredContext) {
743//console.log("#-#-#-#-#", aDeferredContext); 770//console.log("#-#-#-#-#", aDeferredContext);
744 // return aDeferredContext['user'].serializedDataUsingVersion(MochiKit.Base.values(aDeferredContext['user'].records()), aDeferredContext['data']['version']); 771 // return aDeferredContext['user'].serializedDataUsingVersion(MochiKit.Base.values(aDeferredContext['user'].records()), aDeferredContext['data']['version']);
745 // }, deferredContext); 772 // }, deferredContext);
746 // deferredResult.addCallback(function(aUserSerializedData) { 773 // deferredResult.addCallback(function(aUserSerializedData) {
747//console.log("USER SERIALIZED DATA", aUserSerializedData); 774//console.log("USER SERIALIZED DATA", aUserSerializedData);
748 // }); 775 // });
749// 776//
750 // deferredResult.addCallback(MochiKit.Async.succeed, deferredContext); 777 // deferredResult.addCallback(MochiKit.Async.succeed, deferredContext);
751 deferredResult.callback(deferredContext); 778 deferredResult.callback(deferredContext);
752 779
diff --git a/frontend/delta/js/Clipperz/PM/Proxy/Proxy.Offline.LocalStorageDataStore.js b/frontend/delta/js/Clipperz/PM/Proxy/Proxy.Offline.LocalStorageDataStore.js
index 3f16f70..d03f873 100644
--- a/frontend/delta/js/Clipperz/PM/Proxy/Proxy.Offline.LocalStorageDataStore.js
+++ b/frontend/delta/js/Clipperz/PM/Proxy/Proxy.Offline.LocalStorageDataStore.js
@@ -1,422 +1,437 @@
1/* 1/*
2 2
3Copyright 2008-2013 Clipperz Srl 3Copyright 2008-2013 Clipperz Srl
4 4
5This file is part of Clipperz, the online password manager. 5This file is part of Clipperz, the online password manager.
6For further information about its features and functionalities please 6For further information about its features and functionalities please
7refer to http://www.clipperz.com. 7refer to http://www.clipperz.com.
8 8
9* Clipperz is free software: you can redistribute it and/or modify it 9* Clipperz is free software: you can redistribute it and/or modify it
10 under the terms of the GNU Affero General Public License as published 10 under the terms of the GNU Affero General Public License as published
11 by the Free Software Foundation, either version 3 of the License, or 11 by the Free Software Foundation, either version 3 of the License, or
12 (at your option) any later version. 12 (at your option) any later version.
13 13
14* Clipperz is distributed in the hope that it will be useful, but 14* Clipperz is distributed in the hope that it will be useful, but
15 WITHOUT ANY WARRANTY; without even the implied warranty of 15 WITHOUT ANY WARRANTY; without even the implied warranty of
16 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. 16 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
17 See the GNU Affero General Public License for more details. 17 See the GNU Affero General Public License for more details.
18 18
19* You should have received a copy of the GNU Affero General Public 19* You should have received a copy of the GNU Affero General Public
20 License along with Clipperz. If not, see http://www.gnu.org/licenses/. 20 License along with Clipperz. If not, see http://www.gnu.org/licenses/.
21 21
22*/ 22*/
23 23
24try { if (typeof(Clipperz.PM.Proxy.Offline.DataStore) == 'undefined') { throw ""; }} catch (e) { 24try { if (typeof(Clipperz.PM.Proxy.Offline.DataStore) == 'undefined') { throw ""; }} catch (e) {
25 throw "Clipperz.PM.Proxy.Offline.LocalStorageDataStore depends on Clipperz.PM.Proxy.Offline.DataStore!"; 25 throw "Clipperz.PM.Proxy.Offline.LocalStorageDataStore depends on Clipperz.PM.Proxy.Offline.DataStore!";
26} 26}
27 27
28//============================================================================= 28//=============================================================================
29 29
30Clipperz.PM.Proxy.Offline.LocalStorageDataStore = function(args) { 30Clipperz.PM.Proxy.Offline.LocalStorageDataStore = function(args) {
31 args = args || {}; 31 args = args || {};
32 32
33 //this._data = args.data || (typeof(_clipperz_dump_data_) != 'undefined' ? _clipperz_dump_data_ : null); 33 //this._data = args.data || (typeof(_clipperz_dump_data_) != 'undefined' ? _clipperz_dump_data_ : null);
34 this._data = JSON.parse(localStorage.getItem('clipperz_dump_data')); 34 this._data = JSON.parse(localStorage.getItem('clipperz_dump_data'));
35 35
36 this._isReadOnly = (typeof(args.readOnly) == 'undefined' ? true : args.readOnly); 36 this._isReadOnly = (typeof(args.readOnly) == 'undefined' ? true : args.readOnly);
37 this._shouldPayTolls = args.shouldPayTolls || false; 37 this._shouldPayTolls = args.shouldPayTolls || false;
38 38
39 this._tolls = {}; 39 this._tolls = {};
40 this._currentStaticConnection = null; 40 this._currentStaticConnection = null;
41 41
42 //Clipperz.PM.Proxy.Offline.LocalStorageDataStore.superclass.constructor.apply(this, arguments); 42 //Clipperz.PM.Proxy.Offline.LocalStorageDataStore.superclass.constructor.apply(this, arguments);
43 43
44 return this; 44 return this;
45} 45}
46 46
47Clipperz.Base.extend(Clipperz.PM.Proxy.Offline.LocalStorageDataStore, Clipperz.PM.Proxy.Offline.DataStore, { 47Clipperz.Base.extend(Clipperz.PM.Proxy.Offline.LocalStorageDataStore, Clipperz.PM.Proxy.Offline.DataStore, {
48 48
49 //========================================================================= 49 //=========================================================================
50 50
51 '_knock': function(aConnection, someParameters) { 51 '_knock': function(aConnection, someParameters) {
52 var result; 52 var result;
53 53
54 result = { 54 result = {
55 toll: this.getTollForRequestType(someParameters['requestType']) 55 toll: this.getTollForRequestType(someParameters['requestType'])
56 } 56 }
57 57
58 return result; 58 return result;
59 }, 59 },
60 60
61 //------------------------------------------------------------------------- 61 //-------------------------------------------------------------------------
62 62
63 '_registration': function(aConnection, someParameters) { 63 '_registration': function(aConnection, someParameters) {
64 throw Clipperz.PM.Proxy.Offline.DataStore.exception.ReadOnly; 64 throw Clipperz.PM.Proxy.Offline.DataStore.exception.ReadOnly;
65 }, 65 },
66 66
67 //------------------------------------------------------------------------- 67 //-------------------------------------------------------------------------
68 68
69 '_handshake': function(aConnection, someParameters) { 69 '_handshake': function(aConnection, someParameters) {
70 var result; 70 var result;
71 varnextTollRequestType; 71 varnextTollRequestType;
72 72
73 result = {}; 73 result = {};
74 if (someParameters.message == "connect") { 74 if (someParameters.message == "connect") {
75 var userData; 75 var userData;
76 var randomBytes; 76 var randomBytes;
77 var v; 77 var v;
78 78
79 userData = this.data()['users'][someParameters.parameters.C]; 79 userData = this.data()['users'][someParameters.parameters.C];
80 80
81 if ((typeof(userData) != 'undefined') && (userData['version'] == someParameters.version)) { 81 if ((typeof(userData) != 'undefined') && (userData['version'] == someParameters.version)) {
82 aConnection['userData'] = userData; 82 aConnection['userData'] = userData;
83 aConnection['C'] = someParameters.parameters.C; 83 aConnection['C'] = someParameters.parameters.C;
84 } else { 84 } else {
85 aConnection['userData'] = this.data()['users']['catchAllUser']; 85 aConnection['userData'] = this.data()['users']['catchAllUser'];
86 } 86 }
87 87
88 randomBytes = Clipperz.Crypto.Base.generateRandomSeed(); 88 randomBytes = Clipperz.Crypto.Base.generateRandomSeed();
89 aConnection['b'] = new Clipperz.Crypto.BigInt(randomBytes, 16); 89 aConnection['b'] = new Clipperz.Crypto.BigInt(randomBytes, 16);
90 v = new Clipperz.Crypto.BigInt(aConnection['userData']['v'], 16); 90 v = new Clipperz.Crypto.BigInt(aConnection['userData']['v'], 16);
91 aConnection['B'] = v.add(Clipperz.Crypto.SRP.g().powerModule(aConnection['b'], Clipperz.Crypto.SRP.n())); 91 aConnection['B'] = (Clipperz.Crypto.SRP.k().multiply(v)).add(Clipperz.Crypto.SRP.g().powerModule(aConnection['b'], Clipperz.Crypto.SRP.n()));
92 92
93 aConnection['A'] = someParameters.parameters.A; 93 aConnection['A'] = someParameters.parameters.A;
94 94
95 result['s'] = aConnection['userData']['s']; 95 result['s'] = aConnection['userData']['s'];
96 result['B'] = aConnection['B'].asString(16); 96 result['B'] = aConnection['B'].asString(16);
97 97
98 nextTollRequestType = 'CONNECT'; 98 nextTollRequestType = 'CONNECT';
99 } else if (someParameters.message == "credentialCheck") { 99 } else if (someParameters.message == "credentialCheck") {
100 var v, u, S, A, K, M1; 100 var v, u, s, S, A, K, M1;
101 var stringHash = function (aValue) {
102 return Clipperz.PM.Crypto.encryptingFunctions.versions[someParameters.version].hash(new Clipperz.ByteArray(aValue)).toHexString().substring(2);
103 };
101 104
102 v = new Clipperz.Crypto.BigInt(aConnection['userData']['v'], 16); 105 v = new Clipperz.Crypto.BigInt(aConnection['userData']['v'], 16);
103 u = new Clipperz.Crypto.BigInt(Clipperz.PM.Crypto.encryptingFunctions.versions[someParameters.version].hash(new Clipperz.ByteArray(aConnection['B'].asString(10))).toHexString(), 16);
104 A = new Clipperz.Crypto.BigInt(aConnection['A'], 16); 106 A = new Clipperz.Crypto.BigInt(aConnection['A'], 16);
107 u = new Clipperz.Crypto.BigInt(Clipperz.PM.Crypto.encryptingFunctions.versions[someParameters.version].hash(new Clipperz.ByteArray(A.asString(10) + aConnection['B'].asString(10))).toHexString(), 16);
108 s = new Clipperz.Crypto.BigInt(aConnection['userData']['s'], 16);
105 S = (A.multiply(v.powerModule(u, Clipperz.Crypto.SRP.n()))).powerModule(aConnection['b'], Clipperz.Crypto.SRP.n()); 109 S = (A.multiply(v.powerModule(u, Clipperz.Crypto.SRP.n()))).powerModule(aConnection['b'], Clipperz.Crypto.SRP.n());
106 110
107 K = Clipperz.PM.Crypto.encryptingFunctions.versions[someParameters.version].hash(new Clipperz.ByteArray(S.asString(10))).toHexString().slice(2); 111 K = stringHash(S.asString(10));
108 112
109 M1 = Clipperz.PM.Crypto.encryptingFunctions.versions[someParameters.version].hash(new Clipperz.ByteArray(A.asString(10) + aConnection['B'].asString(10) + K)).toHexString().slice(2); 113 M1 = stringHash(
114 "597626870978286801440197562148588907434001483655788865609375806439877501869636875571920406529" +
115 stringHash(aConnection['C']) +
116 s.asString(10) +
117 A.asString(10) +
118 aConnection['B'].asString(10) +
119 K
120 );
110 if (someParameters.parameters.M1 == M1) { 121 if (someParameters.parameters.M1 == M1) {
111 var M2; 122 var M2;
112 123
113 M2 = Clipperz.PM.Crypto.encryptingFunctions.versions[someParameters.version].hash(new Clipperz.ByteArray(A.asString(10) + someParameters.parameters.M1 + K)).toHexString().slice(2); 124 M2 = stringHash(
125 A.asString(10) +
126 someParameters.parameters.M1 +
127 K
128 );
114 result['M2'] = M2; 129 result['M2'] = M2;
115 } else { 130 } else {
116 throw new Error("Client checksum verification failed! Expected <" + M1 + ">, received <" + someParameters.parameters.M1 + ">.", "Error"); 131 throw new Error("Client checksum verification failed! Expected <" + M1 + ">, received <" + someParameters.parameters.M1 + ">.", "Error");
117 } 132 }
118 133
119 nextTollRequestType = 'MESSAGE'; 134 nextTollRequestType = 'MESSAGE';
120 } else if (someParameters.message == "oneTimePassword") { 135 } else if (someParameters.message == "oneTimePassword") {
121 var otpData; 136 var otpData;
122 137
123 otpData = this.data()['onetimePasswords'][someParameters.parameters.oneTimePasswordKey]; 138 otpData = this.data()['onetimePasswords'][someParameters.parameters.oneTimePasswordKey];
124 139
125 try { 140 try {
126 if (typeof(otpData) != 'undefined') { 141 if (typeof(otpData) != 'undefined') {
127 if (otpData['status'] == 'ACTIVE') { 142 if (otpData['status'] == 'ACTIVE') {
128 if (otpData['key_checksum'] == someParameters.parameters.oneTimePasswordKeyChecksum) { 143 if (otpData['key_checksum'] == someParameters.parameters.oneTimePasswordKeyChecksum) {
129 result = { 144 result = {
130 'data': otpData['data'], 145 'data': otpData['data'],
131 'version':otpData['version'] 146 'version':otpData['version']
132 } 147 }
133 148
134 otpData['status'] = 'REQUESTED'; 149 otpData['status'] = 'REQUESTED';
135 } else { 150 } else {
136 otpData['status'] = 'DISABLED'; 151 otpData['status'] = 'DISABLED';
137 throw "The requested One Time Password has been disabled, due to a wrong keyChecksum"; 152 throw "The requested One Time Password has been disabled, due to a wrong keyChecksum";
138 } 153 }
139 } else { 154 } else {
140 throw "The requested One Time Password was not active"; 155 throw "The requested One Time Password was not active";
141 } 156 }
142 } else { 157 } else {
143 throw "The requested One Time Password has not been found" 158 throw "The requested One Time Password has not been found"
144 } 159 }
145 } catch (exception) { 160 } catch (exception) {
146 result = { 161 result = {
147 'data': Clipperz.PM.Crypto.randomKey(), 162 'data': Clipperz.PM.Crypto.randomKey(),
148 'version':Clipperz.PM.Connection.communicationProtocol.currentVersion 163 'version':Clipperz.PM.Connection.communicationProtocol.currentVersion
149 } 164 }
150 } 165 }
151 nextTollRequestType = 'CONNECT'; 166 nextTollRequestType = 'CONNECT';
152 } else { 167 } else {
153 Clipperz.logError("Clipperz.PM.Proxy.Test.handshake - unhandled message: " + someParameters.message); 168 Clipperz.logError("Clipperz.PM.Proxy.Test.handshake - unhandled message: " + someParameters.message);
154 } 169 }
155 170
156 result = { 171 result = {
157 result: result, 172 result: result,
158 toll: this.getTollForRequestType(nextTollRequestType) 173 toll: this.getTollForRequestType(nextTollRequestType)
159 } 174 }
160 175
161 return result; 176 return result;
162 }, 177 },
163 178
164 //------------------------------------------------------------------------- 179 //-------------------------------------------------------------------------
165 180
166 '_message': function(aConnection, someParameters) { 181 '_message': function(aConnection, someParameters) {
167 var result; 182 var result;
168 183
169 result = {}; 184 result = {};
170 185
171 //===================================================================== 186 //=====================================================================
172 // 187 //
173 // R E A D - O N L Y M e t h o d s 188 // R E A D - O N L Y M e t h o d s
174 // 189 //
175 //===================================================================== 190 //=====================================================================
176 if (someParameters.message == 'getUserDetails') { 191 if (someParameters.message == 'getUserDetails') {
177 var recordsStats; 192 var recordsStats;
178 var recordReference; 193 var recordReference;
179 194
180 recordsStats = {}; 195 recordsStats = {};
181 for (recordReference in aConnection['userData']['records']) { 196 for (recordReference in aConnection['userData']['records']) {
182 recordsStats[recordReference] = { 197 recordsStats[recordReference] = {
183 'updateDate': aConnection['userData']['records'][recordReference]['updateDate'] 198 'updateDate': aConnection['userData']['records'][recordReference]['updateDate']
184 } 199 }
185 } 200 }
186 201
187 result['header'] = this.userDetails(aConnection); 202 result['header'] = this.userDetails(aConnection);
188 result['statistics'] = this.statistics(aConnection); 203 result['statistics'] = this.statistics(aConnection);
189 result['maxNumberOfRecords'] = aConnection['userData']['maxNumberOfRecords']; 204 result['maxNumberOfRecords'] = aConnection['userData']['maxNumberOfRecords'];
190 result['version'] = aConnection['userData']['userDetailsVersion']; 205 result['version'] = aConnection['userData']['userDetailsVersion'];
191 result['recordsStats'] = recordsStats; 206 result['recordsStats'] = recordsStats;
192 207
193 if (this.isReadOnly() == false) { 208 if (this.isReadOnly() == false) {
194 varlock; 209 varlock;
195 210
196 if (typeof(aConnection['userData']['lock']) == 'undefined') { 211 if (typeof(aConnection['userData']['lock']) == 'undefined') {
197 aConnection['userData']['lock'] = "<<LOCK>>"; 212 aConnection['userData']['lock'] = "<<LOCK>>";
198 } 213 }
199 214
200 result['lock'] = aConnection['userData']['lock']; 215 result['lock'] = aConnection['userData']['lock'];
201 } 216 }
202 217
203 //===================================================================== 218 //=====================================================================
204 } else if (someParameters.message == 'getRecordDetail') { 219 } else if (someParameters.message == 'getRecordDetail') {
205/* 220/*
206 varrecordData; 221 varrecordData;
207 var currentVersionData; 222 var currentVersionData;
208 223
209 recordData = this.userData()['records'][someParameters['parameters']['reference']]; 224 recordData = this.userData()['records'][someParameters['parameters']['reference']];
210 result['reference'] = someParameters['parameters']['reference']; 225 result['reference'] = someParameters['parameters']['reference'];
211 result['data'] = recordData['data']; 226 result['data'] = recordData['data'];
212 result['version'] = recordData['version']; 227 result['version'] = recordData['version'];
213 result['creationData'] = recordData['creationDate']; 228 result['creationData'] = recordData['creationDate'];
214 result['updateDate'] = recordData['updateDate']; 229 result['updateDate'] = recordData['updateDate'];
215 result['accessDate'] = recordData['accessDate']; 230 result['accessDate'] = recordData['accessDate'];
216 231
217 currentVersionData = recordData['versions'][recordData['currentVersion']]; 232 currentVersionData = recordData['versions'][recordData['currentVersion']];
218 233
219 result['currentVersion'] = {}; 234 result['currentVersion'] = {};
220 result['currentVersion']['reference'] = recordData['currentVersion']; 235 result['currentVersion']['reference'] = recordData['currentVersion'];
221 result['currentVersion']['version'] = currentVersionData['version']; 236 result['currentVersion']['version'] = currentVersionData['version'];
222 result['currentVersion']['header'] = currentVersionData['header']; 237 result['currentVersion']['header'] = currentVersionData['header'];
223 result['currentVersion']['data'] = currentVersionData['data']; 238 result['currentVersion']['data'] = currentVersionData['data'];
224 result['currentVersion']['creationData'] = currentVersionData['creationDate']; 239 result['currentVersion']['creationData'] = currentVersionData['creationDate'];
225 result['currentVersion']['updateDate'] = currentVersionData['updateDate']; 240 result['currentVersion']['updateDate'] = currentVersionData['updateDate'];
226 result['currentVersion']['accessDate'] = currentVersionData['accessDate']; 241 result['currentVersion']['accessDate'] = currentVersionData['accessDate'];
227 if (typeof(currentVersionData['previousVersion']) != 'undefined') { 242 if (typeof(currentVersionData['previousVersion']) != 'undefined') {
228 result['currentVersion']['previousVersionKey'] = currentVersionData['previousVersionKey']; 243 result['currentVersion']['previousVersionKey'] = currentVersionData['previousVersionKey'];
229 result['currentVersion']['previousVersion'] = currentVersionData['previousVersion']; 244 result['currentVersion']['previousVersion'] = currentVersionData['previousVersion'];
230 } 245 }
231*/ 246*/
232 MochiKit.Base.update(result, aConnection['userData']['records'][someParameters['parameters']['reference']]); 247 MochiKit.Base.update(result, aConnection['userData']['records'][someParameters['parameters']['reference']]);
233 result['reference'] = someParameters['parameters']['reference']; 248 result['reference'] = someParameters['parameters']['reference'];
234 249
235 //===================================================================== 250 //=====================================================================
236 // 251 //
237 // R E A D - W R I T E M e t h o d s 252 // R E A D - W R I T E M e t h o d s
238 // 253 //
239 //===================================================================== 254 //=====================================================================
240 } else if (someParameters.message == 'upgradeUserCredentials') { 255 } else if (someParameters.message == 'upgradeUserCredentials') {
241 if (this.isReadOnly() == false) { 256 if (this.isReadOnly() == false) {
242 var parameters; 257 var parameters;
243 var credentials; 258 var credentials;
244 259
245 parameters = someParameters['parameters']; 260 parameters = someParameters['parameters'];
246 credentials = parameters['credentials']; 261 credentials = parameters['credentials'];
247 262
248 if ((credentials['C'] == null) 263 if ((credentials['C'] == null)
249 ||(credentials['s'] == null) 264 ||(credentials['s'] == null)
250 ||(credentials['v'] == null) 265 ||(credentials['v'] == null)
251 ||(credentials['version'] != Clipperz.PM.Connection.communicationProtocol.currentVersion) 266 ||(credentials['version'] != Clipperz.PM.Connection.communicationProtocol.currentVersion)
252 ) { 267 ) {
253 result = Clipperz.PM.DataModel.User.exception.CredentialUpgradeFailed; 268 result = Clipperz.PM.DataModel.User.exception.CredentialUpgradeFailed;
254 } else { 269 } else {
255 varoldCValue; 270 varoldCValue;
256 oldCValue = aConnection['C']; 271 oldCValue = aConnection['C'];
257 272
258 this.data()['users'][credentials['C']] = aConnection['userData']; 273 this.data()['users'][credentials['C']] = aConnection['userData'];
259 aConnection['C'] = credentials['C']; 274 aConnection['C'] = credentials['C'];
260 275
261 aConnection['userData']['s'] = credentials['s']; 276 aConnection['userData']['s'] = credentials['s'];
262 aConnection['userData']['v'] = credentials['v']; 277 aConnection['userData']['v'] = credentials['v'];
263 aConnection['userData']['version'] = credentials['version']; 278 aConnection['userData']['version'] = credentials['version'];
264 279
265 aConnection['userData']['userDetails'] = parameters['user']['header']; 280 aConnection['userData']['userDetails'] = parameters['user']['header'];
266 aConnection['userData']['userDetailsVersion'] = parameters['user']['version']; 281 aConnection['userData']['userDetailsVersion'] = parameters['user']['version'];
267 aConnection['userData']['statistics'] = parameters['user']['statistics']; 282 aConnection['userData']['statistics'] = parameters['user']['statistics'];
268 283
269 aConnection['userData']['lock'] = parameters['user']['lock']; 284 aConnection['userData']['lock'] = parameters['user']['lock'];
270 285
271 delete this.data()['users'][oldCValue]; 286 delete this.data()['users'][oldCValue];
272 287
273 result = {result:"done", parameters:parameters}; 288 result = {result:"done", parameters:parameters};
274 } 289 }
275 } else { 290 } else {
276 throw Clipperz.PM.Proxy.Offline.DataStore.exception.ReadOnly; 291 throw Clipperz.PM.Proxy.Offline.DataStore.exception.ReadOnly;
277 } 292 }
278 293
279 //===================================================================== 294 //=====================================================================
280 295
281 } else if (someParameters.message == 'saveChanges') { 296 } else if (someParameters.message == 'saveChanges') {
282 if (this.isReadOnly() == false) { 297 if (this.isReadOnly() == false) {
283 var i, c; 298 var i, c;
284 299
285 if (aConnection['userData']['lock']!= someParameters['parameters']['user']['lock']) { 300 if (aConnection['userData']['lock']!= someParameters['parameters']['user']['lock']) {
286 throw "the lock attribute is not processed correctly" 301 throw "the lock attribute is not processed correctly"
287 } 302 }
288 303
289 aConnection['userData']['userDetails'] = someParameters['parameters']['user']['header']; 304 aConnection['userData']['userDetails'] = someParameters['parameters']['user']['header'];
290 aConnection['userData']['statistics'] = someParameters['parameters']['user']['statistics']; 305 aConnection['userData']['statistics'] = someParameters['parameters']['user']['statistics'];
291 aConnection['userData']['userDetailsVersion']= someParameters['parameters']['user']['version']; 306 aConnection['userData']['userDetailsVersion']= someParameters['parameters']['user']['version'];
292 307
293 c = someParameters['parameters']['records']['updated'].length; 308 c = someParameters['parameters']['records']['updated'].length;
294 for (i=0; i<c; i++) { 309 for (i=0; i<c; i++) {
295 var currentRecord; 310 var currentRecord;
296 var currentRecordData; 311 var currentRecordData;
297 312
298 currentRecordData = someParameters['parameters']['records']['updated'][i]; 313 currentRecordData = someParameters['parameters']['records']['updated'][i];
299 currentRecord = aConnection['userData']['records'][currentRecordData['record']['reference']]; 314 currentRecord = aConnection['userData']['records'][currentRecordData['record']['reference']];
300 315
301 if ( 316 if (
302 (typeof(aConnection['userData']['records'][currentRecordData['record']['reference']]) == 'undefined') 317 (typeof(aConnection['userData']['records'][currentRecordData['record']['reference']]) == 'undefined')
303 && 318 &&
304 (typeof(currentRecordData['currentRecordVersion']) == 'undefined') 319 (typeof(currentRecordData['currentRecordVersion']) == 'undefined')
305 ) { 320 ) {
306 throw "Record added without a recordVersion"; 321 throw "Record added without a recordVersion";
307 } 322 }
308 323
309 if (currentRecord == null) { 324 if (currentRecord == null) {
310 currentRecord = {}; 325 currentRecord = {};
311 currentRecord['versions'] = {}; 326 currentRecord['versions'] = {};
312 currentRecord['creationDate']= Clipperz.PM.Date.formatDateWithUTCFormat(new Date()); 327 currentRecord['creationDate']= Clipperz.PM.Date.formatDateWithUTCFormat(new Date());
313 currentRecord['accessDate'] = Clipperz.PM.Date.formatDateWithUTCFormat(new Date()); 328 currentRecord['accessDate'] = Clipperz.PM.Date.formatDateWithUTCFormat(new Date());
314 329
315 aConnection['userData']['records'][currentRecordData['record']['reference']] = currentRecord; 330 aConnection['userData']['records'][currentRecordData['record']['reference']] = currentRecord;
316 } 331 }
317 332
318 currentRecord['data'] = currentRecordData['record']['data']; 333 currentRecord['data'] = currentRecordData['record']['data'];
319 currentRecord['version']= currentRecordData['record']['version']; 334 currentRecord['version']= currentRecordData['record']['version'];
320 currentRecord['updateDate']= Clipperz.PM.Date.formatDateWithUTCFormat(new Date()); 335 currentRecord['updateDate']= Clipperz.PM.Date.formatDateWithUTCFormat(new Date());
321 336
322 if (typeof(currentRecordData['currentRecordVersion']) != 'undefined') { 337 if (typeof(currentRecordData['currentRecordVersion']) != 'undefined') {
323 currentRecord['currentVersion'] = currentRecordData['currentRecordVersion']['reference']; 338 currentRecord['currentVersion'] = currentRecordData['currentRecordVersion']['reference'];
324 currentRecord['versions'][currentRecordData['currentRecordVersion']['reference']] = { 339 currentRecord['versions'][currentRecordData['currentRecordVersion']['reference']] = {
325 'data': currentRecordData['currentRecordVersion']['data'], 340 'data': currentRecordData['currentRecordVersion']['data'],
326 'version': currentRecordData['currentRecordVersion']['version'], 341 'version': currentRecordData['currentRecordVersion']['version'],
327 'previousVersion': currentRecordData['currentRecordVersion']['previousVersion'], 342 'previousVersion': currentRecordData['currentRecordVersion']['previousVersion'],
328 'previousVersionKey':currentRecordData['currentRecordVersion']['previousVersionKey'], 343 'previousVersionKey':currentRecordData['currentRecordVersion']['previousVersionKey'],
329 'creationDate':Clipperz.PM.Date.formatDateWithUTCFormat(new Date()), 344 'creationDate':Clipperz.PM.Date.formatDateWithUTCFormat(new Date()),
330 'updateDate':Clipperz.PM.Date.formatDateWithUTCFormat(new Date()), 345 'updateDate':Clipperz.PM.Date.formatDateWithUTCFormat(new Date()),
331 'accessDate':Clipperz.PM.Date.formatDateWithUTCFormat(new Date()) 346 'accessDate':Clipperz.PM.Date.formatDateWithUTCFormat(new Date())
332 } 347 }
333 } 348 }
334 } 349 }
335 350
336 c = someParameters['parameters']['records']['deleted'].length; 351 c = someParameters['parameters']['records']['deleted'].length;
337 for (i=0; i<c; i++) { 352 for (i=0; i<c; i++) {
338 var currentRecordReference; 353 var currentRecordReference;
339 354
340 currentRecordReference = someParameters['parameters']['records']['deleted'][i]; 355 currentRecordReference = someParameters['parameters']['records']['deleted'][i];
341 delete aConnection['userData']['records'][currentRecordReference]; 356 delete aConnection['userData']['records'][currentRecordReference];
342 } 357 }
343 358
344 aConnection['userData']['lock'] = Clipperz.PM.Crypto.randomKey(); 359 aConnection['userData']['lock'] = Clipperz.PM.Crypto.randomKey();
345 result['lock'] = aConnection['userData']['lock']; 360 result['lock'] = aConnection['userData']['lock'];
346 result['result'] = 'done'; 361 result['result'] = 'done';
347 } else { 362 } else {
348 throw Clipperz.PM.Proxy.Offline.DataStore.exception.ReadOnly; 363 throw Clipperz.PM.Proxy.Offline.DataStore.exception.ReadOnly;
349 } 364 }
350 365
351 //===================================================================== 366 //=====================================================================
352 // 367 //
353 // U N H A N D L E D M e t h o d 368 // U N H A N D L E D M e t h o d
354 // 369 //
355 //===================================================================== 370 //=====================================================================
356 } else { 371 } else {
357 Clipperz.logError("Clipperz.PM.Proxy.Test.message - unhandled message: " + someParameters.message); 372 Clipperz.logError("Clipperz.PM.Proxy.Test.message - unhandled message: " + someParameters.message);
358 } 373 }
359 374
360 result = { 375 result = {
361 result: result, 376 result: result,
362 toll: this.getTollForRequestType('MESSAGE') 377 toll: this.getTollForRequestType('MESSAGE')
363 } 378 }
364 379
365 // return MochiKit.Async.succeed(result); 380 // return MochiKit.Async.succeed(result);
366 return result; 381 return result;
367 }, 382 },
368 383
369 //------------------------------------------------------------------------- 384 //-------------------------------------------------------------------------
370 385
371 '_logout': function(someParameters) { 386 '_logout': function(someParameters) {
372 // return MochiKit.Async.succeed({result: 'done'}); 387 // return MochiKit.Async.succeed({result: 'done'});
373 return {result: 'done'}; 388 return {result: 'done'};
374 }, 389 },
375 390
376 //========================================================================= 391 //=========================================================================
377 //######################################################################### 392 //#########################################################################
378/* 393/*
379 'userDetails': function(aConnection) { 394 'userDetails': function(aConnection) {
380 var result; 395 var result;
381 396
382 if (this.isTestData(aConnection)) { 397 if (this.isTestData(aConnection)) {
383 var serializedHeader; 398 var serializedHeader;
384 var version; 399 var version;
385 400
386//Clipperz.logDebug("### test data"); 401//Clipperz.logDebug("### test data");
387 version = aConnection['userData']['userDetailsVersion']; 402 version = aConnection['userData']['userDetailsVersion'];
388 serializedHeader = Clipperz.Base.serializeJSON(aConnection['userData']['userDetails']); 403 serializedHeader = Clipperz.Base.serializeJSON(aConnection['userData']['userDetails']);
389 result = Clipperz.PM.Crypto.encryptingFunctions.versions[version].encrypt(aConnection['userData']['__masterkey_test_value__'], serializedHeader); 404 result = Clipperz.PM.Crypto.encryptingFunctions.versions[version].encrypt(aConnection['userData']['__masterkey_test_value__'], serializedHeader);
390 } else { 405 } else {
391//Clipperz.logDebug("### NOT test data"); 406//Clipperz.logDebug("### NOT test data");
392 result = aConnection['userData']['userDetails']; 407 result = aConnection['userData']['userDetails'];
393 } 408 }
394 409
395 return result; 410 return result;
396 }, 411 },
397 412
398 'statistics': function(aConnection) { 413 'statistics': function(aConnection) {
399 var result; 414 var result;
400 415
401 if (aConnection['userData']['statistics'] != null) { 416 if (aConnection['userData']['statistics'] != null) {
402 if (this.isTestData(aConnection)) { 417 if (this.isTestData(aConnection)) {
403 var serializedStatistics; 418 var serializedStatistics;
404 var version; 419 var version;
405 420
406 version = aConnection['userData']['userDetailsVersion']; 421 version = aConnection['userData']['userDetailsVersion'];
407 serializedStatistics = Clipperz.Base.serializeJSON(aConnection['userData']['statistics']); 422 serializedStatistics = Clipperz.Base.serializeJSON(aConnection['userData']['statistics']);
408 result = Clipperz.PM.Crypto.encryptingFunctions.versions[version].encrypt(aConnection['userData']['__masterkey_test_value__'], serializedStatistics); 423 result = Clipperz.PM.Crypto.encryptingFunctions.versions[version].encrypt(aConnection['userData']['__masterkey_test_value__'], serializedStatistics);
409 } else { 424 } else {
410 result = aConnection['userData']['statistics']; 425 result = aConnection['userData']['statistics'];
411 } 426 }
412 } else { 427 } else {
413 result = null; 428 result = null;
414 } 429 }
415 430
416 return result; 431 return result;
417 }, 432 },
418*/ 433*/
419 //========================================================================= 434 //=========================================================================
420 __syntaxFix__: "syntax fix" 435 __syntaxFix__: "syntax fix"
421}); 436});
422 437
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 b806cb7..e5f68a8 100644
--- a/frontend/gamma/js/Clipperz/PM/Proxy/Proxy.Offline.DataStore.js
+++ b/frontend/gamma/js/Clipperz/PM/Proxy/Proxy.Offline.DataStore.js
@@ -1,738 +1,753 @@
1/* 1/*
2 2
3Copyright 2008-2013 Clipperz Srl 3Copyright 2008-2013 Clipperz Srl
4 4
5This file is part of Clipperz, the online password manager. 5This file is part of Clipperz, the online password manager.
6For further information about its features and functionalities please 6For further information about its features and functionalities please
7refer to http://www.clipperz.com. 7refer to http://www.clipperz.com.
8 8
9* Clipperz is free software: you can redistribute it and/or modify it 9* Clipperz is free software: you can redistribute it and/or modify it
10 under the terms of the GNU Affero General Public License as published 10 under the terms of the GNU Affero General Public License as published
11 by the Free Software Foundation, either version 3 of the License, or 11 by the Free Software Foundation, either version 3 of the License, or
12 (at your option) any later version. 12 (at your option) any later version.
13 13
14* Clipperz is distributed in the hope that it will be useful, but 14* Clipperz is distributed in the hope that it will be useful, but
15 WITHOUT ANY WARRANTY; without even the implied warranty of 15 WITHOUT ANY WARRANTY; without even the implied warranty of
16 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. 16 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
17 See the GNU Affero General Public License for more details. 17 See the GNU Affero General Public License for more details.
18 18
19* You should have received a copy of the GNU Affero General Public 19* You should have received a copy of the GNU Affero General Public
20 License along with Clipperz. If not, see http://www.gnu.org/licenses/. 20 License along with Clipperz. If not, see http://www.gnu.org/licenses/.
21 21
22*/ 22*/
23 23
24try { if (typeof(Clipperz.PM.Proxy.Offline) == 'undefined') { throw ""; }} catch (e) { 24try { if (typeof(Clipperz.PM.Proxy.Offline) == 'undefined') { throw ""; }} catch (e) {
25 throw "Clipperz.PM.Proxy.Offline.DataStore depends on Clipperz.PM.Proxy.Offline!"; 25 throw "Clipperz.PM.Proxy.Offline.DataStore depends on Clipperz.PM.Proxy.Offline!";
26} 26}
27 27
28//============================================================================= 28//=============================================================================
29 29
30Clipperz.PM.Proxy.Offline.DataStore = function(args) { 30Clipperz.PM.Proxy.Offline.DataStore = function(args) {
31 args = args || {}; 31 args = args || {};
32 32
33 this._data = args.data || (typeof(_clipperz_dump_data_) != 'undefined' ? _clipperz_dump_data_ : null); 33 this._data = args.data || (typeof(_clipperz_dump_data_) != 'undefined' ? _clipperz_dump_data_ : null);
34 this._isReadOnly = (typeof(args.readOnly) == 'undefined' ? true : args.readOnly); 34 this._isReadOnly = (typeof(args.readOnly) == 'undefined' ? true : args.readOnly);
35 this._shouldPayTolls = args.shouldPayTolls || false; 35 this._shouldPayTolls = args.shouldPayTolls || false;
36 36
37 this._tolls = {}; 37 this._tolls = {};
38 this._currentStaticConnection = null; 38 this._currentStaticConnection = null;
39 39
40 return this; 40 return this;
41} 41}
42 42
43Clipperz.Base.extend(Clipperz.PM.Proxy.Offline.DataStore, Object, { 43Clipperz.Base.extend(Clipperz.PM.Proxy.Offline.DataStore, Object, {
44 44
45 //------------------------------------------------------------------------- 45 //-------------------------------------------------------------------------
46 46
47 'isReadOnly': function () { 47 'isReadOnly': function () {
48 return this._isReadOnly; 48 return this._isReadOnly;
49 }, 49 },
50 50
51 //------------------------------------------------------------------------- 51 //-------------------------------------------------------------------------
52 52
53 'shouldPayTolls': function() { 53 'shouldPayTolls': function() {
54 return this._shouldPayTolls; 54 return this._shouldPayTolls;
55 }, 55 },
56 56
57 //------------------------------------------------------------------------- 57 //-------------------------------------------------------------------------
58 58
59 'data': function () { 59 'data': function () {
60 return this._data; 60 return this._data;
61 }, 61 },
62 62
63 //------------------------------------------------------------------------- 63 //-------------------------------------------------------------------------
64 64
65 'tolls': function () { 65 'tolls': function () {
66 return this._tolls; 66 return this._tolls;
67 }, 67 },
68 68
69 //========================================================================= 69 //=========================================================================
70 70
71 'resetData': function() { 71 'resetData': function() {
72 this._data = { 72 this._data = {
73 'users': { 73 'users': {
74 'catchAllUser': { 74 'catchAllUser': {
75 __masterkey_test_value__: 'masterkey', 75 __masterkey_test_value__: 'masterkey',
76 s: '112233445566778899aabbccddeeff00112233445566778899aabbccddeeff00', 76 s: '112233445566778899aabbccddeeff00112233445566778899aabbccddeeff00',
77 v: '112233445566778899aabbccddeeff00112233445566778899aabbccddeeff00' 77 v: '112233445566778899aabbccddeeff00112233445566778899aabbccddeeff00'
78 } 78 }
79 } 79 }
80 }; 80 };
81 }, 81 },
82 82
83 //------------------------------------------------------------------------- 83 //-------------------------------------------------------------------------
84 84
85 'setupWithEncryptedData': function(someData) { 85 'setupWithEncryptedData': function(someData) {
86 this._data = Clipperz.Base.deepClone(someData); 86 this._data = Clipperz.Base.deepClone(someData);
87 }, 87 },
88 88
89 //------------------------------------------------------------------------- 89 //-------------------------------------------------------------------------
90 90
91 'setupWithData': function(someData) { 91 'setupWithData': function(someData) {
92 var deferredResult; 92 var deferredResult;
93 var resultData; 93 var resultData;
94 var i, c; 94 var i, c;
95 95
96//Clipperz.log(">>> Proxy.Test.setupWithData"); 96//Clipperz.log(">>> Proxy.Test.setupWithData");
97 resultData = this._data; 97 resultData = this._data;
98 98
99 deferredResult = new Clipperz.Async.Deferred("Proxy.Test.seupWithData", {trace:false}); 99 deferredResult = new Clipperz.Async.Deferred("Proxy.Test.seupWithData", {trace:false});
100 c = someData['users'].length; 100 c = someData['users'].length;
101 101
102 for (i=0; i<c; i++) { 102 for (i=0; i<c; i++) {
103 varnewConnection; 103 varnewConnection;
104 varrecordConfiguration; 104 varrecordConfiguration;
105 105
106 deferredResult.addMethod(this, 'userSerializedEncryptedData', someData['users'][i]); 106 deferredResult.addMethod(this, 'userSerializedEncryptedData', someData['users'][i]);
107 deferredResult.addCallback(MochiKit.Base.bind(function(aUserSerializationContext) { 107 deferredResult.addCallback(MochiKit.Base.bind(function(aUserSerializationContext) {
108 resultData['users'][aUserSerializationContext['credentials']['C']] = { 108 resultData['users'][aUserSerializationContext['credentials']['C']] = {
109 's': aUserSerializationContext['credentials']['s'], 109 's': aUserSerializationContext['credentials']['s'],
110 'v': aUserSerializationContext['credentials']['v'], 110 'v': aUserSerializationContext['credentials']['v'],
111 'version': aUserSerializationContext['data']['connectionVersion'], 111 'version': aUserSerializationContext['data']['connectionVersion'],
112 'userDetails': aUserSerializationContext['encryptedData']['user']['header'], 112 'userDetails': aUserSerializationContext['encryptedData']['user']['header'],
113 'userDetailsVersion':aUserSerializationContext['encryptedData']['user']['version'], 113 'userDetailsVersion':aUserSerializationContext['encryptedData']['user']['version'],
114 'statistics': aUserSerializationContext['encryptedData']['user']['statistics'], 114 'statistics': aUserSerializationContext['encryptedData']['user']['statistics'],
115 'lock': aUserSerializationContext['encryptedData']['user']['lock'], 115 'lock': aUserSerializationContext['encryptedData']['user']['lock'],
116 'records': this.rearrangeRecordsData(aUserSerializationContext['encryptedData']['records']) 116 'records': this.rearrangeRecordsData(aUserSerializationContext['encryptedData']['records'])
117 } 117 }
118 }, this)); 118 }, this));
119 } 119 }
120 120
121 deferredResult.addCallback(MochiKit.Base.bind(function() { 121 deferredResult.addCallback(MochiKit.Base.bind(function() {
122 this._data = resultData; 122 this._data = resultData;
123 }, this)); 123 }, this));
124 124
125 deferredResult.callback(); 125 deferredResult.callback();
126//Clipperz.log("<<< Proxy.Test.setupWithData"); 126//Clipperz.log("<<< Proxy.Test.setupWithData");
127 127
128 return deferredResult; 128 return deferredResult;
129 }, 129 },
130 130
131 //========================================================================= 131 //=========================================================================
132 132
133 'getTollForRequestType': function (aRequestType) { 133 'getTollForRequestType': function (aRequestType) {
134 varresult; 134 varresult;
135 vartargetValue; 135 vartargetValue;
136 var cost; 136 var cost;
137 137
138 targetValue = Clipperz.Crypto.PRNG.defaultRandomGenerator().getRandomBytes(32).toHexString().substring(2); 138 targetValue = Clipperz.Crypto.PRNG.defaultRandomGenerator().getRandomBytes(32).toHexString().substring(2);
139 switch (aRequestType) { 139 switch (aRequestType) {
140 case 'REGISTER': 140 case 'REGISTER':
141 cost = 5; 141 cost = 5;
142 break; 142 break;
143 case 'CONNECT': 143 case 'CONNECT':
144 cost = 5; 144 cost = 5;
145 break; 145 break;
146 case 'MESSAGE': 146 case 'MESSAGE':
147 cost = 2; 147 cost = 2;
148 break; 148 break;
149 } 149 }
150 150
151 result = { 151 result = {
152 requestType: aRequestType, 152 requestType: aRequestType,
153 targetValue: targetValue, 153 targetValue: targetValue,
154 cost: cost 154 cost: cost
155 } 155 }
156 156
157 if (this.shouldPayTolls()) { 157 if (this.shouldPayTolls()) {
158 this.tolls()[targetValue] = result; 158 this.tolls()[targetValue] = result;
159 } 159 }
160 160
161 return result; 161 return result;
162 }, 162 },
163 163
164 //------------------------------------------------------------------------- 164 //-------------------------------------------------------------------------
165 165
166 'checkToll': function (aFunctionName, someParameters) { 166 'checkToll': function (aFunctionName, someParameters) {
167 if (this.shouldPayTolls()) { 167 if (this.shouldPayTolls()) {
168 var localToll; 168 var localToll;
169 vartollParameters; 169 vartollParameters;
170 170
171 tollParameters = someParameters['toll']; 171 tollParameters = someParameters['toll'];
172 localToll = this.tolls()[tollParameters['targetValue']]; 172 localToll = this.tolls()[tollParameters['targetValue']];
173 173
174 if (localToll != null) { 174 if (localToll != null) {
175 if (! Clipperz.PM.Toll.validate(tollParameters['targetValue'], tollParameters['toll'], localToll['cost'])) { 175 if (! Clipperz.PM.Toll.validate(tollParameters['targetValue'], tollParameters['toll'], localToll['cost'])) {
176 throw "Toll value too low."; 176 throw "Toll value too low.";
177 }; 177 };
178 } else { 178 } else {
179 throw "Missing toll"; 179 throw "Missing toll";
180 } 180 }
181 } 181 }
182 }, 182 },
183 183
184 //========================================================================= 184 //=========================================================================
185 185
186 'currentStaticConnection': function () { 186 'currentStaticConnection': function () {
187 if (this._currentStaticConnection == null) { 187 if (this._currentStaticConnection == null) {
188 this._currentStaticConnection = {}; 188 this._currentStaticConnection = {};
189 } 189 }
190 190
191 return this._currentStaticConnection; 191 return this._currentStaticConnection;
192 }, 192 },
193 193
194 //------------------------------------------------------------------------- 194 //-------------------------------------------------------------------------
195 195
196 'getConnectionForRequest': function (aFunctionName, someParameters) { 196 'getConnectionForRequest': function (aFunctionName, someParameters) {
197 varresult; 197 varresult;
198 198
199 if (this.shouldPayTolls()) { 199 if (this.shouldPayTolls()) {
200 if ((typeof(someParameters['toll']) != 'undefined') && (typeof(someParameters['toll']['targetValue']) != 'undefined')) { 200 if ((typeof(someParameters['toll']) != 'undefined') && (typeof(someParameters['toll']['targetValue']) != 'undefined')) {
201 result = this.tolls()[someParameters['toll']['targetValue']]['connection']; 201 result = this.tolls()[someParameters['toll']['targetValue']]['connection'];
202 if (typeof(result) == 'undefined') { 202 if (typeof(result) == 'undefined') {
203 result = {}; 203 result = {};
204 } 204 }
205 } else { 205 } else {
206 result = {}; 206 result = {};
207 } 207 }
208 } else { 208 } else {
209 result = this.currentStaticConnection(); 209 result = this.currentStaticConnection();
210 } 210 }
211 211
212 return result; 212 return result;
213 }, 213 },
214 214
215 //------------------------------------------------------------------------- 215 //-------------------------------------------------------------------------
216 216
217 'storeConnectionForRequestWithConnectionAndResponse': function (aFunctionName, someParameters, aConnection, aResponse) { 217 'storeConnectionForRequestWithConnectionAndResponse': function (aFunctionName, someParameters, aConnection, aResponse) {
218 if (this.shouldPayTolls()) { 218 if (this.shouldPayTolls()) {
219 if ((typeof(aResponse['toll']) != 'undefined') 219 if ((typeof(aResponse['toll']) != 'undefined')
220 &&(typeof(aResponse['toll']['targetValue']) != 'undefined') 220 &&(typeof(aResponse['toll']['targetValue']) != 'undefined')
221 &&(typeof(this.tolls()[aResponse['toll']['targetValue']]) != 'undefined') 221 &&(typeof(this.tolls()[aResponse['toll']['targetValue']]) != 'undefined')
222 ) { 222 ) {
223 this.tolls()[aResponse['toll']['targetValue']]['connection'] = aConnection; 223 this.tolls()[aResponse['toll']['targetValue']]['connection'] = aConnection;
224 } 224 }
225 } 225 }
226 }, 226 },
227 227
228 //========================================================================= 228 //=========================================================================
229 229
230 'processMessage': function (aFunctionName, someParameters) { 230 'processMessage': function (aFunctionName, someParameters) {
231 var result; 231 var result;
232 varconnection; 232 varconnection;
233 233
234 connection = this.getConnectionForRequest(aFunctionName, someParameters); 234 connection = this.getConnectionForRequest(aFunctionName, someParameters);
235 235
236 switch(aFunctionName) { 236 switch(aFunctionName) {
237 case 'knock': 237 case 'knock':
238 result = this._knock(connection, someParameters); 238 result = this._knock(connection, someParameters);
239 break; 239 break;
240 case 'registration': 240 case 'registration':
241 this.checkToll(aFunctionName, someParameters); 241 this.checkToll(aFunctionName, someParameters);
242 result = this._registration(connection, someParameters.parameters); 242 result = this._registration(connection, someParameters.parameters);
243 break; 243 break;
244 case 'handshake': 244 case 'handshake':
245 this.checkToll(aFunctionName, someParameters); 245 this.checkToll(aFunctionName, someParameters);
246 result = this._handshake(connection, someParameters.parameters); 246 result = this._handshake(connection, someParameters.parameters);
247 break; 247 break;
248 case 'message': 248 case 'message':
249 this.checkToll(aFunctionName, someParameters); 249 this.checkToll(aFunctionName, someParameters);
250 result = this._message(connection, someParameters.parameters); 250 result = this._message(connection, someParameters.parameters);
251 break; 251 break;
252 case 'logout': 252 case 'logout':
253 this._currentStaticConnection = null; 253 this._currentStaticConnection = null;
254 result = this._logout(connection, someParameters.parameters); 254 result = this._logout(connection, someParameters.parameters);
255 break; 255 break;
256 } 256 }
257 257
258 this.storeConnectionForRequestWithConnectionAndResponse(aFunctionName, someParameters, connection, result); 258 this.storeConnectionForRequestWithConnectionAndResponse(aFunctionName, someParameters, connection, result);
259 259
260 return MochiKit.Async.succeed(result); 260 return MochiKit.Async.succeed(result);
261 }, 261 },
262 262
263 //========================================================================= 263 //=========================================================================
264 264
265 '_knock': function(aConnection, someParameters) { 265 '_knock': function(aConnection, someParameters) {
266 var result; 266 var result;
267 267
268 result = { 268 result = {
269 toll: this.getTollForRequestType(someParameters['requestType']) 269 toll: this.getTollForRequestType(someParameters['requestType'])
270 } 270 }
271 271
272 return result; 272 return result;
273 }, 273 },
274 274
275 //------------------------------------------------------------------------- 275 //-------------------------------------------------------------------------
276 276
277 '_registration': function(aConnection, someParameters) { 277 '_registration': function(aConnection, someParameters) {
278 if (this.isReadOnly() == false) { 278 if (this.isReadOnly() == false) {
279 if (typeof(this.data()['users'][someParameters['credentials']['C']]) == 'undefined') { 279 if (typeof(this.data()['users'][someParameters['credentials']['C']]) == 'undefined') {
280 this.data()['users'][someParameters['credentials']['C']] = { 280 this.data()['users'][someParameters['credentials']['C']] = {
281 's': someParameters['credentials']['s'], 281 's': someParameters['credentials']['s'],
282 'v': someParameters['credentials']['v'], 282 'v': someParameters['credentials']['v'],
283 'version':someParameters['credentials']['version'], 283 'version':someParameters['credentials']['version'],
284 // 'lock': Clipperz.Crypto.Base.generateRandomSeed(), 284 // 'lock': Clipperz.Crypto.Base.generateRandomSeed(),
285 'userDetails': someParameters['user']['header'], 285 'userDetails': someParameters['user']['header'],
286 'statistics': someParameters['user']['statistics'], 286 'statistics': someParameters['user']['statistics'],
287 'userDetailsVersion':someParameters['user']['version'], 287 'userDetailsVersion':someParameters['user']['version'],
288 'records':{} 288 'records':{}
289 } 289 }
290 } else { 290 } else {
291 throw "user already exists"; 291 throw "user already exists";
292 } 292 }
293 } else { 293 } else {
294 throw Clipperz.PM.Proxy.Offline.DataStore.exception.ReadOnly; 294 throw Clipperz.PM.Proxy.Offline.DataStore.exception.ReadOnly;
295 } 295 }
296 296
297 result = { 297 result = {
298 result: { 298 result: {
299 'lock': this.data()['users'][someParameters['credentials']['C']]['lock'], 299 'lock': this.data()['users'][someParameters['credentials']['C']]['lock'],
300 'result':'done' 300 'result':'done'
301 }, 301 },
302 toll: this.getTollForRequestType('CONNECT') 302 toll: this.getTollForRequestType('CONNECT')
303 } 303 }
304 304
305 return result; 305 return result;
306 }, 306 },
307 307
308 //------------------------------------------------------------------------- 308 //-------------------------------------------------------------------------
309 309
310 '_handshake': function(aConnection, someParameters) { 310 '_handshake': function(aConnection, someParameters) {
311 var result; 311 var result;
312 varnextTollRequestType; 312 varnextTollRequestType;
313 313
314 result = {}; 314 result = {};
315 if (someParameters.message == "connect") { 315 if (someParameters.message == "connect") {
316 var userData; 316 var userData;
317 var randomBytes; 317 var randomBytes;
318 var v; 318 var v;
319 319
320 userData = this.data()['users'][someParameters.parameters.C]; 320 userData = this.data()['users'][someParameters.parameters.C];
321 321
322 if ((typeof(userData) != 'undefined') && (userData['version'] == someParameters.version)) { 322 if ((typeof(userData) != 'undefined') && (userData['version'] == someParameters.version)) {
323 aConnection['userData'] = userData; 323 aConnection['userData'] = userData;
324 aConnection['C'] = someParameters.parameters.C; 324 aConnection['C'] = someParameters.parameters.C;
325 } else { 325 } else {
326 aConnection['userData'] = this.data()['users']['catchAllUser']; 326 aConnection['userData'] = this.data()['users']['catchAllUser'];
327 } 327 }
328 328
329 randomBytes = Clipperz.Crypto.Base.generateRandomSeed(); 329 randomBytes = Clipperz.Crypto.Base.generateRandomSeed();
330 aConnection['b'] = new Clipperz.Crypto.BigInt(randomBytes, 16); 330 aConnection['b'] = new Clipperz.Crypto.BigInt(randomBytes, 16);
331 v = new Clipperz.Crypto.BigInt(aConnection['userData']['v'], 16); 331 v = new Clipperz.Crypto.BigInt(aConnection['userData']['v'], 16);
332 aConnection['B'] = v.add(Clipperz.Crypto.SRP.g().powerModule(aConnection['b'], Clipperz.Crypto.SRP.n())); 332 aConnection['B'] = (Clipperz.Crypto.SRP.k().multiply(v)).add(Clipperz.Crypto.SRP.g().powerModule(aConnection['b'], Clipperz.Crypto.SRP.n()));
333 333
334 aConnection['A'] = someParameters.parameters.A; 334 aConnection['A'] = someParameters.parameters.A;
335 335
336 result['s'] = aConnection['userData']['s']; 336 result['s'] = aConnection['userData']['s'];
337 result['B'] = aConnection['B'].asString(16); 337 result['B'] = aConnection['B'].asString(16);
338 338
339 nextTollRequestType = 'CONNECT'; 339 nextTollRequestType = 'CONNECT';
340 } else if (someParameters.message == "credentialCheck") { 340 } else if (someParameters.message == "credentialCheck") {
341 var v, u, S, A, K, M1; 341 var v, u, s, S, A, K, M1;
342 342 var stringHash = function (aValue) {
343 return Clipperz.PM.Crypto.encryptingFunctions.versions[someParameters.version].hash(new Clipperz.ByteArray(aValue)).toHexString().substring(2);
344 };
345
343 v = new Clipperz.Crypto.BigInt(aConnection['userData']['v'], 16); 346 v = new Clipperz.Crypto.BigInt(aConnection['userData']['v'], 16);
344 u = new Clipperz.Crypto.BigInt(Clipperz.PM.Crypto.encryptingFunctions.versions[someParameters.version].hash(new Clipperz.ByteArray(aConnection['B'].asString(10))).toHexString(), 16);
345 A = new Clipperz.Crypto.BigInt(aConnection['A'], 16); 347 A = new Clipperz.Crypto.BigInt(aConnection['A'], 16);
348 u = new Clipperz.Crypto.BigInt(Clipperz.PM.Crypto.encryptingFunctions.versions[someParameters.version].hash(new Clipperz.ByteArray(A.asString(10) + aConnection['B'].asString(10))).toHexString(), 16);
349 s = new Clipperz.Crypto.BigInt(aConnection['userData']['s'], 16);
346 S = (A.multiply(v.powerModule(u, Clipperz.Crypto.SRP.n()))).powerModule(aConnection['b'], Clipperz.Crypto.SRP.n()); 350 S = (A.multiply(v.powerModule(u, Clipperz.Crypto.SRP.n()))).powerModule(aConnection['b'], Clipperz.Crypto.SRP.n());
347 351
348 K = Clipperz.PM.Crypto.encryptingFunctions.versions[someParameters.version].hash(new Clipperz.ByteArray(S.asString(10))).toHexString().slice(2); 352 K = stringHash(S.asString(10));
349 353
350 M1 = Clipperz.PM.Crypto.encryptingFunctions.versions[someParameters.version].hash(new Clipperz.ByteArray(A.asString(10) + aConnection['B'].asString(10) + K)).toHexString().slice(2); 354 M1 = stringHash(
355 "597626870978286801440197562148588907434001483655788865609375806439877501869636875571920406529" +
356 stringHash(aConnection['C']) +
357 s.asString(10) +
358 A.asString(10) +
359 aConnection['B'].asString(10) +
360 K
361 );
351 if (someParameters.parameters.M1 == M1) { 362 if (someParameters.parameters.M1 == M1) {
352 var M2; 363 var M2;
353 364
354 M2 = Clipperz.PM.Crypto.encryptingFunctions.versions[someParameters.version].hash(new Clipperz.ByteArray(A.asString(10) + someParameters.parameters.M1 + K)).toHexString().slice(2); 365 M2 = stringHash(
366 A.asString(10) +
367 someParameters.parameters.M1 +
368 K
369 );
355 result['M2'] = M2; 370 result['M2'] = M2;
356 } else { 371 } else {
357 throw new Error("Client checksum verification failed! Expected <" + M1 + ">, received <" + someParameters.parameters.M1 + ">.", "Error"); 372 throw new Error("Client checksum verification failed! Expected <" + M1 + ">, received <" + someParameters.parameters.M1 + ">.", "Error");
358 } 373 }
359 374
360 nextTollRequestType = 'MESSAGE'; 375 nextTollRequestType = 'MESSAGE';
361 } else if (someParameters.message == "oneTimePassword") { 376 } else if (someParameters.message == "oneTimePassword") {
362 var otpData; 377 var otpData;
363 378
364 otpData = this.data()['onetimePasswords'][someParameters.parameters.oneTimePasswordKey]; 379 otpData = this.data()['onetimePasswords'][someParameters.parameters.oneTimePasswordKey];
365 380
366 try { 381 try {
367 if (typeof(otpData) != 'undefined') { 382 if (typeof(otpData) != 'undefined') {
368 if (otpData['status'] == 'ACTIVE') { 383 if (otpData['status'] == 'ACTIVE') {
369 if (otpData['key_checksum'] == someParameters.parameters.oneTimePasswordKeyChecksum) { 384 if (otpData['key_checksum'] == someParameters.parameters.oneTimePasswordKeyChecksum) {
370 result = { 385 result = {
371 'data': otpData['data'], 386 'data': otpData['data'],
372 'version':otpData['version'] 387 'version':otpData['version']
373 } 388 }
374 389
375 otpData['status'] = 'REQUESTED'; 390 otpData['status'] = 'REQUESTED';
376 } else { 391 } else {
377 otpData['status'] = 'DISABLED'; 392 otpData['status'] = 'DISABLED';
378 throw "The requested One Time Password has been disabled, due to a wrong keyChecksum"; 393 throw "The requested One Time Password has been disabled, due to a wrong keyChecksum";
379 } 394 }
380 } else { 395 } else {
381 throw "The requested One Time Password was not active"; 396 throw "The requested One Time Password was not active";
382 } 397 }
383 } else { 398 } else {
384 throw "The requested One Time Password has not been found" 399 throw "The requested One Time Password has not been found"
385 } 400 }
386 } catch (exception) { 401 } catch (exception) {
387 result = { 402 result = {
388 'data': Clipperz.PM.Crypto.randomKey(), 403 'data': Clipperz.PM.Crypto.randomKey(),
389 'version':Clipperz.PM.Connection.communicationProtocol.currentVersion 404 'version':Clipperz.PM.Connection.communicationProtocol.currentVersion
390 } 405 }
391 } 406 }
392 nextTollRequestType = 'CONNECT'; 407 nextTollRequestType = 'CONNECT';
393 } else { 408 } else {
394 Clipperz.logError("Clipperz.PM.Proxy.Test.handshake - unhandled message: " + someParameters.message); 409 Clipperz.logError("Clipperz.PM.Proxy.Test.handshake - unhandled message: " + someParameters.message);
395 } 410 }
396 411
397 result = { 412 result = {
398 result: result, 413 result: result,
399 toll: this.getTollForRequestType(nextTollRequestType) 414 toll: this.getTollForRequestType(nextTollRequestType)
400 } 415 }
401 416
402 return result; 417 return result;
403 }, 418 },
404 419
405 //------------------------------------------------------------------------- 420 //-------------------------------------------------------------------------
406 421
407 '_message': function(aConnection, someParameters) { 422 '_message': function(aConnection, someParameters) {
408 var result; 423 var result;
409 424
410 result = {}; 425 result = {};
411 426
412 //===================================================================== 427 //=====================================================================
413 // 428 //
414 // R E A D - O N L Y M e t h o d s 429 // R E A D - O N L Y M e t h o d s
415 // 430 //
416 //===================================================================== 431 //=====================================================================
417 if (someParameters.message == 'getUserDetails') { 432 if (someParameters.message == 'getUserDetails') {
418 var recordsStats; 433 var recordsStats;
419 var recordReference; 434 var recordReference;
420 435
421 recordsStats = {}; 436 recordsStats = {};
422 for (recordReference in aConnection['userData']['records']) { 437 for (recordReference in aConnection['userData']['records']) {
423 recordsStats[recordReference] = { 438 recordsStats[recordReference] = {
424 'updateDate': aConnection['userData']['records'][recordReference]['updateDate'] 439 'updateDate': aConnection['userData']['records'][recordReference]['updateDate']
425 } 440 }
426 } 441 }
427 442
428 result['header'] = this.userDetails(aConnection); 443 result['header'] = this.userDetails(aConnection);
429 result['statistics'] = this.statistics(aConnection); 444 result['statistics'] = this.statistics(aConnection);
430 result['maxNumberOfRecords'] = aConnection['userData']['maxNumberOfRecords']; 445 result['maxNumberOfRecords'] = aConnection['userData']['maxNumberOfRecords'];
431 result['version'] = aConnection['userData']['userDetailsVersion']; 446 result['version'] = aConnection['userData']['userDetailsVersion'];
432 result['recordsStats'] = recordsStats; 447 result['recordsStats'] = recordsStats;
433 448
434 if (this.isReadOnly() == false) { 449 if (this.isReadOnly() == false) {
435 varlock; 450 varlock;
436 451
437 if (typeof(aConnection['userData']['lock']) == 'undefined') { 452 if (typeof(aConnection['userData']['lock']) == 'undefined') {
438 aConnection['userData']['lock'] = "<<LOCK>>"; 453 aConnection['userData']['lock'] = "<<LOCK>>";
439 } 454 }
440 455
441 result['lock'] = aConnection['userData']['lock']; 456 result['lock'] = aConnection['userData']['lock'];
442 } 457 }
443 458
444 //===================================================================== 459 //=====================================================================
445 } else if (someParameters.message == 'getRecordDetail') { 460 } else if (someParameters.message == 'getRecordDetail') {
446/* 461/*
447 varrecordData; 462 varrecordData;
448 var currentVersionData; 463 var currentVersionData;
449 464
450 recordData = this.userData()['records'][someParameters['parameters']['reference']]; 465 recordData = this.userData()['records'][someParameters['parameters']['reference']];
451 result['reference'] = someParameters['parameters']['reference']; 466 result['reference'] = someParameters['parameters']['reference'];
452 result['data'] = recordData['data']; 467 result['data'] = recordData['data'];
453 result['version'] = recordData['version']; 468 result['version'] = recordData['version'];
454 result['creationData'] = recordData['creationDate']; 469 result['creationData'] = recordData['creationDate'];
455 result['updateDate'] = recordData['updateDate']; 470 result['updateDate'] = recordData['updateDate'];
456 result['accessDate'] = recordData['accessDate']; 471 result['accessDate'] = recordData['accessDate'];
457 472
458 currentVersionData = recordData['versions'][recordData['currentVersion']]; 473 currentVersionData = recordData['versions'][recordData['currentVersion']];
459 474
460 result['currentVersion'] = {}; 475 result['currentVersion'] = {};
461 result['currentVersion']['reference'] = recordData['currentVersion']; 476 result['currentVersion']['reference'] = recordData['currentVersion'];
462 result['currentVersion']['version'] = currentVersionData['version']; 477 result['currentVersion']['version'] = currentVersionData['version'];
463 result['currentVersion']['header'] = currentVersionData['header']; 478 result['currentVersion']['header'] = currentVersionData['header'];
464 result['currentVersion']['data'] = currentVersionData['data']; 479 result['currentVersion']['data'] = currentVersionData['data'];
465 result['currentVersion']['creationData'] = currentVersionData['creationDate']; 480 result['currentVersion']['creationData'] = currentVersionData['creationDate'];
466 result['currentVersion']['updateDate'] = currentVersionData['updateDate']; 481 result['currentVersion']['updateDate'] = currentVersionData['updateDate'];
467 result['currentVersion']['accessDate'] = currentVersionData['accessDate']; 482 result['currentVersion']['accessDate'] = currentVersionData['accessDate'];
468 if (typeof(currentVersionData['previousVersion']) != 'undefined') { 483 if (typeof(currentVersionData['previousVersion']) != 'undefined') {
469 result['currentVersion']['previousVersionKey'] = currentVersionData['previousVersionKey']; 484 result['currentVersion']['previousVersionKey'] = currentVersionData['previousVersionKey'];
470 result['currentVersion']['previousVersion'] = currentVersionData['previousVersion']; 485 result['currentVersion']['previousVersion'] = currentVersionData['previousVersion'];
471 } 486 }
472*/ 487*/
473 MochiKit.Base.update(result, aConnection['userData']['records'][someParameters['parameters']['reference']]); 488 MochiKit.Base.update(result, aConnection['userData']['records'][someParameters['parameters']['reference']]);
474 result['reference'] = someParameters['parameters']['reference']; 489 result['reference'] = someParameters['parameters']['reference'];
475 490
476 //===================================================================== 491 //=====================================================================
477 // 492 //
478 // R E A D - W R I T E M e t h o d s 493 // R E A D - W R I T E M e t h o d s
479 // 494 //
480 //===================================================================== 495 //=====================================================================
481 } else if (someParameters.message == 'upgradeUserCredentials') { 496 } else if (someParameters.message == 'upgradeUserCredentials') {
482 if (this.isReadOnly() == false) { 497 if (this.isReadOnly() == false) {
483 var parameters; 498 var parameters;
484 var credentials; 499 var credentials;
485 500
486 parameters = someParameters['parameters']; 501 parameters = someParameters['parameters'];
487 credentials = parameters['credentials']; 502 credentials = parameters['credentials'];
488 503
489 if ((credentials['C'] == null) 504 if ((credentials['C'] == null)
490 ||(credentials['s'] == null) 505 ||(credentials['s'] == null)
491 ||(credentials['v'] == null) 506 ||(credentials['v'] == null)
492 ||(credentials['version'] != Clipperz.PM.Connection.communicationProtocol.currentVersion) 507 ||(credentials['version'] != Clipperz.PM.Connection.communicationProtocol.currentVersion)
493 ) { 508 ) {
494 result = Clipperz.PM.DataModel.User.exception.CredentialUpgradeFailed; 509 result = Clipperz.PM.DataModel.User.exception.CredentialUpgradeFailed;
495 } else { 510 } else {
496 varoldCValue; 511 varoldCValue;
497 oldCValue = aConnection['C']; 512 oldCValue = aConnection['C'];
498 513
499 this.data()['users'][credentials['C']] = aConnection['userData']; 514 this.data()['users'][credentials['C']] = aConnection['userData'];
500 aConnection['C'] = credentials['C']; 515 aConnection['C'] = credentials['C'];
501 516
502 aConnection['userData']['s'] = credentials['s']; 517 aConnection['userData']['s'] = credentials['s'];
503 aConnection['userData']['v'] = credentials['v']; 518 aConnection['userData']['v'] = credentials['v'];
504 aConnection['userData']['version'] = credentials['version']; 519 aConnection['userData']['version'] = credentials['version'];
505 520
506 aConnection['userData']['userDetails'] = parameters['user']['header']; 521 aConnection['userData']['userDetails'] = parameters['user']['header'];
507 aConnection['userData']['userDetailsVersion'] = parameters['user']['version']; 522 aConnection['userData']['userDetailsVersion'] = parameters['user']['version'];
508 aConnection['userData']['statistics'] = parameters['user']['statistics']; 523 aConnection['userData']['statistics'] = parameters['user']['statistics'];
509 524
510 aConnection['userData']['lock'] = parameters['user']['lock']; 525 aConnection['userData']['lock'] = parameters['user']['lock'];
511 526
512 delete this.data()['users'][oldCValue]; 527 delete this.data()['users'][oldCValue];
513 528
514 result = {result:"done", parameters:parameters}; 529 result = {result:"done", parameters:parameters};
515 } 530 }
516 } else { 531 } else {
517 throw Clipperz.PM.Proxy.Offline.DataStore.exception.ReadOnly; 532 throw Clipperz.PM.Proxy.Offline.DataStore.exception.ReadOnly;
518 } 533 }
519 //===================================================================== 534 //=====================================================================
520 /* } else if (someParameters.message == 'updateData') { 535 /* } else if (someParameters.message == 'updateData') {
521 if (this.isReadOnly() == false) { 536 if (this.isReadOnly() == false) {
522 var i, c; 537 var i, c;
523 538
524 if (this.userData()['lock']!= someParameters['parameters']['user']['lock']) { 539 if (this.userData()['lock']!= someParameters['parameters']['user']['lock']) {
525 throw "the lock attribute is not processed correctly" 540 throw "the lock attribute is not processed correctly"
526 } 541 }
527 542
528 this.userData()['userDetails'] = someParameters['parameters']['user']['header']; 543 this.userData()['userDetails'] = someParameters['parameters']['user']['header'];
529 this.userData()['statistics'] = someParameters['parameters']['user']['statistics']; 544 this.userData()['statistics'] = someParameters['parameters']['user']['statistics'];
530 this.userData()['userDetailsVersions']= someParameters['parameters']['user']['version']; 545 this.userData()['userDetailsVersions']= someParameters['parameters']['user']['version'];
531 546
532 c = someParameters['parameters']['records'].length; 547 c = someParameters['parameters']['records'].length;
533 for (i=0; i<c; i++) { 548 for (i=0; i<c; i++) {
534 var currentRecord; 549 var currentRecord;
535 var currentRecordData; 550 var currentRecordData;
536 551
537 currentRecordData = someParameters['parameters']['records'][i]; 552 currentRecordData = someParameters['parameters']['records'][i];
538 currentRecord = this.userData()['records'][currentRecordData['record']['reference']]; 553 currentRecord = this.userData()['records'][currentRecordData['record']['reference']];
539 554
540 if (currentRecord == null) { 555 if (currentRecord == null) {
541 } 556 }
542 557
543 currentRecord['data'] = currentRecordData['record']['data']; 558 currentRecord['data'] = currentRecordData['record']['data'];
544 currentRecord['version'] = currentRecordData['record']['version']; 559 currentRecord['version'] = currentRecordData['record']['version'];
545 currentRecord['currentVersion'] = currentRecordData['currentRecordVersion']['reference']; 560 currentRecord['currentVersion'] = currentRecordData['currentRecordVersion']['reference'];
546 561
547 currentRecord['versions'][currentRecordData['currentRecordVersion']['reference']] = { 562 currentRecord['versions'][currentRecordData['currentRecordVersion']['reference']] = {
548 'data': currentRecordData['currentRecordVersion']['data'], 563 'data': currentRecordData['currentRecordVersion']['data'],
549 'version': currentRecordData['currentRecordVersion']['version'], 564 'version': currentRecordData['currentRecordVersion']['version'],
550 'previousVersion': currentRecordData['currentRecordVersion']['previousVersion'], 565 'previousVersion': currentRecordData['currentRecordVersion']['previousVersion'],
551 'previousVersionKey':currentRecordData['currentRecordVersion']['previousVersionKey'] 566 'previousVersionKey':currentRecordData['currentRecordVersion']['previousVersionKey']
552 } 567 }
553 } 568 }
554 569
555 this.userData()['lock'] = Clipperz.PM.Crypto.randomKey(); 570 this.userData()['lock'] = Clipperz.PM.Crypto.randomKey();
556 result['lock'] = this.userData()['lock']; 571 result['lock'] = this.userData()['lock'];
557 result['result'] = 'done'; 572 result['result'] = 'done';
558 } else { 573 } else {
559 throw Clipperz.PM.Proxy.Offline.DataStore.exception.ReadOnly; 574 throw Clipperz.PM.Proxy.Offline.DataStore.exception.ReadOnly;
560 } 575 }
561 */ //===================================================================== 576 */ //=====================================================================
562 } else if (someParameters.message == 'saveChanges') { 577 } else if (someParameters.message == 'saveChanges') {
563 if (this.isReadOnly() == false) { 578 if (this.isReadOnly() == false) {
564 var i, c; 579 var i, c;
565 580
566 if (aConnection['userData']['lock']!= someParameters['parameters']['user']['lock']) { 581 if (aConnection['userData']['lock']!= someParameters['parameters']['user']['lock']) {
567 throw "the lock attribute is not processed correctly" 582 throw "the lock attribute is not processed correctly"
568 } 583 }
569 584
570 aConnection['userData']['userDetails'] = someParameters['parameters']['user']['header']; 585 aConnection['userData']['userDetails'] = someParameters['parameters']['user']['header'];
571 aConnection['userData']['statistics'] = someParameters['parameters']['user']['statistics']; 586 aConnection['userData']['statistics'] = someParameters['parameters']['user']['statistics'];
572 aConnection['userData']['userDetailsVersion']= someParameters['parameters']['user']['version']; 587 aConnection['userData']['userDetailsVersion']= someParameters['parameters']['user']['version'];
573 588
574 c = someParameters['parameters']['records']['updated'].length; 589 c = someParameters['parameters']['records']['updated'].length;
575 for (i=0; i<c; i++) { 590 for (i=0; i<c; i++) {
576 var currentRecord; 591 var currentRecord;
577 var currentRecordData; 592 var currentRecordData;
578 593
579 currentRecordData = someParameters['parameters']['records']['updated'][i]; 594 currentRecordData = someParameters['parameters']['records']['updated'][i];
580 currentRecord = aConnection['userData']['records'][currentRecordData['record']['reference']]; 595 currentRecord = aConnection['userData']['records'][currentRecordData['record']['reference']];
581 596
582 if ( 597 if (
583 (typeof(aConnection['userData']['records'][currentRecordData['record']['reference']]) == 'undefined') 598 (typeof(aConnection['userData']['records'][currentRecordData['record']['reference']]) == 'undefined')
584 && 599 &&
585 (typeof(currentRecordData['currentRecordVersion']) == 'undefined') 600 (typeof(currentRecordData['currentRecordVersion']) == 'undefined')
586 ) { 601 ) {
587 throw "Record added without a recordVersion"; 602 throw "Record added without a recordVersion";
588 } 603 }
589 604
590 if (currentRecord == null) { 605 if (currentRecord == null) {
591 currentRecord = {}; 606 currentRecord = {};
592 currentRecord['versions'] = {}; 607 currentRecord['versions'] = {};
593 currentRecord['creationDate']= Clipperz.PM.Date.formatDateWithUTCFormat(new Date()); 608 currentRecord['creationDate']= Clipperz.PM.Date.formatDateWithUTCFormat(new Date());
594 currentRecord['accessDate'] = Clipperz.PM.Date.formatDateWithUTCFormat(new Date()); 609 currentRecord['accessDate'] = Clipperz.PM.Date.formatDateWithUTCFormat(new Date());
595 610
596 aConnection['userData']['records'][currentRecordData['record']['reference']] = currentRecord; 611 aConnection['userData']['records'][currentRecordData['record']['reference']] = currentRecord;
597 } 612 }
598 613
599 currentRecord['data'] = currentRecordData['record']['data']; 614 currentRecord['data'] = currentRecordData['record']['data'];
600 currentRecord['version']= currentRecordData['record']['version']; 615 currentRecord['version']= currentRecordData['record']['version'];
601 currentRecord['updateDate']= Clipperz.PM.Date.formatDateWithUTCFormat(new Date()); 616 currentRecord['updateDate']= Clipperz.PM.Date.formatDateWithUTCFormat(new Date());
602 617
603 if (typeof(currentRecordData['currentRecordVersion']) != 'undefined') { 618 if (typeof(currentRecordData['currentRecordVersion']) != 'undefined') {
604 currentRecord['currentVersion'] = currentRecordData['currentRecordVersion']['reference']; 619 currentRecord['currentVersion'] = currentRecordData['currentRecordVersion']['reference'];
605 currentRecord['versions'][currentRecordData['currentRecordVersion']['reference']] = { 620 currentRecord['versions'][currentRecordData['currentRecordVersion']['reference']] = {
606 'data': currentRecordData['currentRecordVersion']['data'], 621 'data': currentRecordData['currentRecordVersion']['data'],
607 'version': currentRecordData['currentRecordVersion']['version'], 622 'version': currentRecordData['currentRecordVersion']['version'],
608 'previousVersion': currentRecordData['currentRecordVersion']['previousVersion'], 623 'previousVersion': currentRecordData['currentRecordVersion']['previousVersion'],
609 'previousVersionKey':currentRecordData['currentRecordVersion']['previousVersionKey'], 624 'previousVersionKey':currentRecordData['currentRecordVersion']['previousVersionKey'],
610 'creationDate':Clipperz.PM.Date.formatDateWithUTCFormat(new Date()), 625 'creationDate':Clipperz.PM.Date.formatDateWithUTCFormat(new Date()),
611 'updateDate':Clipperz.PM.Date.formatDateWithUTCFormat(new Date()), 626 'updateDate':Clipperz.PM.Date.formatDateWithUTCFormat(new Date()),
612 'accessDate':Clipperz.PM.Date.formatDateWithUTCFormat(new Date()) 627 'accessDate':Clipperz.PM.Date.formatDateWithUTCFormat(new Date())
613 } 628 }
614 } 629 }
615 } 630 }
616 631
617 c = someParameters['parameters']['records']['deleted'].length; 632 c = someParameters['parameters']['records']['deleted'].length;
618 for (i=0; i<c; i++) { 633 for (i=0; i<c; i++) {
619 var currentRecordReference; 634 var currentRecordReference;
620 635
621 currentRecordReference = someParameters['parameters']['records']['deleted'][i]; 636 currentRecordReference = someParameters['parameters']['records']['deleted'][i];
622 delete aConnection['userData']['records'][currentRecordReference]; 637 delete aConnection['userData']['records'][currentRecordReference];
623 } 638 }
624 639
625 aConnection['userData']['lock'] = Clipperz.PM.Crypto.randomKey(); 640 aConnection['userData']['lock'] = Clipperz.PM.Crypto.randomKey();
626 result['lock'] = aConnection['userData']['lock']; 641 result['lock'] = aConnection['userData']['lock'];
627 result['result'] = 'done'; 642 result['result'] = 'done';
628 } else { 643 } else {
629 throw Clipperz.PM.Proxy.Offline.DataStore.exception.ReadOnly; 644 throw Clipperz.PM.Proxy.Offline.DataStore.exception.ReadOnly;
630 } 645 }
631 646
632 //===================================================================== 647 //=====================================================================
633 // 648 //
634 // U N H A N D L E D M e t h o d 649 // U N H A N D L E D M e t h o d
635 // 650 //
636 //===================================================================== 651 //=====================================================================
637 } else { 652 } else {
638 Clipperz.logError("Clipperz.PM.Proxy.Test.message - unhandled message: " + someParameters.message); 653 Clipperz.logError("Clipperz.PM.Proxy.Test.message - unhandled message: " + someParameters.message);
639 } 654 }
640 655
641 result = { 656 result = {
642 result: result, 657 result: result,
643 toll: this.getTollForRequestType('MESSAGE') 658 toll: this.getTollForRequestType('MESSAGE')
644 } 659 }
645 660
646 // return MochiKit.Async.succeed(result); 661 // return MochiKit.Async.succeed(result);
647 return result; 662 return result;
648 }, 663 },
649 664
650 //------------------------------------------------------------------------- 665 //-------------------------------------------------------------------------
651 666
652 '_logout': function(someParameters) { 667 '_logout': function(someParameters) {
653 // return MochiKit.Async.succeed({result: 'done'}); 668 // return MochiKit.Async.succeed({result: 'done'});
654 return {result: 'done'}; 669 return {result: 'done'};
655 }, 670 },
656 671
657 //========================================================================= 672 //=========================================================================
658 //######################################################################### 673 //#########################################################################
659 674
660 'isTestData': function(aConnection) { 675 'isTestData': function(aConnection) {
661 return (typeof(aConnection['userData']['__masterkey_test_value__']) != 'undefined'); 676 return (typeof(aConnection['userData']['__masterkey_test_value__']) != 'undefined');
662 }, 677 },
663 678
664 'userDetails': function(aConnection) { 679 'userDetails': function(aConnection) {
665 var result; 680 var result;
666 681
667 if (this.isTestData(aConnection)) { 682 if (this.isTestData(aConnection)) {
668 var serializedHeader; 683 var serializedHeader;
669 var version; 684 var version;
670 685
671//Clipperz.logDebug("### test data"); 686//Clipperz.logDebug("### test data");
672 version = aConnection['userData']['userDetailsVersion']; 687 version = aConnection['userData']['userDetailsVersion'];
673 serializedHeader = Clipperz.Base.serializeJSON(aConnection['userData']['userDetails']); 688 serializedHeader = Clipperz.Base.serializeJSON(aConnection['userData']['userDetails']);
674 result = Clipperz.PM.Crypto.encryptingFunctions.versions[version].encrypt(aConnection['userData']['__masterkey_test_value__'], serializedHeader); 689 result = Clipperz.PM.Crypto.encryptingFunctions.versions[version].encrypt(aConnection['userData']['__masterkey_test_value__'], serializedHeader);
675 } else { 690 } else {
676//Clipperz.logDebug("### NOT test data"); 691//Clipperz.logDebug("### NOT test data");
677 result = aConnection['userData']['userDetails']; 692 result = aConnection['userData']['userDetails'];
678 } 693 }
679 694
680 return result; 695 return result;
681 }, 696 },
682 697
683 'statistics': function(aConnection) { 698 'statistics': function(aConnection) {
684 var result; 699 var result;
685 700
686 if (aConnection['userData']['statistics'] != null) { 701 if (aConnection['userData']['statistics'] != null) {
687 if (this.isTestData(aConnection)) { 702 if (this.isTestData(aConnection)) {
688 var serializedStatistics; 703 var serializedStatistics;
689 var version; 704 var version;
690 705
691 version = aConnection['userData']['userDetailsVersion']; 706 version = aConnection['userData']['userDetailsVersion'];
692 serializedStatistics = Clipperz.Base.serializeJSON(aConnection['userData']['statistics']); 707 serializedStatistics = Clipperz.Base.serializeJSON(aConnection['userData']['statistics']);
693 result = Clipperz.PM.Crypto.encryptingFunctions.versions[version].encrypt(aConnection['userData']['__masterkey_test_value__'], serializedStatistics); 708 result = Clipperz.PM.Crypto.encryptingFunctions.versions[version].encrypt(aConnection['userData']['__masterkey_test_value__'], serializedStatistics);
694 } else { 709 } else {
695 result = aConnection['userData']['statistics']; 710 result = aConnection['userData']['statistics'];
696 } 711 }
697 } else { 712 } else {
698 result = null; 713 result = null;
699 } 714 }
700 715
701 return result; 716 return result;
702 }, 717 },
703 718
704/* 719/*
705 'userSerializedEncryptedData': function(someData) { 720 'userSerializedEncryptedData': function(someData) {
706 var deferredResult; 721 var deferredResult;
707 var deferredContext; 722 var deferredContext;
708 723
709 deferredContext = { 'data': someData }; 724 deferredContext = { 'data': someData };
710 725
711 deferredResult = new Clipperz.Async.Deferred('Proxy.Test.serializeUserEncryptedData', {trace:false}); 726 deferredResult = new Clipperz.Async.Deferred('Proxy.Test.serializeUserEncryptedData', {trace:false});
712 deferredResult.addCallback(MochiKit.Base.bind(function(aDeferredContext) { 727 deferredResult.addCallback(MochiKit.Base.bind(function(aDeferredContext) {
713 aDeferredContext['user'] = this.createUserUsingConfigurationData(aDeferredContext['data']); 728 aDeferredContext['user'] = this.createUserUsingConfigurationData(aDeferredContext['data']);
714 return aDeferredContext; 729 return aDeferredContext;
715 }, this)); 730 }, this));
716 deferredResult.addCallback(function(aDeferredContext) { 731 deferredResult.addCallback(function(aDeferredContext) {
717 // return aDeferredContext['user'].encryptedDataUsingVersion(aDeferredContext['data']['version']); 732 // return aDeferredContext['user'].encryptedDataUsingVersion(aDeferredContext['data']['version']);
718 return aDeferredContext['user'].serializedDataUsingVersion(MochiKit.Base.values(aDeferredContext['user'].records()), aDeferredContext['data']['version']); 733 return aDeferredContext['user'].serializedDataUsingVersion(MochiKit.Base.values(aDeferredContext['user'].records()), aDeferredContext['data']['version']);
719 }); 734 });
720 deferredResult.addCallback(function(aUserEncryptedData) { 735 deferredResult.addCallback(function(aUserEncryptedData) {
721 deferredContext['encryptedData'] = aUserEncryptedData; 736 deferredContext['encryptedData'] = aUserEncryptedData;
722 return deferredContext; 737 return deferredContext;
723 }); 738 });
724 deferredResult.addCallback(function(aDeferredContext) { 739 deferredResult.addCallback(function(aDeferredContext) {
725 var connection; 740 var connection;
726 741
727 connection = new Clipperz.PM.Connection.communicationProtocol.versions[aDeferredContext['data']['connectionVersion']]() 742 connection = new Clipperz.PM.Connection.communicationProtocol.versions[aDeferredContext['data']['connectionVersion']]()
728 aDeferredContext['credentials'] = connection.serverSideUserCredentials(aDeferredContext['user'].username(),aDeferredContext['user'].passphrase()); 743 aDeferredContext['credentials'] = connection.serverSideUserCredentials(aDeferredContext['user'].username(),aDeferredContext['user'].passphrase());
729 744
730 return aDeferredContext; 745 return aDeferredContext;
731 }); 746 });
732 747
733 // deferredResult.addCallback(function(aDeferredContext) { 748 // deferredResult.addCallback(function(aDeferredContext) {
734 // return aDeferredContext['user'].serializedDataUsingVersion(MochiKit.Base.values(aDeferredContext['user'].records()), aDeferredContext['data']['version']); 749 // return aDeferredContext['user'].serializedDataUsingVersion(MochiKit.Base.values(aDeferredContext['user'].records()), aDeferredContext['data']['version']);
735 // }, deferredContext); 750 // }, deferredContext);
736 // deferredResult.addCallback(function(aUserSerializedData) { 751 // deferredResult.addCallback(function(aUserSerializedData) {
737 // }); 752 // });
738// 753//