yuuza/outline
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow file access not in Attachments table (#5876)

Browse Source 
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
This commit is contained in:
Tom Moor
2023-09-24 09:43:37 -04:00
committed by GitHub
parent d0bb6c6a41
commit e50e0bba53
9 changed files with 181 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
server/storage/files/LocalStorage.ts
View File

@@ -12,6 +12,7 @@ import path from "path";
import { Readable } from "stream";
import invariant from "invariant";
import JWT from "jsonwebtoken";
import safeResolvePath from "resolve-path";
import env from "@server/env";
import Logger from "@server/logging/Logger";
import BaseStorage from "./BaseStorage";
@@ -68,11 +69,11 @@ export default class LocalStorage extends BaseStorage {
src = Readable.from(body);
}
const destPath = path.join(env.FILE_STORAGE_LOCAL_ROOT_DIR, key);
closeSync(openSync(destPath, "w"));
const filePath = this.getFilePath(key);
closeSync(openSync(filePath, "w"));
return new Promise<string>((resolve, reject) => {
const dest = createWriteStream(destPath)
const dest = createWriteStream(filePath)
.on("error", reject)
.on("finish", () => resolve(this.getUrlForKey(key)));
@@ -86,7 +87,7 @@ export default class LocalStorage extends BaseStorage {
};
public async deleteFile(key: string) {
const filePath = path.join(env.FILE_STORAGE_LOCAL_ROOT_DIR, key);
const filePath = this.getFilePath(key);
try {
await unlink(filePath);
} catch (err) {
@@ -112,12 +113,15 @@ export default class LocalStorage extends BaseStorage {
};
public getFileStream(key: string) {
return createReadStream(this.getFilePath(key));
}
private getFilePath(key: string) {
invariant(
env.FILE_STORAGE_LOCAL_ROOT_DIR,
"FILE_STORAGE_LOCAL_ROOT_DIR is required"
);
const filePath = path.join(env.FILE_STORAGE_LOCAL_ROOT_DIR, key);
return createReadStream(filePath);
return safeResolvePath(env.FILE_STORAGE_LOCAL_ROOT_DIR, key);
}
}