This is an automated email from the ASF dual-hosted git repository.

morrysnow pushed a commit to branch branch-3.1
in repository https://gitbox.apache.org/repos/asf/doris.git


The following commit(s) were added to refs/heads/branch-3.1 by this push:
     new 7a58f5cbac8 branch-3.1: [enhance](auth)Remove restrictions on user 
creation and other operations when enabling ranger/LDAP #50139 (#53817)
7a58f5cbac8 is described below

commit 7a58f5cbac84f69c6d914c49d688b8886a14776d
Author: zhangdong <[email protected]>
AuthorDate: Thu Jul 24 16:29:39 2025 +0800

    branch-3.1: [enhance](auth)Remove restrictions on user creation and other 
operations when enabling ranger/LDAP #50139 (#53817)
    
    pick #50139
---
 .../src/main/java/org/apache/doris/analysis/CreateUserStmt.java   | 8 --------
 .../src/main/java/org/apache/doris/analysis/DropUserStmt.java     | 7 -------
 2 files changed, 15 deletions(-)

diff --git 
a/fe/fe-core/src/main/java/org/apache/doris/analysis/CreateUserStmt.java 
b/fe/fe-core/src/main/java/org/apache/doris/analysis/CreateUserStmt.java
index 74ca252779e..0ab1f1ff30b 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/analysis/CreateUserStmt.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/CreateUserStmt.java
@@ -19,13 +19,10 @@ package org.apache.doris.analysis;
 
 import org.apache.doris.catalog.Env;
 import org.apache.doris.cluster.ClusterNamespace;
-import org.apache.doris.common.AnalysisException;
-import org.apache.doris.common.Config;
 import org.apache.doris.common.ErrorCode;
 import org.apache.doris.common.ErrorReport;
 import org.apache.doris.common.FeNameFormat;
 import org.apache.doris.common.UserException;
-import org.apache.doris.mysql.authenticate.AuthenticateType;
 import org.apache.doris.mysql.privilege.PrivPredicate;
 import org.apache.doris.mysql.privilege.Role;
 import org.apache.doris.qe.ConnectContext;
@@ -146,11 +143,6 @@ public class CreateUserStmt extends DdlStmt implements 
NotFallbackInParser {
     public void analyze(Analyzer analyzer) throws UserException {
         super.analyze(analyzer);
 
-        if (Config.access_controller_type.equalsIgnoreCase("ranger-doris")
-                && AuthenticateType.getAuthTypeConfig() == 
AuthenticateType.LDAP) {
-            throw new AnalysisException("Create user is prohibited when Ranger 
and LDAP are enabled at same time.");
-        }
-
         userIdent.analyze();
 
         if (userIdent.isRootUser()) {
diff --git 
a/fe/fe-core/src/main/java/org/apache/doris/analysis/DropUserStmt.java 
b/fe/fe-core/src/main/java/org/apache/doris/analysis/DropUserStmt.java
index 5f9872e42ad..39012f866d3 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/analysis/DropUserStmt.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/DropUserStmt.java
@@ -19,11 +19,9 @@ package org.apache.doris.analysis;
 
 import org.apache.doris.catalog.Env;
 import org.apache.doris.common.AnalysisException;
-import org.apache.doris.common.Config;
 import org.apache.doris.common.ErrorCode;
 import org.apache.doris.common.ErrorReport;
 import org.apache.doris.common.UserException;
-import org.apache.doris.mysql.authenticate.AuthenticateType;
 import org.apache.doris.mysql.privilege.PrivPredicate;
 import org.apache.doris.qe.ConnectContext;
 
@@ -56,11 +54,6 @@ public class DropUserStmt extends DdlStmt implements 
NotFallbackInParser {
     public void analyze(Analyzer analyzer) throws AnalysisException, 
UserException {
         super.analyze(analyzer);
 
-        if (Config.access_controller_type.equalsIgnoreCase("ranger-doris")
-                && AuthenticateType.getAuthTypeConfig() == 
AuthenticateType.LDAP) {
-            throw new AnalysisException("Drop user is prohibited when Ranger 
and LDAP are enabled at same time.");
-        }
-
         userIdent.analyze();
 
         if (userIdent.isSystemUser()) {


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to