Skip to content

fix(upload): respect overwrite for direct uploads#2625

Merged
jyxjjj merged 3 commits into
mainfrom
fix-2102
Jun 16, 2026
Merged

fix(upload): respect overwrite for direct uploads#2625
jyxjjj merged 3 commits into
mainfrom
fix-2102

Conversation

@jyxjjj

@jyxjjj jyxjjj commented Jun 16, 2026

Copy link
Copy Markdown
Member

Summary / 摘要

  • 修复 HTTP Direct Upload 获取直传信息时未向底层传递 Overwrite 语义的问题。

  • 覆盖上传时允许已存在目标继续生成直传信息,与 stream 上传覆盖行为保持一致。

  • 非覆盖上传时按完整目标路径检查同名文件,并继续返回 file exists

  • This PR has breaking changes.
    / 此 PR 包含破坏性变更。

  • This PR changes public API, config, storage format, or migration behavior.
    / 此 PR 修改了公开 API、配置、存储格式或迁移行为。

  • This PR requires corresponding changes in related repositories.
    / 此 PR 需要关联仓库同步修改。

Related repository PRs / 关联仓库 PR:

  • OpenList-Frontend:
  • OpenList-Docs:

Related Issues / 关联 Issue

Fixes #2102

Testing / 测试

  • go test ./...
  • go test ./internal/fs ./internal/op ./server/handles ./server/s3 ./drivers/s3
  • Manual test / 手动测试:

Checklist / 检查清单

  • I have read CONTRIBUTING.
    / 我已阅读 CONTRIBUTING
  • I confirm this contribution follows the repository license, contribution policy, and code of conduct.
    / 我确认此贡献符合仓库许可证、贡献规范和行为准则。
  • I have formatted the changed code with gofmt, go fmt, or prettier where applicable.
    / 我已按适用情况使用 gofmtgo fmtprettier 格式化变更代码。
  • I have requested review from relevant maintainers or code owners where applicable.
    / 我已在适用情况下请求相关维护者或代码所有者审查。

AI Disclosure / AI 使用声明

  • This PR includes AI-assisted content.
    / 此 PR 包含 AI 辅助内容。

Tools used / 使用工具:

  • ChatGPT
  • Codex
  • GitHub Copilot
  • Claude
  • Gemini
  • Other (please specify) / 其他(请注明):

Usage scope / 使用范围:

  • Code generation / 代码生成

  • Refactoring / 重构

  • Documentation / 文档

  • Tests / 测试

  • Translation / 翻译

  • Review assistance / 审查辅助

  • I have reviewed and validated all AI-assisted content included in this PR.
    / 我已审核并验证此 PR 中的所有 AI 辅助内容。

  • I have ensured that all AI-assisted commits include Co-Authored-By attribution.
    / 我已确保所有 AI 辅助提交都包含 Co-Authored-By 归属信息。

  • I can reproduce all AI-assisted content included in this PR without any AI tools.
    / 我可以在没有任何 AI 工具的情况下重现此 PR 中包含的 AI 辅助内容。

- 将 Direct Upload 的 overwrite 参数传递到后端检查逻辑
- 覆盖上传时允许已存在目标继续生成直传信息
- 非覆盖上传时按完整目标路径返回 file exists

Co-authored-by: Codex <267193182+codex@users.noreply.github.com>
Signed-off-by: jyxjjj <16695261+jyxjjj@users.noreply.github.com>
@jyxjjj jyxjjj marked this pull request as ready for review June 16, 2026 03:39
@PIKACHUIM PIKACHUIM requested a review from Copilot June 16, 2026 05:11

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR fixes direct-upload overwrite semantics by propagating the Overwrite intent through the HTTP Direct Upload API down to the storage-layer direct uploader, aligning behavior with stream uploads and addressing issue #2102 (S3/R3 “object already exists” blocking direct upload info).

Changes:

  • Add an overwrite parameter to GetDirectUploadInfo across server -> internal/fs -> internal/op layers.
  • Skip the “object already exists” pre-check when overwrite is enabled, allowing direct upload info generation for existing targets.
  • Fix the non-overwrite existence check in the direct upload handler to check the full destination path (dir + file name).

Reviewed changes

Copilot reviewed 5 out of 5 changed files in this pull request and generated 2 comments.

Show a summary per file
File Description
server/s3/redirect.go Passes overwrite intent when generating S3 direct-upload redirect URLs.
server/handles/direct_upload.go Uses overwrite header to decide existence checks and passes overwrite through to FS direct upload info.
internal/op/fs.go Adds overwrite-aware existence probing before generating driver direct upload info.
internal/fs/put.go Threads overwrite through the internal FS direct-upload plumbing.
internal/fs/fs.go Updates exported internal FS API to accept overwrite and forwards it.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment thread server/handles/direct_upload.go
Comment thread internal/op/fs.go
- 校验直传文件名只能是单个路径段
- 在非覆盖直传检查中返回非 object not found 错误
- 在底层直传信息生成前保留真实探测错误

Co-authored-by: Codex <267193182+codex@users.noreply.github.com>
Signed-off-by: jyxjjj <16695261+jyxjjj@users.noreply.github.com>

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Copilot reviewed 5 out of 5 changed files in this pull request and generated 2 comments.

Comment thread server/handles/direct_upload.go
Comment thread internal/op/fs.go
- 将非覆盖直传的并发已存在错误返回为 403
- 保持直传存在性检查的前端错误文案不暴露路径

Co-authored-by: Codex <267193182+codex@users.noreply.github.com>
Signed-off-by: jyxjjj <16695261+jyxjjj@users.noreply.github.com>
@jyxjjj jyxjjj merged commit eadf03a into main Jun 16, 2026
12 checks passed
@jyxjjj jyxjjj deleted the fix-2102 branch June 16, 2026 06:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[BUG] 显示错误

3 participants