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

Exclude WebSocket request when serving console index #4096

Merged
merged 1 commit into from Jun 21, 2023

Conversation

JohnNiang
Copy link
Member

@JohnNiang JohnNiang commented Jun 19, 2023

What type of PR is this?

/kind bug
/area core

What this PR does / why we need it:

This PR excludes WebSocket request when serving console index and remove request predicate accept in ConsoleProxyFilter.

Which issue(s) this PR fixes:

Fixes #4083

Special notes for your reviewer:

  1. Start Console with dev environment
  2. Start Halo with dev profile
  3. Try to browse http://localhost:8090/console and check the log

Does this PR introduce a user-facing change?

修复开发环境下访问 Console 出现异常的问题。

@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 Jun 19, 2023
@f2c-ci-robot f2c-ci-robot bot added the area/core Issues or PRs related to the Halo Core label Jun 19, 2023
@codecov
Copy link

codecov bot commented Jun 19, 2023

Codecov Report

Merging #4096 (9ffdc76) into main (2fd9cbd) will increase coverage by 0.02%.
The diff coverage is 71.42%.

@@             Coverage Diff              @@
##               main    #4096      +/-   ##
============================================
+ Coverage     60.22%   60.25%   +0.02%     
- Complexity     2385     2392       +7     
============================================
  Files           357      359       +2     
  Lines         12392    12393       +1     
  Branches        892      892              
============================================
+ Hits           7463     7467       +4     
+ Misses         4492     4490       -2     
+ Partials        437      436       -1     
Impacted Files Coverage Δ
.../java/run/halo/app/console/ConsoleProxyFilter.java 0.00% <0.00%> (ø)
...c/main/java/run/halo/app/config/WebFluxConfig.java 72.41% <100.00%> (+0.48%) ⬆️
...un/halo/app/console/WebSocketRequestPredicate.java 100.00% <100.00%> (ø)
...app/console/WebSocketServerWebExchangeMatcher.java 100.00% <100.00%> (+25.00%) ⬆️
...main/java/run/halo/app/console/WebSocketUtils.java 100.00% <100.00%> (ø)

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 Jun 20, 2023
Copy link
Member

@guqing guqing 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
Copy link

f2c-ci-robot bot commented Jun 21, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: guqing

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 Jun 21, 2023
@f2c-ci-robot f2c-ci-robot bot merged commit 12a426c into halo-dev:main Jun 21, 2023
4 checks passed
@ruibaby ruibaby modified the milestones: 2.7.x, 2.7.0 Jun 21, 2023
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
3 participants