infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

Merge branch 'soon' into staging

Browse Source
pull/1/head
yflory 4 years ago
parent 3b0e6b2b1e 6401e72265
commit 07fadca12f
6 changed files with 309 additions and 8 deletions
Show Stats Download Patch File Download Diff File

17
customize.dist/src/less2/pages/page-report.less
Unescape Escape View File

@ -0,0 +1,17 @@
@import (reference) "../include/colortheme-all.less";
@import (reference) "../include/font.less";
//@import (reference) "../include/forms.less";
@import (reference) "../include/alertify.less";
html, body {
.font_main();
.alertify_main();
height: 100%;
margin: 0px;
padding: 0px;
background-color: @cp_static-bg !important;
color: @cryptpad_text_col;
font-family: "IBM Plex Mono";
}

8
www/common/cryptget.js
Unescape Escape View File

@ -13,7 +13,7 @@ define([
], function (Crypto, CPNetflux, Netflux, Util, Hash, Realtime, NetConfig, Cache, Pinpad, nThen) {
var finish = function (S, err, doc) {
if (S.done) { return; }
S.cb(err, doc);
S.cb((err && err.error), doc, err);
S.done = true;
if (!S.hasNetwork) {
@ -135,13 +135,15 @@ define([
config.onError = function (info) {
console.warn(info);
finish(Session, info.error);
finish(Session, info);
};
config.onChannelError = function (info) {
console.error(info);
finish(Session, info.error);
finish(Session, info);
};
config.onCacheReady = opt.onCacheReady;
// We use the new onMessage handler to compute the progress:
// we should receive 2 checkpoints max, so 100 messages max
// We're going to consider that 1 message = 1%, and we'll send 100%

6
www/pad/inner.js
Unescape Escape View File

@ -1445,9 +1445,6 @@ define([
editor.setKeystroke( CKEDITOR.CTRL + CKEDITOR.ALT + styleKeys[tag], tag);
});
var privateData = framework._.cpNfInner.metadataMgr.getPrivateData(); // XXX race condition. framework isn't defined when this is called
var openLinkSetting = Util.find(privateData, ['settings', 'pad', 'openLink']);
Links.init(Ckeditor, editor, openLinkSetting);
}).nThen(function() {
// Move ckeditor parts to have a structure like the other apps
var $contentContainer = $('#cke_1_contents');
@ -1491,6 +1488,9 @@ define([
}).nThen(waitFor());
}).nThen(function(waitFor) {
var privateData = framework._.cpNfInner.metadataMgr.getPrivateData();
var openLinkSetting = Util.find(privateData, ['settings', 'pad', 'openLink']);
Links.init(Ckeditor, editor, openLinkSetting);
require(['/pad/csp.js'], waitFor());
}).nThen(function( /*waitFor*/ ) {

11
www/report/index.html
Unescape Escape View File

@ -0,0 +1,11 @@
<!DOCTYPE html>
<html>
<head>
<meta content="text/html; charset=utf-8" http-equiv="content-type"/>
<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
<script data-bootload="main.js" data-main="/common/boot.js" src="/bower_components/requirejs/require.js"></script>
</head>
<body>
<div id="cp-report">
</div>

270
www/report/main.js
Unescape Escape View File

@ -0,0 +1,270 @@
define([
'jquery',
'/api/config',
'/common/hyperscript.js',
'/customize/messages.js',
'/bower_components/nthen/index.js',
'/common/common-hash.js',
'/common/common-util.js',
'/common/cryptget.js',
'/common/cryptpad-common.js',
'/common/outer/cache-store.js',
'/common/common-interface.js',
'/bower_components/chainpad-netflux/chainpad-netflux.js',
'/bower_components/chainpad-crypto/crypto.js',
'/common/userObject.js',
'/bower_components/tweetnacl/nacl-fast.min.js',
'css!/bower_components/components-font-awesome/css/font-awesome.min.css',
'less!/customize/src/less2/pages/page-report.less',
], function ($, ApiConfig, h, Messages,
nThen, Hash, Util, Crypt, Cryptpad, Cache, UI, CPNetflux,
Crypto, UserObject) {
var $report = $('#cp-report');
var hash = localStorage.User_hash;
if (!hash) {
return void UI.errorLoadingScreen(Messages.mustLogin);
}
var addReport = function (str) {
$report.append(h('div', str));
};
var checkCache = function (chan, cb) {
Cache.getChannelCache(chan, function (err, val) {
if (err) {
addReport('Cache error:' + err);
} else {
addReport('Cache: ' + val.c.length + ' entries');
}
cb();
});
};
var onCacheReady = function (info) {
var doc;
try {
doc = info.realtime.getUserDoc();
JSON.parse(doc);
addReport('Cache ready success: ' + info.id + ' - Length: ' + doc.length);
} catch (e) {
addReport('Cache ready error: ' + info.id + ' - Length: ' + (doc || '').length);
}
};
var network;
var proxy;
nThen(function (waitFor) {
Cryptpad.makeNetwork(waitFor(function (err, _network) {
if (err) {
console.error(err);
waitFor.abort();
return void UI.errorLoadingScreen(err);
}
network = _network;
}));
}).nThen(function (waitFor) {
var secret = Hash.getSecrets('drive', hash);
addReport('Load drive. ID: ' + secret.channel);
checkCache(secret.channel, waitFor());
}).nThen(function (waitFor) {
Crypt.get(hash, waitFor(function (err, val) {
if (err) {
console.error(err);
addReport('Load drive error. err: ' + err);
return void waitFor.abort();
}
try {
proxy = JSON.parse(val);
} catch (e) {
console.error(e);
addReport('Load drive error. Parse error: ' + e);
waitFor.abort();
}
}), { network: network, onCacheReady: onCacheReady});
}).nThen(function (waitFor) {
console.log(proxy);
var drive = proxy.drive || {};
if (!proxy.drive) {
addReport('ERROR: no drive');
return void waitFor.abort();
}
addReport('Load drive success.');
addReport('Public key: '+proxy.edPublic);
addReport('Shared folders: ' + Object.keys(drive.sharedFolders || {}).join(', '));
addReport('Teams: ' + Object.keys(proxy.teams || {}).join(', '));
addReport('-------------------');
var n = nThen;
Object.keys(drive.sharedFolders || {}).forEach(function (id) {
n = n(function (w) {
var next = w();
var obj = drive.sharedFolders[id];
addReport('Load shared folder. ID: ' + id + '. Channel ID: '+ obj.channel);
if (obj.password) { addReport("Password protected"); }
if (!obj.href) { addReport("View only"); }
checkCache(obj.channel, function () {
var parsed = Hash.parsePadUrl(obj.href || obj.roHref);
Crypt.get(parsed.hash, function (err, val, errorObj) {
if (err) {
addReport('ERROR: ' + err);
if (err === "ERESTRICTED") {
addReport('RESTRICTED: ' + (errorObj && errorObj.message));
}
} else {
addReport('Load shared folder: success. Size: ' + val.length);
}
addReport('-------------------');
next();
}, {
network: network,
password: obj.password,
onCacheReady: onCacheReady
});
});
}).nThen;
});
n(waitFor());
}).nThen(function () {
addReport('===================');
var n = nThen;
Object.keys(proxy.teams || {}).forEach(function (id) {
n = n(function (w) {
var next = w();
var obj = proxy.teams[id];
var team;
addReport('Load team. ID: ' + id + '. Channel ID: '+ obj.channel);
if (!obj.hash) { addReport("View only"); }
var teamSecret = Hash.getSecrets('team', obj.hash || obj.roHash, obj.password);
var cryptor = UserObject.createCryptor(teamSecret.keys.secondaryKey);
// Check team drive
nThen(function (ww) {
addReport('Team drive');
var _next = ww();
checkCache(obj.channel, function () {
Crypt.get(obj.hash || obj.roHash, function (err, val) {
if (err) {
addReport('ERROR: ' + err);
addReport('===================');
next();
ww.abort();
} else {
addReport('Team drive success. Size: ' + val.length);
try {
team = JSON.parse(val);
} catch (e) {
addReport('PARSE ERROR: ' + e);
addReport('===================');
next();
ww.abort();
}
addReport('Shared folders: ' + Object.keys(team.drive.sharedFolders || {}).join(', '));
}
addReport('-------------------');
_next();
}, {
network: network,
password: obj.password,
onCacheReady: onCacheReady
});
});
}).nThen(function (ww) {
var _next = ww();
var d = Util.find(obj, ['keys', 'roster']);
var rosterKeys = d.edit ? Crypto.Team.deriveMemberKeys(d.edit, proxy)
: Crypto.Team.deriveGuestKeys(d.view || '');
if (d.channel !== rosterKeys.channel) {
next();
ww.abort();
addReport("Invalid roster keys:", d.channel, rosterKeys.channel);
return;
}
addReport('Roster channel: ' + d.channel);
console.warn(rosterKeys);
checkCache(d.channel, function () {
var crypto = Crypto.Team.createEncryptor(rosterKeys);
var m = 0;
CPNetflux.start({
lastKnownHash: d.lastKnownHash || -1,
network: network,
channel: d.channel,
crypto: crypto,
validateKey: rosterKeys.teamEdPublic,
Cache: Cache,
noChainPad: true,
onCacheReady: onCacheReady,
onChannelError: function (obj) {
addReport('ERROR:' + obj.error);
if (obj.error === "ERESTRICTED") {
addReport('RESTRICTED: ' + obj.message);
}
next();
ww.abort();
addReport('===================');
return;
},
onMessage: function () {
m++;
},
onReady: function () {
addReport("Roster success. Length: "+m);
addReport('-------------------');
_next();
}
});
});
}).nThen(function (ww) {
var _next = ww();
var n = nThen;
var drive = team.drive;
Object.keys(drive.sharedFolders || {}).forEach(function (id) {
n = n(function (w) {
var next = w();
var _obj = drive.sharedFolders[id];
addReport('Load shared folder. ID: ' + id + '. Channel ID: '+ _obj.channel);
if (_obj.password) { addReport("Password protected"); }
if (!_obj.href) { addReport("View only"); }
checkCache(_obj.channel, function () {
if (_obj.href && _obj.href.indexOf('#') === -1) {
_obj.href = cryptor.decrypt(_obj.href);
}
var parsed = Hash.parsePadUrl(_obj.href || _obj.roHref);
console.log(parsed.hash, _obj);
Crypt.get(parsed.hash, function (err, val, errorObj) {
if (err) {
addReport('ERROR: ' + err);
if (err === "ERESTRICTED") {
addReport('RESTRICTED: ' + (errorObj && errorObj.message));
}
} else {
addReport('Load shared folder: success. Size: ' + val.length);
}
addReport('-------------------');
next();
}, {
network: network,
password: _obj.password,
onCacheReady: onCacheReady
});
});
}).nThen;
});
n(_next);
}).nThen(next);
}).nThen;
});
n(function () {
addReport('===================');
addReport('DONE');
});
});
});

5
www/whiteboard/inner.js
Unescape Escape View File

@ -373,8 +373,9 @@ define([
APP.FM.handleFile(blob);
});
};
var MAX_IMAGE_SIZE = 1 * 1024 * 1024; // 1 MB
var maxSizeStr = Util.bytesToMegabytes(MAX_IMAGE_SIZE);
var ONE_MB = 1 * 1024 * 1024; // 1 MB
var MAX_IMAGE_SIZE = Math.ceil(ONE_MB / 3) * 4 + 23; // 23 is the length of "data:image/jpeg;base64,"
var maxSizeStr = Util.bytesToMegabytes(ONE_MB);
var addImageToCanvas = function (img) {
if (img.src && img.src.length > MAX_IMAGE_SIZE) {
UI.warn(Messages._getKey('upload_tooLargeBrief', [maxSizeStr]));

Write Preview
Loading…
Cancel
Save