Skip to content

ImportHandler: instead of failing when a non Ascii code is uploaded do a roundtrip conversion - Is this mergeable on 03/04/2020? Seems buggy #3796

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

Closed
muxator wants to merge 1 commit into from
Closed

ImportHandler: instead of failing when a non Ascii code is uploaded do a roundtrip conversion - Is this mergeable on 03/04/2020? Seems buggy #3796

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
15 changes: 3 additions & 12 deletions src/node/handler/ImportHandler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,18 +171,6 @@ async function doImport(req, res, padId)
}
}

if (!useConvertor && !req.directDatabaseAccess) {
// Read the file with no encoding for raw buffer access.
let buf = await fsp_readFile(destFile);

// Check if there are only ascii chars in the uploaded file
let isAscii = ! Array.prototype.some.call(buf, c => (c > 240));

if (!isAscii) {
throw "uploadFailed";
}
}

// get the pad object
let pad = await padManager.getPad(padId);

Expand All @@ -192,6 +180,9 @@ async function doImport(req, res, padId)
if (!req.directDatabaseAccess) {
text = await fsp_readFile(destFile, "utf8");

let bytelike = unescape(encodeURIComponent(text));
text = decodeURIComponent(escape(bytelike));

/*
* The <title> tag needs to be stripped out, otherwise it is appended to the
* pad.
Expand Down