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

Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

Browse Source
pull/1/head
yflory 8 years ago
parent 803bad1421 278125747c
commit d83d8dbeda
1 changed files with 37 additions and 30 deletions
Show Stats Download Patch File Download Diff File

67
rpc.js
Unescape Escape View File

@ -17,6 +17,15 @@ var Store = require("./storage/file");
var DEFAULT_LIMIT = 50 * 1024 * 1024; var DEFAULT_LIMIT = 50 * 1024 * 1024;
var SESSION_EXPIRATION_TIME = 60 * 1000; var SESSION_EXPIRATION_TIME = 60 * 1000;
var SUPPRESS_RPC_ERRORS = false;
var WARN = function (e, output) {
if (!SUPPRESS_RPC_ERRORS && e && output) {
console.error(new Date().toISOString() + ' [' + e + ']', output);
console.error(new Error(e).stack);
console.error();
}
};
var isValidId = function (chan) { var isValidId = function (chan) {
return chan && chan.length && /^[a-fA-F0-9]/.test(chan) || return chan && chan.length && /^[a-fA-F0-9]/.test(chan) ||
@ -237,11 +246,10 @@ var loadUserPins = function (Env, publicKey, cb) {
} }
break; break;
default: default:
console.error('invalid message read from store'); WARN('invalid message read from store', msg);
} }
} catch (e) { } catch (e) {
console.log('invalid message read from store'); WARN('invalid message read from store', e);
console.error(e);
} }
}, function () { }, function () {
// no more messages // no more messages
@ -328,7 +336,7 @@ var getMultipleFileSize = function (Env, channels, cb) {
channels.forEach(function (channel) { channels.forEach(function (channel) {
getFileSize(Env, channel, function (e, size) { getFileSize(Env, channel, function (e, size) {
if (e) { if (e) {
console.error(e); WARN('getFileSize', e);
counts[channel] = -1; counts[channel] = -1;
return done(); return done();
} }
@ -504,7 +512,7 @@ var pinChannel = function (Env, publicKey, channels, cb) {
getFreeSpace(Env, publicKey, function (e, free) { getFreeSpace(Env, publicKey, function (e, free) {
if (e) { if (e) {
console.error(e); WARN('getFreeSpace', e);
return void cb(e); return void cb(e);
} }
if (pinSize > free) { return void cb('E_OVER_LIMIT'); } if (pinSize > free) { return void cb('E_OVER_LIMIT'); }
@ -573,7 +581,7 @@ var resetUserPins = function (Env, publicKey, channelList, cb) {
getFreeSpace(Env, publicKey, function (e, free) { getFreeSpace(Env, publicKey, function (e, free) {
if (e) { if (e) {
console.error(e); WARN('getFreeSpace', e);
return void cb(e); return void cb(e);
} }
@ -646,6 +654,9 @@ var makeFileStream = function (root, id, cb) {
stream.on('open', function () { stream.on('open', function () {
cb(void 0, stream); cb(void 0, stream);
}); });
stream.on('error', function (e) {
WARN('stream error', e);
});
} catch (err) { } catch (err) {
cb('BAD_STREAM'); cb('BAD_STREAM');
} }
@ -737,14 +748,12 @@ var upload_complete = function (Env, publicKey, cb) {
safeMkdir(Path.join(paths.blob, prefix), function (e) { safeMkdir(Path.join(paths.blob, prefix), function (e) {
if (e) { if (e) {
console.error('[safeMkdir]'); WARN('safeMkdir', e);
console.error(e);
console.log();
return void cb('RENAME_ERR'); return void cb('RENAME_ERR');
} }
isFile(newPath, function (e, yes) { isFile(newPath, function (e, yes) {
if (e) { if (e) {
console.error(e); WARN('isFile', e);
return void cb(e); return void cb(e);
} }
if (yes) { if (yes) {
@ -770,7 +779,7 @@ var upload_complete = function (Env, publicKey, cb) {
// lol wut handle ur errors // lol wut handle ur errors
Fs.rename(oldPath, newPath, function (e) { Fs.rename(oldPath, newPath, function (e) {
if (e) { if (e) {
console.error(e); WARN('rename', e);
if (retries--) { if (retries--) {
return setTimeout(function () { return setTimeout(function () {
@ -803,7 +812,7 @@ var upload_status = function (Env, publicKey, filesize, cb) {
if (filesize >= free) { return cb('NOT_ENOUGH_SPACE'); } if (filesize >= free) { return cb('NOT_ENOUGH_SPACE'); }
isFile(filePath, function (e, yes) { isFile(filePath, function (e, yes) {
if (e) { if (e) {
console.error("uploadError: [%s]", e); WARN('upload', e);
return cb('UNNOWN_ERROR'); return cb('UNNOWN_ERROR');
} }
cb(e, yes); cb(e, yes);
@ -834,11 +843,7 @@ RPC.create = function (config /*:typeof(ConfigType)*/, cb /*:(?Error, ?Function)
// load pin-store... // load pin-store...
console.log('loading rpc module...'); console.log('loading rpc module...');
var warn = function (e, output) { if (config.suppressRPCErrors) { SUPPRESS_RPC_ERRORS = true; }
if (e && !config.suppressRPCErrors) {
console.error(new Date().toISOString() + ' [' + e + ']', output);
}
};
var keyOrDefaultString = function (key, def) { var keyOrDefaultString = function (key, def) {
return typeof(config[key]) === 'string'? config[key]: def; return typeof(config[key]) === 'string'? config[key]: def;
@ -937,41 +942,41 @@ RPC.create = function (config /*:typeof(ConfigType)*/, cb /*:(?Error, ?Function)
case 'COOKIE': return void Respond(void 0); case 'COOKIE': return void Respond(void 0);
case 'RESET': case 'RESET':
return resetUserPins(Env, safeKey, msg[1], function (e, hash) { return resetUserPins(Env, safeKey, msg[1], function (e, hash) {
//warn(e, hash); //WARN(e, hash);
return void Respond(e, hash); return void Respond(e, hash);
}); });
case 'PIN': case 'PIN':
return pinChannel(Env, safeKey, msg[1], function (e, hash) { return pinChannel(Env, safeKey, msg[1], function (e, hash) {
warn(e, hash); WARN(e, hash);
Respond(e, hash); Respond(e, hash);
}); });
case 'UNPIN': case 'UNPIN':
return unpinChannel(Env, safeKey, msg[1], function (e, hash) { return unpinChannel(Env, safeKey, msg[1], function (e, hash) {
warn(e, hash); WARN(e, hash);
Respond(e, hash); Respond(e, hash);
}); });
case 'GET_HASH': case 'GET_HASH':
return void getHash(Env, safeKey, function (e, hash) { return void getHash(Env, safeKey, function (e, hash) {
warn(e, hash); WARN(e, hash);
Respond(e, hash); Respond(e, hash);
}); });
case 'GET_TOTAL_SIZE': // TODO cache this, since it will get called quite a bit case 'GET_TOTAL_SIZE': // TODO cache this, since it will get called quite a bit
return getTotalSize(Env, safeKey, function (e, size) { return getTotalSize(Env, safeKey, function (e, size) {
if (e) { if (e) {
warn(e, safeKey); WARN(e, safeKey);
return void Respond(e); return void Respond(e);
} }
Respond(e, size); Respond(e, size);
}); });
case 'GET_FILE_SIZE': case 'GET_FILE_SIZE':
return void getFileSize(Env, msg[1], function (e, size) { return void getFileSize(Env, msg[1], function (e, size) {
warn(e, msg[1]); WARN(e, msg[1]);
Respond(e, size); Respond(e, size);
}); });
case 'UPDATE_LIMITS': case 'UPDATE_LIMITS':
return void updateLimits(config, safeKey, function (e, limit) { return void updateLimits(config, safeKey, function (e, limit) {
if (e) { if (e) {
warn(e, limit); WARN(e, limit);
return void Respond(e); return void Respond(e);
} }
Respond(void 0, limit); Respond(void 0, limit);
@ -979,7 +984,7 @@ RPC.create = function (config /*:typeof(ConfigType)*/, cb /*:(?Error, ?Function)
case 'GET_LIMIT': case 'GET_LIMIT':
return void getLimit(Env, safeKey, function (e, limit) { return void getLimit(Env, safeKey, function (e, limit) {
if (e) { if (e) {
warn(e, limit); WARN(e, limit);
return void Respond(e); return void Respond(e);
} }
Respond(void 0, limit); Respond(void 0, limit);
@ -987,7 +992,7 @@ RPC.create = function (config /*:typeof(ConfigType)*/, cb /*:(?Error, ?Function)
case 'GET_MULTIPLE_FILE_SIZE': case 'GET_MULTIPLE_FILE_SIZE':
return void getMultipleFileSize(Env, msg[1], function (e, dict) { return void getMultipleFileSize(Env, msg[1], function (e, dict) {
if (e) { if (e) {
warn(e, dict); WARN(e, dict);
return void Respond(e); return void Respond(e);
} }
Respond(void 0, dict); Respond(void 0, dict);
@ -997,7 +1002,7 @@ RPC.create = function (config /*:typeof(ConfigType)*/, cb /*:(?Error, ?Function)
case 'UPLOAD': case 'UPLOAD':
if (!privileged) { return deny(); } if (!privileged) { return deny(); }
return void upload(Env, safeKey, msg[1], function (e, len) { return void upload(Env, safeKey, msg[1], function (e, len) {
warn(e, len); WARN(e, len);
Respond(e, len); Respond(e, len);
}); });
case 'UPLOAD_STATUS': case 'UPLOAD_STATUS':
@ -1015,13 +1020,13 @@ RPC.create = function (config /*:typeof(ConfigType)*/, cb /*:(?Error, ?Function)
case 'UPLOAD_COMPLETE': case 'UPLOAD_COMPLETE':
if (!privileged) { return deny(); } if (!privileged) { return deny(); }
return void upload_complete(Env, safeKey, function (e, hash) { return void upload_complete(Env, safeKey, function (e, hash) {
warn(e, hash); WARN(e, hash);
Respond(e, hash); Respond(e, hash);
}); });
case 'UPLOAD_CANCEL': case 'UPLOAD_CANCEL':
if (!privileged) { return deny(); } if (!privileged) { return deny(); }
return void upload_cancel(Env, safeKey, function (e) { return void upload_cancel(Env, safeKey, function (e) {
warn(e); WARN(e);
Respond(e); Respond(e);
}); });
default: default:
@ -1054,7 +1059,9 @@ RPC.create = function (config /*:typeof(ConfigType)*/, cb /*:(?Error, ?Function)
var updateLimitDaily = function () { var updateLimitDaily = function () {
updateLimits(config, undefined, function (e) { updateLimits(config, undefined, function (e) {
if (e) { console.error('Error updating the storage limits', e); } if (e) {
WARN('limitUpdate', e);
}
}); });
}; };
updateLimitDaily(); updateLimitDaily();

Write Preview
Loading…
Cancel
Save