From fb5c8f0645718d3a8f5caff4bc7203478cfb9749 Mon Sep 17 00:00:00 2001 From: zhangdong <493738387@qq.com> Date: Fri, 18 Oct 2024 12:02:48 +0800 Subject: [PATCH] [fix](auth)fix show load priv bug (#41723) fix when user have `load_priv` on table,but can not show load about this table ps: We will add cases to other PRs as a whole:https://github.com/apache/doris/pull/41802 --- .../main/java/org/apache/doris/load/loadv2/BulkLoadJob.java | 6 ++++++ .../src/main/java/org/apache/doris/load/loadv2/LoadJob.java | 4 +--- .../main/java/org/apache/doris/load/loadv2/LoadManager.java | 6 ++++++ 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/BulkLoadJob.java b/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/BulkLoadJob.java index e6cf238dd61fd8..b15d21c2722b3f 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/BulkLoadJob.java +++ b/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/BulkLoadJob.java @@ -140,6 +140,8 @@ public static BulkLoadJob fromLoadStmt(LoadStmt stmt) throws DdlException { bulkLoadJob.setComment(stmt.getComment()); bulkLoadJob.setJobProperties(stmt.getProperties()); bulkLoadJob.checkAndSetDataSourceInfo((Database) db, stmt.getDataDescriptions()); + // In the construction method, there may not be table information yet + bulkLoadJob.rebuildAuthorizationInfo(); return bulkLoadJob; } catch (MetaNotFoundException e) { throw new DdlException(e.getMessage()); @@ -172,6 +174,10 @@ private AuthorizationInfo gatherAuthInfo() throws MetaNotFoundException { return new AuthorizationInfo(database.getFullName(), getTableNames()); } + public void rebuildAuthorizationInfo() throws MetaNotFoundException { + this.authorizationInfo = gatherAuthInfo(); + } + @Override public Set getTableNamesForShow() { Optional db = Env.getCurrentInternalCatalog().getDb(dbId); diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/LoadJob.java b/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/LoadJob.java index 2e3b0e6e868ec6..de2fa86aebc923 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/LoadJob.java +++ b/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/LoadJob.java @@ -602,7 +602,7 @@ public void cancelJob(FailMsg failMsg) throws DdlException { } } - private void checkAuth(String command) throws DdlException { + public void checkAuth(String command) throws DdlException { if (authorizationInfo == null) { // use the old method to check priv checkAuthWithoutAuthInfo(command); @@ -754,8 +754,6 @@ public void unprotectReadEndOperation(LoadJobFinalOperation loadJobFinalOperatio public List getShowInfo() throws DdlException { readLock(); try { - // check auth - checkAuth("SHOW LOAD"); List jobInfo = Lists.newArrayList(); // jobId jobInfo.add(id); diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/LoadManager.java b/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/LoadManager.java index e6cd4e77149ae4..2c3bfd5201c047 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/LoadManager.java +++ b/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/LoadManager.java @@ -611,6 +611,12 @@ public List> getLoadJobInfosByDb(long dbId, String labelValue, if (!states.contains(loadJob.getState())) { continue; } + // check auth + try { + loadJob.checkAuth("show load"); + } catch (DdlException e) { + continue; + } // add load job info loadJobInfos.add(loadJob.getShowInfo()); } catch (RuntimeException | DdlException e) {