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

[ISSUE #9023] fix corner case config dataId 'cipher-' that cannot create #9024

Merged
merged 8 commits into from
Aug 31, 2022

Conversation

HotSince91
Copy link
Contributor

Please do not create a Pull Request without creating an issue first.

What is the purpose of the change

fix corner case config dataId 'cipher-' that cannot create

Brief changelog

  1. skip enc process when data-id equals encryption data-id prefix
  2. a safer way to parse cipher algorithem

Verifying this change

success to create config 'cipher-' on page

Follow this checklist to help us incorporate your contribution quickly and easily:

  • Make sure there is a Github issue filed for the change (usually before you start working on it). Trivial changes like typos do not require a Github issue. Your pull request should address just this issue, without pulling in other changes - one PR resolves one issue.
  • Format the pull request title like [ISSUE #123] Fix UnknownException when host config not exist. Each commit in the pull request should have a meaningful subject line and body.
  • Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
  • Write necessary unit-test to verify your logic correction, more mock a little better when cross module dependency exist. If the new feature or significant change is committed, please remember to add integration-test in test module.
  • Run mvn -B clean package apache-rat:check findbugs:findbugs -Dmaven.test.skip=true to make sure basic checks pass. Run mvn clean install -DskipITs to make sure unit-test pass. Run mvn clean test-compile failsafe:integration-test to make sure integration-test pass.

onewe
onewe previously approved these changes Aug 24, 2022
@onewe
Copy link
Collaborator

onewe commented Aug 24, 2022

Please retry ci

@codecov-commenter
Copy link

codecov-commenter commented Aug 24, 2022

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 43.72%. Comparing base (3c8c6a7) to head (38b19d3).
Report is 901 commits behind head on develop.

Additional details and impacted files

Impacted file tree graph

@@              Coverage Diff              @@
##             develop    #9024      +/-   ##
=============================================
+ Coverage      43.65%   43.72%   +0.07%     
- Complexity      4763     4774      +11     
=============================================
  Files            912      912              
  Lines          32569    32599      +30     
  Branches        3761     3765       +4     
=============================================
+ Hits           14218    14255      +37     
+ Misses         16951    16940      -11     
- Partials        1400     1404       +4     
Files with missing lines Coverage Δ
...s/plugin/encryption/handler/EncryptionHandler.java 96.42% <100.00%> (+82.14%) ⬆️

... and 12 files with indirect coverage changes


Continue to review full report in Codecov by Sentry.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 3c8c6a7...38b19d3. Read the comment docs.

@KomachiSion
Copy link
Collaborator

The coverage of EncryptionHandler.java is down, Can you add more UT for your changes?

@HotSince91
Copy link
Contributor Author

The coverage of EncryptionHandler.java is down, Can you add more UT for your changes?

ok

@li-xiao-shuang li-xiao-shuang added this to the 2.1.2 milestone Aug 29, 2022
@li-xiao-shuang li-xiao-shuang linked an issue Aug 29, 2022 that may be closed by this pull request
@li-xiao-shuang li-xiao-shuang merged commit 40651f6 into alibaba:develop Aug 31, 2022
li-xiao-shuang pushed a commit that referenced this pull request Aug 31, 2022
* Add exception detail stacks when connect to server failed.

* [ISSUE#8653]Fix health check bug (#8639)

* fix health bug.

* fix health bug.

* fix health bug.

* test update

* format code

* 注释

* check service exist

* check service exist

* test fail

* user group()

* add unit test.

* add unit test.

* add unit test.

* add unit test.

* add unit test.

* add unit test.

* Add comment for config aspect.

* [ISSUE#8481]Unified TRACE capacity building  (#8805)

* [ISSUE#8481]Unified TRACE capacity building

* [ISSUE#8481]Unified TRACE capacity building
1. Event type add to traceEvent.
2. The event about instance add instancePort.
3. Add health check type to healthChangeEvent.
4. Other fixup.

* Add Generic Type for Simple Cache Map (#8812)

* import config file auth fail (#8844)

* import config file auth fail

* run ci

* run ci2

* Feat/calculate ip count when use batchregister (#8858)

Feat/calculate ip count when use batchregister

* [ISSUE #8880] add a request exception handler (#8881)

* [ISSUE #8880] add a request exception handler

Close #8880

* [ISSUE #8880] retry ci

* Upgrade to 2.1.1 (#8899)

* [ISSUE#8910] bug fix calcu ipCount (#8911)

* bug fix calcu ipCount

* update logic

* judge endpoint (#8933)

* [ISSUE #8925] fix that the value of hasQueryString is always false (#8927)

Close #8925

* [ISSUES#8905]simplify some code (#8908)

* refactor: 💡 update console-ui theme (#8951)

✅ Closes: #8950

* Update IoUtils.java (#8948)

An IOException has been catch,so throws IOException Is invalid

* [ISSUE #8931] Fix bug :BatchInstanceData cannot Serializable question (#8940)

* [fix] fix BatchInstanceData cannot Serializable question

* fix update serialVersionUID auto generate

* [ISSUE #8925] fix that the replaceAll operation is invalid (#8929)

Close #8925

* fix #8947. (#8959)

* judge endpoint

* add some junit test (#8966)

* add some junit test

* fix some junit

* add license

* optimize: internationalization of product description content on landing pages (#8956)

* Improve code specifications. (#8965)

Flip the call to equals method to avoid null pointer exception.

* fix LookupFactoryTest  ut / ci (#8985)

* fix ci

* run ci

* check cla report

* check style

* add some auth plugin test (#8988)

* add some auth plugin test

* ru ci

* remove namespaceShowName uniqueness check (#8989)

* add unit test for ReflectUtils (#8999)

* add unit test for ReflectUtils

* reformat code

* [ISSUE #8993]Close input stream and output stream by try with resource[nacos-common] (#8997)

* [ISSUE #8993]Close input stream and output stream by try with resource[nacos-common]

* [ISSUE #8993]Close input stream and output stream by try with resource[nacos-common]

* [ISSUE #8993]Close input stream and output stream by try with resource[nacos-common]

* add some utils UT (#9006)

add some utils UT

* Fix grpc push data not filter by cluster. (#9019)

* [#344] rename initialization sql files (#8969)

* [ISSUE #9014] performance optimization--refacte TpsMonitorPoint (#9021)

* performance optimization

* fix check style

* fix test unit

* fix test unit for `getTimeFormatOfSecond` method.

* fix unit test  for LimiterTest.

* fix error usage case for asserEquals method;eliminate interactions between test methods

* Fix spelling mistakes. (#9026)

* [ISSUE #9013] enhance grpc client (#9017)

* fix issue #9013

* reformat code style

* reformat code style

* reformat code style

* reformat code style

* reformat code style

* reformat code style

* reformat code style

* change config name

* do some enhance

* add queue size to configProperties

* reformat code style

* Change configuration load order

* Fix ServerListMgr is not shutdown. (#9048)

* set server.error.include-message to ALWAYS (#9045)

* [ISSUE #8934] add header back after convert request to jsonBytes (#8935)

* [ISSUE #9023] fix corner case config dataId 'cipher-' that cannot create (#9024)

* [ISSUE #9023] fix corner case config dataId 'cipher-' that cannot create

* [ISSUE #9023] remove unused import

* [ISSUE #9023] PMD fix

* [ISSUE #9023] add comments

* [ISSUE #9023] should return first token instead of any

* [ISSUE #9023] add more EncryptionHandler ut

* [ISSUE #9023] fix style

* [ISSUE #9023] fix style, keep indentation in blank line

Co-authored-by: KomachiSion <[email protected]>
Co-authored-by: 胡俊 <[email protected]>
Co-authored-by: MajorHe1 <[email protected]>
Co-authored-by: GuiShao <[email protected]>
Co-authored-by: ZhangShenao <[email protected]>
Co-authored-by: chenhao26 <[email protected]>
Co-authored-by: onewe <[email protected]>
Co-authored-by: 胡俊 <[email protected]>
Co-authored-by: liushaoyu-soft <[email protected]>
Co-authored-by: heimanba <[email protected]>
Co-authored-by: 无处不在 <[email protected]>
Co-authored-by: Weizhan Yun <[email protected]>
Co-authored-by: liaochuntao <[email protected]>
Co-authored-by: @xiaochangbai <[email protected]>
Co-authored-by: shiherua <[email protected]>
Co-authored-by: Karson <[email protected]>
Co-authored-by: yjqg6666 <[email protected]>
Co-authored-by: 阿魁 <[email protected]>
Co-authored-by: wuwen <[email protected]>
Co-authored-by: hutt <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Corner case dataId 'cipher-' cause config fail to create
5 participants