libre-service.eu/pad.libre-service.eu-etherpad
libre-service.eu/pad.libre-service.eu-etherpad
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-02-01 03:12:42 +01:00
Code Issues Projects Releases Wiki Activity

fix export of bad pads and also limit import to files

Browse source
This commit is contained in:
John McLear 2015-02-21 12:33:30 +00:00
parent abb9b6d833
commit d5bec1701e
2 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/node/utils/ExportEtherpad.js
View file

@ -48,7 +48,7 @@ exports.getPadRaw = function(padId, callback){
// Get the author info // Get the author info
db.get("globalAuthor:"+authorId, function(e, authorEntry){ db.get("globalAuthor:"+authorId, function(e, authorEntry){
authorEntry.padIDs = padId; if(authorEntry && authorEntry.padIDs) authorEntry.padIDs = padId;
if(!e) data["globalAuthor:"+authorId] = authorEntry; if(!e) data["globalAuthor:"+authorId] = authorEntry;
}); });

17
src/node/utils/ImportEtherpad.js
View file

@ -21,9 +21,22 @@ var db = require("../db/DB").db;
exports.setPadRaw = function(padId, records, callback){ exports.setPadRaw = function(padId, records, callback){
records = JSON.parse(records); records = JSON.parse(records);
// !! HACK !!
// If you have a really large pad it will cause a Maximum Range Stack crash
// This is a temporary patch for that so things are kept stable.
var recordCount = Object.keys(records).length;
if(recordCount >= 50000){
console.warn("Etherpad file is too large to import.. We need to fix this. See https://github.com/ether/etherpad-lite/issues/2524");
return callback("tooLarge", false);
}
async.eachSeries(Object.keys(records), function(key, cb){ async.eachSeries(Object.keys(records), function(key, cb){
var value = records[key] var value = records[key]
if(!value){
cb(); // null values are bad.
}
// Author data // Author data
if(value.padIDs){ if(value.padIDs){
// rewrite author pad ids // rewrite author pad ids
@ -34,7 +47,9 @@ exports.setPadRaw = function(padId, records, callback){
db.get(key, function(err, author){ db.get(key, function(err, author){
if(author){ if(author){
// Yes, add the padID to the author.. // Yes, add the padID to the author..
author.padIDs.push(padId); if( Object.prototype.toString.call(author) === '[object Array]'){
author.padIDs.push(padId);
}
value = author; value = author;
}else{ }else{
// No, create a new array with the author info in // No, create a new array with the author info in