bugfix: fix deserialization failure when the XSS filter retrieved the default keyword #7596
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…er obtained the default keyword
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## 2.x #7596 +/- ##
============================================
- Coverage 61.40% 61.38% -0.03%
Complexity 658 658
============================================
Files 1311 1310 -1
Lines 49575 49567 -8
Branches 5836 5836
============================================
- Hits 30443 30425 -18
- Misses 16412 16416 +4
- Partials 2720 2726 +6
... and 9 files with indirect coverage changes 🚀 New features to boost your workflow:
|
slievrly
reviewed
Aug 25, 2025
server/src/main/java/org/apache/seata/server/filter/XSSHttpRequestFilter.java
Outdated
Show resolved
Hide resolved
Contributor
Author
|
@slievrly PTAL |
slievrly
reviewed
Aug 26, 2025
server/src/main/java/org/apache/seata/server/filter/XSSHttpRequestFilter.java
Show resolved
Hide resolved
Contributor
Author
|
tag |
slievrly
reviewed
Aug 27, 2025
Member
slievrly
left a comment
There was a problem hiding this comment.
Pls review these files:
https://github.com/apache/incubator-seata/blob/2.x/script/config-center/config.txt#L209
https://github.com/apache/incubator-seata/blob/2.x/server/src/main/resources/application.example.yml#L181
https://github.com/apache/incubator-seata/blob/2.x/server/src/main/resources/application.raft.example.yml#L157
Contributor
Author
slievrly
pushed a commit
to slievrly/fescar
that referenced
this pull request
Oct 21, 2025
… default keyword (apache#7596)
YvCeung
added a commit
to YvCeung/incubator-seata
that referenced
this pull request
Dec 25, 2025
… default keyword (apache#7596)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Ⅰ. Describe what this PR did
When
xsskeywordis not explicitly specified, the default configuration will be used. Previously, the default configuration was a collection, which was converted byString.valueOf()when retrieved through the configuration class, causing deserialization to fail. This change modifies the default format from aList<String>to aString, so that when the project starts and retrieves the default configuration, deserialization will no longer fail.Modify the logic for obtaining keywords through XSSFilter: Previously, it was entirely specified by the user. If the user's configuration was incorrect or the configuration was overwritten, it might lead to the failure of security protection. After optimization, it ensures that the default xss keywords of the system are consistently effective, and at the same time, the user configuration is retained, but it is merged into the total xss keyword set in an appending manner only
Ⅱ. Does this pull request fix one issue?
fix #7595
Ⅲ. Why don't you add test cases (unit test/integration test)?
Ⅳ. Describe how to verify it
When the configuration file does not specify the
xssKeyWordproperty, starting the service without any errors indicates that there is no issue.Ⅴ. Special notes for reviews