Skip to content

[enhance](auth)Remove restrictions on user creation and other operations when enabling ranger/LDAP #50139

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.

Sign up for GitHub

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

Merged
starocean999 merged 4 commits into from
Jul 8, 2025
Merged

[enhance](auth)Remove restrictions on user creation and other operations when enabling ranger/LDAP #50139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
629d3a2
revert 32538
zddr Apr 17, 2025
eb9e83b
Merge branch 'master' into can_grant_when_ranger_master
zddr May 19, 2025
18836b1
Merge remote-tracking branch 'apache/master' into can_grant_when_rang…
zddr Jul 8, 2025
01994a7
conflict
zddr Jul 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions fe/fe-core/src/main/java/org/apache/doris/analysis/DropUserStmt.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,9 @@

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;

Expand Down Expand Up @@ -56,11 +54,6 @@ public UserIdentity getUserIdentity() {
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()) {
Expand Down
8 changes: 0 additions & 8 deletions fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/DropUserCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,8 @@

import org.apache.doris.analysis.UserIdentity;
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.mysql.authenticate.AuthenticateType;
import org.apache.doris.mysql.privilege.PrivPredicate;
import org.apache.doris.nereids.trees.plans.PlanType;
import org.apache.doris.nereids.trees.plans.visitor.PlanVisitor;
Expand All @@ -48,11 +45,6 @@ public DropUserCommand(UserIdentity userIdent, boolean ifExists) {

@Override
public void doRun(ConnectContext ctx, StmtExecutor executor) throws Exception {
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()) {
Expand Down
7 changes: 0 additions & 7 deletions ...core/src/main/java/org/apache/doris/nereids/trees/plans/commands/info/CreateUserInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,9 @@
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.mysql.authenticate.AuthenticateType;
import org.apache.doris.mysql.privilege.PrivPredicate;
import org.apache.doris.mysql.privilege.Role;
import org.apache.doris.qe.ConnectContext;
Expand Down Expand Up @@ -91,11 +89,6 @@ public CreateUserInfo(boolean ifNotExist, UserDesc userDesc,
* validate
*/
public void validate() throws AnalysisException {
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()) {
Expand Down