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 #9175] Support ldap filter config #9178

Merged
merged 2 commits into from
Sep 20, 2022

Conversation

karsonto
Copy link
Contributor

resolve issue #9175

What is the purpose of the change

XXXXX

Brief changelog

XX

Verifying this change

XXXX

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.

@codecov-commenter
Copy link

codecov-commenter commented Sep 20, 2022

Codecov Report

Merging #9178 (f27113b) into develop (45f38b5) will increase coverage by 0.09%.
The diff coverage is 75.00%.

Impacted file tree graph

@@              Coverage Diff              @@
##             develop    #9178      +/-   ##
=============================================
+ Coverage      43.62%   43.71%   +0.09%     
- Complexity      4780     4787       +7     
=============================================
  Files            914      914              
  Lines          32709    32710       +1     
  Branches        3779     3779              
=============================================
+ Hits           14269    14300      +31     
+ Misses         17040    17007      -33     
- Partials        1400     1403       +3     
Impacted Files Coverage Δ
...alibaba/nacos/plugin/auth/impl/LdapAuthConfig.java 0.00% <0.00%> (ø)
...nacos/plugin/auth/impl/constant/AuthConstants.java 0.00% <ø> (ø)
...s/plugin/auth/impl/LdapAuthenticationProvider.java 28.20% <100.00%> (+28.20%) ⬆️
...m/alibaba/nacos/naming/misc/HttpClientManager.java 69.04% <0.00%> (-14.29%) ⬇️
...os/client/auth/ram/identify/CredentialService.java 78.84% <0.00%> (-3.85%) ⬇️
...a/nacos/core/remote/control/TpsMonitorManager.java 53.50% <0.00%> (-1.28%) ⬇️
...alibaba/nacos/client/config/impl/ClientWorker.java 54.97% <0.00%> (+4.67%) ⬆️
...a/nacos/plugin/auth/impl/persistence/RoleInfo.java 75.00% <0.00%> (+75.00%) ⬆️

Continue to review full report at Codecov.

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

@karsonto karsonto changed the title resolve issue #9175 add ldap filter config [ISSUE #9175] Add ldap filter config Sep 20, 2022
@karsonto karsonto changed the title [ISSUE #9175] Add ldap filter config [ISSUE #9175] Support ldap filter config Sep 20, 2022
@onewe
Copy link
Collaborator

onewe commented Sep 20, 2022

完善一下单元测试

@@ -171,6 +171,7 @@ nacos.core.auth.plugin.nacos.token.secret.key=SecretKey0123456789012345678901234
#nacos.core.auth.ldap.userDn=cn=admin,${nacos.core.auth.ldap.basedc}
#nacos.core.auth.ldap.password=admin
#nacos.core.auth.ldap.userdn=cn={0},dc=example,dc=org
#nacos.core.auth.ldap.filter.prefix=uid
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

application.properties.example 这个文件也添加一下

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

好的,没问题

@onewe onewe merged commit 091f530 into alibaba:develop Sep 20, 2022
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.

3 participants