Skip to content

fix ERR_INVALID_CHAR when filename contains non-ASCII characters #108

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

Open
catzy007 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix ERR_INVALID_CHAR when filename contains non-ASCII characters #108

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
7 changes: 2 additions & 5 deletions backend/services/chunk-service/utils/getFileData.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import FileDB from "../../../db/mongoDB/fileDB";
import { FileInterface } from "../../../models/file-model";
import NotAuthorizedError from "../../../utils/NotAuthorizedError";
import sanitizeFilename from "../../../utils/sanitizeFilename";
import contentDisposition from "content-disposition";

const fileDB = new FileDB();

Expand Down Expand Up @@ -133,12 +134,8 @@ const proccessData = (

if (!range) {
const sanatizedFilename = sanitizeFilename(currentFile.filename);
const encodedFilename = encodeURIComponent(sanatizedFilename);
res.set("Content-Type", "binary/octet-stream");
res.set(
"Content-Disposition",
`attachment; filename="${sanatizedFilename}"; filename*=UTF-8''${encodedFilename}`
);
res.set("Content-Disposition", contentDisposition(sanatizedFilename));
res.set("Content-Length", currentFile.metadata.size.toString());
}

Expand Down
7 changes: 2 additions & 5 deletions backend/services/chunk-service/utils/getPublicFileData.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import FileDB from "../../../db/mongoDB/fileDB";
import NotAuthorizedError from "../../../utils/NotAuthorizedError";
import UserDB from "../../../db/mongoDB/userDB";
import sanitizeFilename from "../../../utils/sanitizeFilename";
import contentDisposition from "content-disposition";

const fileDB = new FileDB();
const userDB = new UserDB();
Expand Down Expand Up @@ -65,12 +66,8 @@ const proccessData = (res: Response, fileID: string, tempToken: string) => {
});

const sanatizedFilename = sanitizeFilename(file.filename);
const encodedFilename = encodeURIComponent(sanatizedFilename);
res.set("Content-Type", "binary/octet-stream");
res.set(
"Content-Disposition",
`attachment; filename="${sanatizedFilename}"; filename*=UTF-8''${encodedFilename}`
);
res.set("Content-Disposition", contentDisposition(sanatizedFilename));
res.set("Content-Length", file.metadata.size.toString());

readStream
Expand Down
1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@
"@types/compression": "^1.7.0",
"@types/concat-stream": "^1.6.0",
"@types/connect-busboy": "0.0.2",
"@types/content-disposition": "^0.5.9",
"@types/cookie-parser": "^1.4.2",
"@types/cors": "^2.8.17",
"@types/express": "^4.17.21",
Expand Down