Skip to content

Catch zip errors on import file load #16494

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sampaiodiego merged 1 commit into from
Feb 6, 2020
Merged

Catch zip errors on import file load #16494

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/api/server/api.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,7 @@ export class APIClass extends Restivus {
'error-unauthorized': 'unauthorized',
}[e.error] || 'failure';

result = API.v1[apiMethod](e.message, e.error);
result = API.v1[apiMethod](typeof e === 'string' ? e : e.message, e.error);
} finally {
delete Accounts._accountData[connection.id];
}
Expand Down
159 changes: 82 additions & 77 deletions app/importer-slack/server/importer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,98 +69,103 @@ export class SlackImporter extends Base {
return data;
};

zip.forEach((entry) => {
try {
if (entry.entryName.includes('__MACOSX') || entry.entryName.includes('.DS_Store')) {
return this.logger.debug(`Ignoring the file: ${ entry.entryName }`);
}

if (entry.entryName === 'channels.json') {
tempChannels = prepareChannelsFile(entry, 'channels');
return;
}

if (entry.entryName === 'groups.json') {
tempGroups = prepareChannelsFile(entry, 'groups');
return;
}
try {
zip.forEach((entry) => {
try {
if (entry.entryName.includes('__MACOSX') || entry.entryName.includes('.DS_Store')) {
return this.logger.debug(`Ignoring the file: ${ entry.entryName }`);
}

if (entry.entryName === 'mpims.json') {
tempMpims = prepareChannelsFile(entry, 'mpims');
return;
}
if (entry.entryName === 'channels.json') {
tempChannels = prepareChannelsFile(entry, 'channels');
return;
}

if (entry.entryName === 'dms.json') {
tempDMs = prepareChannelsFile(entry, 'DMs', false);
return;
}
if (entry.entryName === 'groups.json') {
tempGroups = prepareChannelsFile(entry, 'groups');
return;
}

if (entry.entryName === 'users.json') {
super.updateProgress(ProgressStep.PREPARING_USERS);
tempUsers = JSON.parse(entry.getData().toString());
if (entry.entryName === 'mpims.json') {
tempMpims = prepareChannelsFile(entry, 'mpims');
return;
}

tempUsers.forEach((user) => {
if (user.is_bot) {
this.bots[user.profile.bot_id] = user;
}
});
if (entry.entryName === 'dms.json') {
tempDMs = prepareChannelsFile(entry, 'DMs', false);
return;
}

this.logger.debug(`loaded ${ tempUsers.length } users.`);
if (entry.entryName === 'users.json') {
super.updateProgress(ProgressStep.PREPARING_USERS);
tempUsers = JSON.parse(entry.getData().toString());

// Insert the users record
this.collection.insert({ import: this.importRecord._id, importer: this.name, type: 'users', users: tempUsers });
this.updateRecord({ 'count.users': tempUsers.length });
this.addCountToTotal(tempUsers.length);
tempUsers.forEach((user) => {
if (user.is_bot) {
this.bots[user.profile.bot_id] = user;
}
});

this.collection.insert({ import: this.importRecord._id, importer: this.name, type: 'bots', bots: this.bots });
return;
}
this.logger.debug(`loaded ${ tempUsers.length } users.`);

if (!entry.isDirectory && entry.entryName.indexOf('/') > -1) {
const item = entry.entryName.split('/');
// Insert the users record
this.collection.insert({ import: this.importRecord._id, importer: this.name, type: 'users', users: tempUsers });
this.updateRecord({ 'count.users': tempUsers.length });
this.addCountToTotal(tempUsers.length);

const channel = item[0];
const date = item[1].split('.')[0];

try {
// Insert the messages records
if (this.progress.step !== ProgressStep.PREPARING_MESSAGES) {
super.updateProgress(ProgressStep.PREPARING_MESSAGES);
}
this.collection.insert({ import: this.importRecord._id, importer: this.name, type: 'bots', bots: this.bots });
return;
}

const tempMessages = JSON.parse(entry.getData().toString());
messagesCount += tempMessages.length;
this.updateRecord({ messagesstatus: `${ channel }/${ date }` });
this.addCountToTotal(tempMessages.length);

if (Base.getBSONSize(tempMessages) > Base.getMaxBSONSize()) {
const tmp = Base.getBSONSafeArraysFromAnArray(tempMessages);
Object.keys(tmp).forEach((i) => {
const splitMsg = tmp[i];
this.collection.insert({ import: this.importRecord._id, importer: this.name, type: 'messages', name: `${ channel }/${ date }.${ i }`, messages: splitMsg, channel, date, i });
});
} else {
this.collection.insert({ import: this.importRecord._id, importer: this.name, type: 'messages', name: `${ channel }/${ date }`, messages: tempMessages, channel, date });
if (!entry.isDirectory && entry.entryName.indexOf('/') > -1) {
const item = entry.entryName.split('/');

const channel = item[0];
const date = item[1].split('.')[0];

try {
// Insert the messages records
if (this.progress.step !== ProgressStep.PREPARING_MESSAGES) {
super.updateProgress(ProgressStep.PREPARING_MESSAGES);
}

const tempMessages = JSON.parse(entry.getData().toString());
messagesCount += tempMessages.length;
this.updateRecord({ messagesstatus: `${ channel }/${ date }` });
this.addCountToTotal(tempMessages.length);

if (Base.getBSONSize(tempMessages) > Base.getMaxBSONSize()) {
const tmp = Base.getBSONSafeArraysFromAnArray(tempMessages);
Object.keys(tmp).forEach((i) => {
const splitMsg = tmp[i];
this.collection.insert({ import: this.importRecord._id, importer: this.name, type: 'messages', name: `${ channel }/${ date }.${ i }`, messages: splitMsg, channel, date, i });
});
} else {
this.collection.insert({ import: this.importRecord._id, importer: this.name, type: 'messages', name: `${ channel }/${ date }`, messages: tempMessages, channel, date });
}
} catch (error) {
this.logger.warn(`${ entry.entryName } is not a valid JSON file! Unable to import it.`);
}
} catch (error) {
this.logger.warn(`${ entry.entryName } is not a valid JSON file! Unable to import it.`);
}
} catch (e) {
this.logger.error(e);
}
} catch (e) {
this.logger.error(e);
}

try {
count++;
const rate = Math.floor(count * 1000 / totalEntries) / 10;
if (rate > oldRate) {
ImporterWebsocket.progressUpdated({ rate });
oldRate = rate;
try {
count++;
const rate = Math.floor(count * 1000 / totalEntries) / 10;
if (rate > oldRate) {
ImporterWebsocket.progressUpdated({ rate });
oldRate = rate;
}
} catch (e) {
console.error(e);
}
} catch (e) {
console.error(e);
}
});
});
} catch (e) {
this.logger.error(e);
throw e;
}

ImporterWebsocket.progressUpdated({ rate: 100 });
this.updateRecord({ 'count.messages': messagesCount, messagesstatus: null });
Expand Down