This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new 56117d5f8b9 [fix](auth)Compatible with previously enabled ldap
configuration (#34891) (#34899)
56117d5f8b9 is described below
commit 56117d5f8b971e327c6f45b95277ccaec7307a03
Author: zhangdong <[email protected]>
AuthorDate: Fri May 17 11:17:06 2024 +0800
[fix](auth)Compatible with previously enabled ldap configuration (#34891)
(#34899)
---
.../java/org/apache/doris/common/LdapConfig.java | 8 +++
.../doris/mysql/authenticate/AuthenticateType.java | 5 ++
.../mysql/authenticate/AuthenticateTypeTest.java | 57 ++++++++++++++++++++++
3 files changed, 70 insertions(+)
diff --git a/fe/fe-common/src/main/java/org/apache/doris/common/LdapConfig.java
b/fe/fe-common/src/main/java/org/apache/doris/common/LdapConfig.java
index ef35484cbca..a6fb10f261d 100644
--- a/fe/fe-common/src/main/java/org/apache/doris/common/LdapConfig.java
+++ b/fe/fe-common/src/main/java/org/apache/doris/common/LdapConfig.java
@@ -21,6 +21,14 @@ package org.apache.doris.common;
* LDAP configuration
*/
public class LdapConfig extends ConfigBase {
+
+ /**
+ * Flag to enable LDAP authentication.
+ */
+ @Deprecated
+ @ConfigBase.ConfField
+ public static boolean ldap_authentication_enabled = false;
+
/**
* LDAP server ip.
*/
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/mysql/authenticate/AuthenticateType.java
b/fe/fe-core/src/main/java/org/apache/doris/mysql/authenticate/AuthenticateType.java
index 0d180eba23d..4281c19bba6 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/mysql/authenticate/AuthenticateType.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/mysql/authenticate/AuthenticateType.java
@@ -18,12 +18,17 @@
package org.apache.doris.mysql.authenticate;
import org.apache.doris.common.Config;
+import org.apache.doris.common.LdapConfig;
public enum AuthenticateType {
DEFAULT,
LDAP;
public static AuthenticateType getAuthTypeConfig() {
+ // Compatible with previously enabled ldap configuration
+ if (LdapConfig.ldap_authentication_enabled) {
+ return LDAP;
+ }
switch (Config.authentication_type.toLowerCase()) {
case "default":
return DEFAULT;
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/mysql/authenticate/AuthenticateTypeTest.java
b/fe/fe-core/src/test/java/org/apache/doris/mysql/authenticate/AuthenticateTypeTest.java
new file mode 100644
index 00000000000..926d4593b72
--- /dev/null
+++
b/fe/fe-core/src/test/java/org/apache/doris/mysql/authenticate/AuthenticateTypeTest.java
@@ -0,0 +1,57 @@
+// 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.authenticate;
+
+import org.apache.doris.common.Config;
+import org.apache.doris.common.LdapConfig;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class AuthenticateTypeTest {
+
+ @Test
+ public void testGetAuthTypeConfig() {
+ // test default
+ AuthenticateType authTypeConfig = AuthenticateType.getAuthTypeConfig();
+ Assert.assertEquals(AuthenticateType.DEFAULT, authTypeConfig);
+
+ // test old config
+ LdapConfig.ldap_authentication_enabled = true;
+ authTypeConfig = AuthenticateType.getAuthTypeConfig();
+ Assert.assertEquals(AuthenticateType.LDAP, authTypeConfig);
+
+ // test new config
+ LdapConfig.ldap_authentication_enabled = false;
+ Config.authentication_type = "ldap";
+ authTypeConfig = AuthenticateType.getAuthTypeConfig();
+ Assert.assertEquals(AuthenticateType.LDAP, authTypeConfig);
+
+ // test new&old config
+ LdapConfig.ldap_authentication_enabled = true;
+ Config.authentication_type = "ldap";
+ authTypeConfig = AuthenticateType.getAuthTypeConfig();
+ Assert.assertEquals(AuthenticateType.LDAP, authTypeConfig);
+
+ // test default
+ LdapConfig.ldap_authentication_enabled = false;
+ Config.authentication_type = "default";
+ authTypeConfig = AuthenticateType.getAuthTypeConfig();
+ Assert.assertEquals(AuthenticateType.DEFAULT, authTypeConfig);
+ }
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
