-
Notifications
You must be signed in to change notification settings - Fork 3.8k
[enhance](auth) introduction of configuration property to prohibit login with empty LDAP password #61440
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
Open
iaorekhov-1980
wants to merge
44
commits into
apache:master
Choose a base branch
from
iaorekhov-1980:feat/disable_ldap_empty_pass
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
[enhance](auth) introduction of configuration property to prohibit login with empty LDAP password #61440
Changes from all commits
Commits
Show all changes
44 commits
Select commit
Hold shift + click to select a range
885b62d
feat: add property to manage usage of empty pass for login
iaorekhov-1980 968446a
:
iaorekhov-1980 2dd33a3
fix: fixing indentation
iaorekhov-1980 a61e132
fix: fix indentation
iaorekhov-1980 08c4f36
fix: improve test to restore property before test
iaorekhov-1980 bab1210
fix import order
iaorekhov-1980 3a6be7e
review: introduced changes suggested by copilot review
iaorekhov-1980 a04f051
review: line was too long
iaorekhov-1980 cd30f9c
review: indentantion was fixed
iaorekhov-1980 83e9f8e
review: introduced test for null values and checkPlainPassword() method
iaorekhov-1980 7b296c7
review: fix indents and imports
iaorekhov-1980 c199d56
review: fix indents and imports
iaorekhov-1980 72be57a
review: fix indents and imports v2
iaorekhov-1980 b2d4e32
review: fixed imports v2
iaorekhov-1980 534e701
review: fixed imports v3
iaorekhov-1980 8d0cf00
review: fixed imports v3
iaorekhov-1980 23a82e4
review: tests reworked v1
iaorekhov-1980 0df4b97
review: tests reworked v3
iaorekhov-1980 4b5eaa3
review: fixed imports v4
iaorekhov-1980 9d36eac
review: fix tests for plain auth
iaorekhov-1980 c19b295
review: fix tests for plain auth v2
iaorekhov-1980 ee331ed
review: fix tests for plain auth v3
iaorekhov-1980 d6a772e
review: fix tests for plain auth v4
iaorekhov-1980 7633729
review: fix tests for plain auth v4
iaorekhov-1980 77fa6c0
review: fix tests for plain auth v5
iaorekhov-1980 82e097d
review: fix tests for plain auth v6
iaorekhov-1980 153738a
review: fix tests for plain auth v7 - without mutable
iaorekhov-1980 9e2347b
review: fix tests for plain auth v7 - with mutable and junit5
iaorekhov-1980 a1391b5
review: fix tests for plain auth v8 - without spaces
iaorekhov-1980 93c1665
fixing imports after rebase
iaorekhov-1980 84c75cf
fixing tests to new mock framework after rebase
iaorekhov-1980 a5c3496
fixing tests to new mock framework after rebase
iaorekhov-1980 ca71fe1
fixing imports after rebase
iaorekhov-1980 8663b1d
test: changed test approach for mockito
iaorekhov-1980 aae4eea
test: changed test approach for mockito v2
iaorekhov-1980 47e09e0
test: changed test approach for mockito v3
iaorekhov-1980 c9ddba8
test: added debug
iaorekhov-1980 e7b7ba5
test: added debug v2
iaorekhov-1980 0fdb03f
test: changed test approach for mockito v3 - correct method mocked
iaorekhov-1980 21cbda1
test: changed test approach for mockito v3 - correct method mocked v2
iaorekhov-1980 08a77ac
test: changed test approach for mockito v3 - correct method mocked v3
iaorekhov-1980 544d0c8
test: changed test approach for mockito v3 - correct method mocked v4
iaorekhov-1980 7855a8c
test: changed test approach for mockito v3 - use getLdapManager inste…
iaorekhov-1980 94da28d
test: changed test approach for mockito v3 - refactor v1
iaorekhov-1980 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
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
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
108 changes: 108 additions & 0 deletions
108
...src/test/java/org/apache/doris/mysql/privilege/PlainAuthWithEmptyPasswordAndLdapTest.java
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,108 @@ | ||
| // Licensed to the Apache Software Foundation (ASF) under one | ||
| // or more contributor license agreements. See the NOTICE file | ||
| // distributed with this work for additional information | ||
| // regarding copyright ownership. The ASF licenses this file | ||
| // to you under the Apache License, Version 2.0 (the | ||
| // "License"); you may not use this file except in compliance | ||
| // with the License. You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, | ||
| // software distributed under the License is distributed on an | ||
| // "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| // KIND, either express or implied. See the License for the | ||
| // specific language governing permissions and limitations | ||
| // under the License. | ||
|
|
||
| package org.apache.doris.mysql.privilege; | ||
|
|
||
| import org.apache.doris.catalog.Env; | ||
| import org.apache.doris.common.AuthenticationException; | ||
| import org.apache.doris.common.LdapConfig; | ||
| import org.apache.doris.mysql.authenticate.ldap.LdapManager; | ||
| import org.apache.doris.utframe.TestWithFeService; | ||
|
|
||
| import org.junit.jupiter.api.AfterEach; | ||
| import org.junit.jupiter.api.Assertions; | ||
| import org.junit.jupiter.api.BeforeEach; | ||
| import org.junit.jupiter.api.Test; | ||
| import org.mockito.MockedStatic; | ||
| import org.mockito.Mockito; | ||
|
|
||
|
|
||
| public class PlainAuthWithEmptyPasswordAndLdapTest extends TestWithFeService { | ||
| private static final String IP = "192.168.1.1"; | ||
|
|
||
| private LdapManager ldapManager = Mockito.mock(LdapManager.class); | ||
| private MockedStatic<Env> mockedEnv; | ||
|
|
||
| @Test | ||
| public void testPlainPasswordAuthWithAllowEmptyPassDefault() throws Exception { | ||
| //running test with non-specified value - ldap_allow_empty_pass should be true | ||
| //non empty pass - success | ||
| Assertions.assertTrue(LdapConfig.ldap_allow_empty_pass); | ||
| Env.getCurrentEnv().getAuth().checkPlainPassword("user1.2", IP, "testPass", null); | ||
| //empty pass - success | ||
| Assertions.assertTrue(LdapConfig.ldap_allow_empty_pass); | ||
| Env.getCurrentEnv().getAuth().checkPlainPassword("user1.1", IP, "", null); | ||
| } | ||
|
|
||
|
|
||
| @Test | ||
| public void testPlainPasswordAuthWithAllowEmptyPassTrue() throws Exception { | ||
| //running test with specified value - ldap_allow_empty_pass is be true | ||
| LdapConfig.ldap_allow_empty_pass = true; | ||
|
|
||
| //non empty pass - success | ||
| Assertions.assertTrue(LdapConfig.ldap_allow_empty_pass); | ||
| Env.getCurrentEnv().getAuth().checkPlainPassword("user2.2", IP, "testPass", null); | ||
| //empty pass - success | ||
| Assertions.assertTrue(LdapConfig.ldap_allow_empty_pass); | ||
| Env.getCurrentEnv().getAuth().checkPlainPassword("user2.1", IP, "", null); | ||
| } | ||
|
|
||
| @Test | ||
| public void testPlainPasswordAuthWithAllowEmptyPassFalse() throws Exception { | ||
| //running test with specified value - ldap_allow_empty_pass is false | ||
| LdapConfig.ldap_allow_empty_pass = false; | ||
|
|
||
| //empty pass - failure | ||
| Assertions.assertFalse(LdapConfig.ldap_allow_empty_pass); | ||
| Assertions.assertThrows(AuthenticationException.class, () -> { | ||
| Env.getCurrentEnv().getAuth().checkPlainPassword("user3.1", IP, "", null); | ||
| }); | ||
|
|
||
| //non empty pass - success | ||
| Assertions.assertFalse(LdapConfig.ldap_allow_empty_pass); | ||
| Env.getCurrentEnv().getAuth().checkPlainPassword("user3.2", IP, "testPass", null); | ||
| } | ||
|
|
||
| @AfterEach | ||
| public void tearDown() { | ||
| System.out.println("4.0 [" + LdapConfig.ldap_allow_empty_pass + "]"); | ||
| LdapConfig.ldap_allow_empty_pass = true; // restoring default value for other tests | ||
| mockedEnv.close(); | ||
| } | ||
|
|
||
| @BeforeEach | ||
| public void setUp() { | ||
| LdapConfig.ldap_allow_empty_pass = true; // restoring default value for other tests | ||
| Auth realAuth = Env.getCurrentEnv().getAuth(); | ||
|
|
||
| mockedEnv = Mockito.mockStatic(Env.class); | ||
| Env mockedEnvInstance = Mockito.mock(Env.class); | ||
|
|
||
| Auth authSpy = Mockito.spy(realAuth); | ||
|
|
||
| Mockito.when(ldapManager.doesUserExist(Mockito.anyString())).thenReturn(true); | ||
| Mockito.when(ldapManager.checkUserPasswd( | ||
| Mockito.anyString(), Mockito.anyString(), | ||
| Mockito.anyString(), Mockito.any())).thenReturn(true); | ||
|
|
||
| Mockito.when(authSpy.getLdapManager()).thenReturn(ldapManager); | ||
|
|
||
| Mockito.when(mockedEnvInstance.getAuth()).thenReturn(authSpy); | ||
| mockedEnv.when(Env::getCurrentEnv).thenReturn(mockedEnvInstance); | ||
| } | ||
| } |
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.