diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2022-01-04 17:52:55 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2022-01-04 17:52:55 +0900 |
| commit | 8233f86181349ad385ccaa74cfe38c0697433312 (patch) | |
| tree | 8d146d7951a0c85d548fc531ca32d4b92d79db1d /packages/backend/src | |
| parent | tweak ui (diff) | |
| parent | enhance: 許可されていないファイルタイプでは、オブジェ... (diff) | |
| download | misskey-8233f86181349ad385ccaa74cfe38c0697433312.tar.gz misskey-8233f86181349ad385ccaa74cfe38c0697433312.tar.bz2 misskey-8233f86181349ad385ccaa74cfe38c0697433312.zip | |
Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop
Diffstat (limited to 'packages/backend/src')
| -rw-r--r-- | packages/backend/src/services/drive/add-file.ts | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/packages/backend/src/services/drive/add-file.ts b/packages/backend/src/services/drive/add-file.ts index 3d53fe8d34..38793412fa 100644 --- a/packages/backend/src/services/drive/add-file.ts +++ b/packages/backend/src/services/drive/add-file.ts @@ -50,6 +50,12 @@ async function save(file: DriveFile, path: string, name: string, type: string, h if (type === 'image/vnd.mozilla.apng') ext = '.apng'; } + // 拡張子からContent-Typeを設定してそうな挙動を示すオブジェクトストレージ (upcloud?) も存在するので、 + // 許可されているファイル形式でしか拡張子をつけない + if (!FILE_TYPE_BROWSERSAFE.includes(type)) { + ext = ''; + } + const baseUrl = meta.objectStorageBaseUrl || `${ meta.objectStorageUseSSL ? 'https' : 'http' }://${ meta.objectStorageEndpoint }${ meta.objectStoragePort ? `:${meta.objectStoragePort}` : '' }/${ meta.objectStorageBucket }`; |