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: missing ServerWebExchange in plugin template processor extension #6877

Merged
merged 1 commit into from
Oct 16, 2024

Conversation

guqing
Copy link
Member

@guqing guqing commented Oct 16, 2024

What type of PR is this?

/kind bug
/area core
/milestone 2.20.x

What this PR does / why we need it:

修复由 #6680 导致的插件模板处理扩展中无法获取到请求上下文的问题

#6680 修复了插件可以在模板处理扩展中通过请求上下文获取到 Halo 的 ApplicationContext 的问题
但这也引入了新的问题就是导致模板处理扩展无法获取到请求上下文,此 PR 通过判断传递给插件的 ITemplateContext 是否为 IWebContext,如果是则包装为 SecureTemplateWebContext 传递给插件,以解决此问题

Which issue(s) this PR fixes:

Fixes #6875

Does this PR introduce a user-facing change?

修复插件模板处理扩展中无法获取到请求上下文的问题

@f2c-ci-robot f2c-ci-robot bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. kind/bug Categorizes issue or PR as related to a bug. labels Oct 16, 2024
@f2c-ci-robot f2c-ci-robot bot added this to the 2.20.x milestone Oct 16, 2024
@f2c-ci-robot f2c-ci-robot bot added the area/core Issues or PRs related to the Halo Core label Oct 16, 2024
Copy link

sonarcloud bot commented Oct 16, 2024

Copy link

codecov bot commented Oct 16, 2024

Codecov Report

Attention: Patch coverage is 73.33333% with 4 lines in your changes missing coverage. Please review.

Project coverage is 57.03%. Comparing base (eff73dc) to head (17fb3c7).
Report is 11 commits behind head on main.

Files with missing lines Patch % Lines
...lo/app/theme/dialect/SecureTemplateWebContext.java 50.00% 2 Missing and 1 partial ⚠️
...pp/theme/dialect/SecureTemplateContextWrapper.java 75.00% 1 Missing ⚠️
Additional details and impacted files
@@             Coverage Diff              @@
##               main    #6877      +/-   ##
============================================
+ Coverage     56.99%   57.03%   +0.04%     
- Complexity     3999     4008       +9     
============================================
  Files           714      716       +2     
  Lines         24110    24187      +77     
  Branches       1585     1594       +9     
============================================
+ Hits          13742    13796      +54     
- Misses         9756     9777      +21     
- Partials        612      614       +2     

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

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

@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 Oct 16, 2024
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 Oct 16, 2024
Copy link

f2c-ci-robot bot commented Oct 16, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: JohnNiang, ruibaby

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 merged commit c577deb into halo-dev:main Oct 16, 2024
8 checks passed
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/bug Categorizes issue or PR as related to a bug. 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.

更新2.20.x 后灯箱插件无效果
3 participants