Skip to content
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.

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

fix: resolve concurrency issue causing duplicate thumbnail generation #7077

Merged
merged 2 commits into from
Nov 26, 2024

Conversation

guqing
Copy link
Member

@guqing guqing commented Nov 25, 2024

What type of PR is this?

/kind improvement
/area core
/milestone 2.20.x

What this PR does / why we need it:

修复可能为因为并发调用缩略图生成导致多次创建缩略图的问题

此 PR 为 #7031 的补充,并且会清理以前重复生成的缩略图记录和文件

Does this PR introduce a user-facing change?

修复可能为因为并发调用缩略图生成导致多次重复缩略图记录的问题

@f2c-ci-robot f2c-ci-robot bot added kind/improvement Categorizes issue or PR as related to a improvement. release-note Denotes a PR that will be considered when it comes time to generate release notes. labels Nov 25, 2024
@f2c-ci-robot f2c-ci-robot bot added this to the 2.20.x milestone Nov 25, 2024
@f2c-ci-robot f2c-ci-robot bot added the area/core Issues or PRs related to the Halo Core label Nov 25, 2024
@f2c-ci-robot f2c-ci-robot bot requested review from LIlGG and ruibaby November 25, 2024 08:57
Copy link

codecov bot commented Nov 25, 2024

Codecov Report

Attention: Patch coverage is 53.44828% with 27 lines in your changes missing coverage. Please review.

Project coverage is 57.25%. Comparing base (eff73dc) to head (b4ee2ec).
Report is 64 commits behind head on main.

Files with missing lines Patch % Lines
...n/halo/app/core/attachment/ThumbnailMigration.java 43.75% 27 Missing ⚠️
Additional details and impacted files
@@             Coverage Diff              @@
##               main    #7077      +/-   ##
============================================
+ Coverage     56.99%   57.25%   +0.25%     
- Complexity     3999     4020      +21     
============================================
  Files           714      713       -1     
  Lines         24110    24209      +99     
  Branches       1585     1593       +8     
============================================
+ Hits          13742    13861     +119     
+ Misses         9756     9733      -23     
- Partials        612      615       +3     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@guqing guqing requested a review from JohnNiang November 26, 2024 02:44
Copy link

Copy link
Member

@ruibaby ruibaby left a comment

Choose a reason for hiding this comment

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

/lgtm

@f2c-ci-robot f2c-ci-robot bot added the lgtm Indicates that a PR is ready to be merged. label Nov 26, 2024
Copy link
Member

@JohnNiang JohnNiang left a comment

Choose a reason for hiding this comment

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

/approve

Copy link

f2c-ci-robot bot commented Nov 26, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: JohnNiang

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@f2c-ci-robot f2c-ci-robot bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 26, 2024
@f2c-ci-robot f2c-ci-robot bot merged commit ec5c70f into halo-dev:main Nov 26, 2024
8 checks passed
f2c-ci-robot bot pushed a commit that referenced this pull request Nov 26, 2024
#7079)

#### What type of PR is this?
/kind improvement
/area core
/milestone 2.20.x

#### What this PR does / why we need it:
限制缩略图生成仅针对附件库中的图片,防止任意 URI 的生成行为带来的潜在攻击风险

先 merge #7077 后才能合并此 PR

#### Does this PR introduce a user-facing change?

```release-note
限制缩略图生成仅针对附件库中的图片,防止任意 URI 的生成行为带来的潜在攻击风险
```
@guqing guqing deleted the fix/duplicate-thumbnail branch November 26, 2024 03:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/core Issues or PRs related to the Halo Core kind/improvement Categorizes issue or PR as related to a improvement. lgtm Indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants