summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorかっこかり <67428053+kakkokari-gtyih@users.noreply.github.com>2025-03-06 17:03:57 +0900
committerGitHub <noreply@github.com>2025-03-06 08:03:57 +0000
commitf7ea0c6991efc9589bf11c4ffb82a7adacb75658 (patch)
tree25a123a4fd3d74878cae22ede6e1232723bedea1
parentenhance(frontend): invert how to show the number of attachments(remains) on p... (diff)
downloadmisskey-f7ea0c6991efc9589bf11c4ffb82a7adacb75658.tar.gz
misskey-f7ea0c6991efc9589bf11c4ffb82a7adacb75658.tar.bz2
misskey-f7ea0c6991efc9589bf11c4ffb82a7adacb75658.zip
fix(backend): S3互換オブジェクトストレージでファイルのアップロードに失敗することがある問題を修正 (#15583)
* fix(backend/object-storage): disable data integrity protections (MisskeyIO#895) Cloudflare R2 does not support 'x-amz-checksum-*' * Update Changelog --------- Co-authored-by: あわわわとーにゅ <17376330+u1-liquid@users.noreply.github.com>
-rw-r--r--CHANGELOG.md2
-rw-r--r--packages/backend/src/core/S3Service.ts2
2 files changed, 4 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b9aefe58ab..21c589376b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,8 @@
### Server
- Fix: 特定のケースでActivityPubの処理がデッドロックになることがあるのを修正
+- Fix: S3互換オブジェクトストレージでファイルのアップロードに失敗することがある問題を修正
+ (Cherry-picked from https://github.com/MisskeyIO/misskey/pull/895)
## 2025.2.1
diff --git a/packages/backend/src/core/S3Service.ts b/packages/backend/src/core/S3Service.ts
index 37721d2bf1..968a5dcc0b 100644
--- a/packages/backend/src/core/S3Service.ts
+++ b/packages/backend/src/core/S3Service.ts
@@ -46,6 +46,8 @@ export class S3Service {
tls: meta.objectStorageUseSSL,
forcePathStyle: meta.objectStorageEndpoint ? meta.objectStorageS3ForcePathStyle : false, // AWS with endPoint omitted
requestHandler: new NodeHttpHandler(handlerOption),
+ requestChecksumCalculation: 'WHEN_REQUIRED',
+ responseChecksumValidation: 'WHEN_REQUIRED',
});
}