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

Support customizing CORS configuration #6981

Merged
merged 1 commit into from
Oct 31, 2024

Conversation

JohnNiang
Copy link
Member

What type of PR is this?

/kind improvement
/area core
/milestone 2.20.x

What this PR does / why we need it:

This PR adds CorsOptions into SecurityProperties to let users customize their own CORS configuration. e.g.:

halo:
  security:
    cors-options:
      disabled: false
      configs:
        - pathPattern: /apis/first.api.halo.run/v1alpha1/**
          config:
            allowedOrigins: [ "*" ]
            allowedHeaders: [ "*" ]
            allowedMethods: [ "*" ]
            exposedHeaders: [ "*" ]
            allowCredentials: true
            maxAge: 30m
        - pathPattern: /apis/second.api.halo.run/v1alpha1/**
          config:
            allowedOrigins: [ "www.halo.run", "www.lxware.cn" ]
            allowedHeaders: [ "Content-Type", "Authorization" ]
            allowedMethods: [ "GET, POST, PUT, DELETE" ]
            allowedCredentials: false
            maxAge: 1h

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 Oct 31, 2024
@f2c-ci-robot f2c-ci-robot bot added this to the 2.20.x milestone Oct 31, 2024
@f2c-ci-robot f2c-ci-robot bot added the area/core Issues or PRs related to the Halo Core label Oct 31, 2024
@f2c-ci-robot f2c-ci-robot bot requested review from LIlGG and wan92hen October 31, 2024 08:42
Copy link

sonarcloud bot commented Oct 31, 2024

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.

/lgtm

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

f2c-ci-robot bot commented Oct 31, 2024

[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 Oct 31, 2024
@guqing guqing added sig/docs Categorizes an issue or PR as relevant to SIG Docs. approved Indicates a PR has been approved by an approver from all required OWNERS files. and removed approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Oct 31, 2024
Copy link

codecov bot commented Oct 31, 2024

Codecov Report

Attention: Patch coverage is 57.89474% with 8 lines in your changes missing coverage. Please review.

Project coverage is 57.23%. Comparing base (eff73dc) to head (88e2f69).
Report is 47 commits behind head on main.

Files with missing lines Patch % Lines
.../halo/app/infra/properties/SecurityProperties.java 42.85% 3 Missing and 1 partial ⚠️
...ain/java/run/halo/app/security/CorsConfigurer.java 66.66% 3 Missing and 1 partial ⚠️
Additional details and impacted files
@@             Coverage Diff              @@
##               main    #6981      +/-   ##
============================================
+ Coverage     56.99%   57.23%   +0.23%     
- Complexity     3999     4007       +8     
============================================
  Files           714      712       -2     
  Lines         24110    24144      +34     
  Branches       1585     1590       +5     
============================================
+ Hits          13742    13819      +77     
+ Misses         9756     9710      -46     
- Partials        612      615       +3     

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

@guqing
Copy link
Member

guqing commented Oct 31, 2024

@f2c-ci-robot f2c-ci-robot bot merged commit 4dbfb93 into halo-dev:main Oct 31, 2024
8 checks passed
@JohnNiang JohnNiang deleted the feat/support-configuring-cors branch October 31, 2024 08:57
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. sig/docs Categorizes an issue or PR as relevant to SIG Docs.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants