web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into staging

Browse Source
This commit is contained in:
ansuz 2017-04-25 14:35:24 +02:00
commit 729d1460b9
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -1,7 +1,7 @@
{ {
"name": "cryptpad", "name": "cryptpad",
"description": "realtime collaborative visual editor with zero knowlege server", "description": "realtime collaborative visual editor with zero knowlege server",
"version": "1.4.0", "version": "1.5.0",
"dependencies": { "dependencies": {
"express": "~4.10.1", "express": "~4.10.1",
"ws": "^1.0.1", "ws": "^1.0.1",

12
www/common/common-hash.js
View File

@ -117,6 +117,9 @@ define([
throw new Error("The channel key is invalid"); throw new Error("The channel key is invalid");
} }
} }
} else if (version === "2") {
// version 2 hashes are to be used for encrypted blobs
// TODO
} }
} }
} }
@ -150,6 +153,15 @@ define([
return '/1/edit/' + [channelId, key].join('/'); return '/1/edit/' + [channelId, key].join('/');
}; };
/*
Version 0
/pad/#67b8385b07352be53e40746d2be6ccd7XAYSuJYYqa9NfmInyHci7LNy
Version 1
/code/#/1/edit/3Ujt4F2Sjnjbis6CoYWpoQ/usn4+9CqVja8Q7RZOGTfRgqI
Version 2
/file/<fileId>/#/2/<cryptKey>/<contentType>
/file/<fileId>/#/2/ajExFODrFH4lVBwxxsrOKw/pdf
*/
var parseHash = Hash.parseHash = function (hash) { var parseHash = Hash.parseHash = function (hash) {
var parsed = {}; var parsed = {};
if (hash.slice(0,1) !== '/' && hash.length >= 56) { if (hash.slice(0,1) !== '/' && hash.length >= 56) {