-
Notifications
You must be signed in to change notification settings - Fork 3.7k
[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
24
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.
+186
−2
Open
[enhance](auth) introduction of configuration property to prohibit login with empty LDAP password #61440
Changes from all commits
Commits
Show all changes
24 commits
Select commit
Hold shift + click to select a range
c3ffdd7
feat: add property to manage usage of empty pass for login
iaorekhov-1980 f04ba72
feat: added logic and test to support allow_empty_pass mode
iaorekhov-1980 ab5be69
fix: fixing indentation
iaorekhov-1980 f9742cb
fix: fix indentation
iaorekhov-1980 ca64c42
fix: improve test to restore property before test
iaorekhov-1980 267c2e3
fix import order
iaorekhov-1980 9150fc7
review: introduced changes suggested by copilot review
iaorekhov-1980 b5be138
review: line was too long
iaorekhov-1980 76a24b2
review: indentantion was fixed
iaorekhov-1980 f17892a
review: introduced test for null values and checkPlainPassword() method
iaorekhov-1980 02961ea
review: fix indents and imports
iaorekhov-1980 4ed3764
review: fix indents and imports
iaorekhov-1980 3b9f87b
review: fix indents and imports v2
iaorekhov-1980 46fbe18
review: fixed imports v2
iaorekhov-1980 3935ab7
review: fixed imports v3
iaorekhov-1980 9cd5bf3
review: fixed imports v3
iaorekhov-1980 ed848d9
review: tests reworked v1
iaorekhov-1980 d1e504b
review: tests reworked v2
iaorekhov-1980 92c296f
review: tests reworked v3
iaorekhov-1980 afca8a5
review: fixed imports v4
iaorekhov-1980 ac74562
review: fix tests for plain auth
iaorekhov-1980 2629f6b
review: fix tests for plain auth v2
iaorekhov-1980 a65fad1
review: fix tests for plain auth v3
iaorekhov-1980 2363403
review: fix tests for plain auth v4
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
126 changes: 126 additions & 0 deletions
126
...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,126 @@ | ||
| // 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.After; | ||
| import org.junit.Before; | ||
| import org.junit.jupiter.api.Assertions; | ||
| import org.junit.jupiter.api.Test; | ||
|
|
||
| public class PlainAuthWithEmptyPasswordAndLdapTest extends TestWithFeService { | ||
| private static final String USER_NAME = "user"; | ||
| 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 testPlainPasswordAuthWithNonEmptyPassword() throws Exception { | ||
| System.out.println("1.0 [" + LdapConfig.ldap_allow_empty_pass + "]"); | ||
| setLdapUserExist(true); | ||
| setCheckPassword(true); | ||
|
|
||
| //test with true value and non-empty pass: login is allowed | ||
| LdapConfig.ldap_allow_empty_pass = true; | ||
| System.out.println("1.1 [" + LdapConfig.ldap_allow_empty_pass + "]"); | ||
| Env.getCurrentEnv().getAuth().checkPlainPassword(USER_NAME, IP, "testPass", null); | ||
|
|
||
| //test with false value and non-empty pass: login is allowed | ||
| LdapConfig.ldap_allow_empty_pass = false; | ||
| System.out.println("1.2 [" + LdapConfig.ldap_allow_empty_pass + "]"); | ||
| Env.getCurrentEnv().getAuth().checkPlainPassword(USER_NAME, IP, "testPass", null); | ||
| } | ||
|
|
||
|
|
||
| @Test | ||
| public void testPlainPasswordAuthWithEmptyPasswordAllowed() throws Exception { | ||
| System.out.println("2.0 [" + LdapConfig.ldap_allow_empty_pass + "]"); | ||
| setLdapUserExist(true); | ||
| setCheckPassword(true); | ||
|
|
||
| System.out.println("2.1 [" + LdapConfig.ldap_allow_empty_pass + "]"); | ||
| //test default (ldap_allow_empty_pass=true) and empty pass: login is allowed | ||
| Env.getCurrentEnv().getAuth().checkPlainPassword(USER_NAME, IP, "", null); | ||
|
|
||
| //test with true and empty pass: login is allowed | ||
| LdapConfig.ldap_allow_empty_pass = true; | ||
| System.out.println("2.2 [" + LdapConfig.ldap_allow_empty_pass + "]"); | ||
| Env.getCurrentEnv().getAuth().checkPlainPassword(USER_NAME, IP, "", null); | ||
| } | ||
|
|
||
| @Test | ||
| public void testPlainPasswordAuthWithEmptyPasswordProhibitted() throws Exception { | ||
| System.out.println("3.0 [" + LdapConfig.ldap_allow_empty_pass + "]"); | ||
| setLdapUserExist(true); | ||
| setCheckPassword(true); | ||
|
|
||
| //test with false and empty pass: login is not allowed | ||
| LdapConfig.ldap_allow_empty_pass = false; | ||
| System.out.println("3.1 [" + LdapConfig.ldap_allow_empty_pass + "]"); | ||
| Assertions.assertThrows(AuthenticationException.class, () -> { | ||
| Env.getCurrentEnv().getAuth().checkPlainPassword(USER_NAME, IP, null, null); | ||
| }); | ||
|
|
||
| //test with false and null pass: login is not allowed | ||
| LdapConfig.ldap_allow_empty_pass = false; | ||
| System.out.println("3.2 [" + LdapConfig.ldap_allow_empty_pass + "]"); | ||
| Assertions.assertThrows(AuthenticationException.class, () -> { | ||
| Env.getCurrentEnv().getAuth().checkPlainPassword(USER_NAME, IP, "", null); | ||
| }); | ||
| } | ||
|
|
||
| @After | ||
| 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 | ||
| } | ||
|
|
||
| @Before | ||
| 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.