-
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
30
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
30 commits
Select commit
Hold shift + click to select a range
a75517c
feat: add property to manage usage of empty pass for login
iaorekhov-1980 02c6e0a
feat: added logic and test to support allow_empty_pass mode
iaorekhov-1980 e504ca7
fix: fixing indentation
iaorekhov-1980 802e18b
fix: fix indentation
iaorekhov-1980 b8e0e3b
fix: improve test to restore property before test
iaorekhov-1980 2673f6d
fix import order
iaorekhov-1980 0c0ef9c
review: introduced changes suggested by copilot review
iaorekhov-1980 41cf2ad
review: line was too long
iaorekhov-1980 9ed16cf
review: indentantion was fixed
iaorekhov-1980 6b5dedb
review: introduced test for null values and checkPlainPassword() method
iaorekhov-1980 c008e7e
review: fix indents and imports
iaorekhov-1980 8bfca88
review: fix indents and imports
iaorekhov-1980 9b1c5d6
review: fix indents and imports v2
iaorekhov-1980 b0923e3
review: fixed imports v2
iaorekhov-1980 da7f226
review: fixed imports v3
iaorekhov-1980 190983c
review: fixed imports v3
iaorekhov-1980 9ed0f62
review: tests reworked v1
iaorekhov-1980 af72c34
review: tests reworked v2
iaorekhov-1980 5d397e1
review: tests reworked v3
iaorekhov-1980 800e83a
review: fixed imports v4
iaorekhov-1980 a6181a7
review: fix tests for plain auth
iaorekhov-1980 b38c024
review: fix tests for plain auth v2
iaorekhov-1980 2735651
review: fix tests for plain auth v3
iaorekhov-1980 7d3b8ec
review: fix tests for plain auth v4
iaorekhov-1980 a007a6b
review: fix tests for plain auth v4
iaorekhov-1980 4d07edc
review: fix tests for plain auth v5
iaorekhov-1980 27d0fba
review: fix tests for plain auth v6
iaorekhov-1980 5f2641e
review: fix tests for plain auth v7 - without mutable
iaorekhov-1980 c71deda
review: fix tests for plain auth v7 - with mutable and junit5
iaorekhov-1980 5dfd4e6
review: fix tests for plain auth v8 - without spaces
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
121 changes: 121 additions & 0 deletions
121
...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,121 @@ | ||
| // 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 mockit.Expectations; | ||
| import mockit.Mocked; | ||
| import org.junit.jupiter.api.AfterEach; | ||
| import org.junit.jupiter.api.Assertions; | ||
| import org.junit.jupiter.api.BeforeEach; | ||
| import org.junit.jupiter.api.Test; | ||
|
|
||
| public class PlainAuthWithEmptyPasswordAndLdapTest extends TestWithFeService { | ||
| private static final String IP = "192.168.1.1"; | ||
|
|
||
| @Mocked | ||
| private LdapManager ldapManager; | ||
|
|
||
| private void setLdapUserExist(boolean res) { | ||
| new Expectations() { | ||
| { | ||
| ldapManager.doesUserExist(anyString); | ||
| minTimes = 0; | ||
| result = res; | ||
| } | ||
| }; | ||
| } | ||
|
|
||
| private void setCheckPassword(boolean res) { | ||
| new Expectations() { | ||
| { | ||
| ldapManager.checkUserPasswd(anyString, anyString, anyString, null); | ||
| minTimes = 0; | ||
| result = res; | ||
| } | ||
| }; | ||
| } | ||
|
|
||
| @Test | ||
| public void testPlainPasswordAuthWithAllowEmptyPassDefault() throws Exception { | ||
| setLdapUserExist(true); | ||
| setCheckPassword(true); | ||
|
|
||
| //running test with non-specified value - ldap_allow_empty_pass should be true | ||
| //empty pass - success | ||
| Assertions.assertTrue(LdapConfig.ldap_allow_empty_pass); | ||
| Env.getCurrentEnv().getAuth().checkPlainPassword("user1.1", IP, "", null); | ||
| //non empty pass - success | ||
| Assertions.assertTrue(LdapConfig.ldap_allow_empty_pass); | ||
| Env.getCurrentEnv().getAuth().checkPlainPassword("user1.2", IP, "testPass", null); | ||
| } | ||
|
|
||
|
|
||
| @Test | ||
| public void testPlainPasswordAuthWithAllowEmptyPassTrue() throws Exception { | ||
| setLdapUserExist(true); | ||
| setCheckPassword(true); | ||
|
|
||
| //running test with specified value - ldap_allow_empty_pass is be true | ||
| LdapConfig.ldap_allow_empty_pass = true; | ||
|
|
||
| //empty pass - success | ||
| Assertions.assertTrue(LdapConfig.ldap_allow_empty_pass); | ||
| Env.getCurrentEnv().getAuth().checkPlainPassword("user2.1", IP, "", null); | ||
|
|
||
| //non empty pass - success | ||
| Assertions.assertTrue(LdapConfig.ldap_allow_empty_pass); | ||
| Env.getCurrentEnv().getAuth().checkPlainPassword("user2.2", IP, "testPass", null); | ||
| } | ||
|
|
||
| @Test | ||
| public void testPlainPasswordAuthWithAllowEmptyPassFalse() throws Exception { | ||
| setLdapUserExist(true); | ||
| setCheckPassword(true); | ||
|
|
||
| //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 | ||
| } | ||
|
|
||
| @BeforeEach | ||
| public void setUp() { | ||
| System.out.println("5.0 [" + LdapConfig.ldap_allow_empty_pass + "]"); | ||
| LdapConfig.ldap_allow_empty_pass = true; //restoring default value for other tests | ||
| } | ||
| } |
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.