database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

[Bug][Privilege] Missing current user identity when forwarding request to Master FE (#2443)

Browse Source 
The current user identity should be passed to Master FE in forward request.
This commit is contained in:
Mingyu Chen
2019-12-12 16:27:48 +08:00
committed by GitHub
parent bf31bd238b
commit ded247f001
3 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
fe/src/main/java/org/apache/doris/qe/ConnectProcessor.java
View File

@ -18,6 +18,7 @@
package org.apache.doris.qe;
import org.apache.doris.analysis.StatementBase;
import org.apache.doris.analysis.UserIdentity;
import org.apache.doris.catalog.Catalog;
import org.apache.doris.catalog.Column;
import org.apache.doris.catalog.Database;
@ -351,9 +352,23 @@ public class ConnectProcessor {
if (request.isSetEnableStrictMode()) {
ctx.getSessionVariable().setEnableInsertStrict(request.enableStrictMode);
}
if (request.isSetCurrent_user_ident()) {
UserIdentity currentUserIdentity = UserIdentity.fromThrift(request.getCurrent_user_ident());
ctx.setCurrentUserIdentity(currentUserIdentity);
}
ctx.setThreadLocalInfo();
if (ctx.getCurrentUserIdentity() == null) {
// if we upgrade Master FE first, the request from old FE does not set "current_user_ident".
// so ctx.getCurrentUserIdentity() will get null, and causing NullPointerException after using it.
// return error directly.
TMasterOpResult result = new TMasterOpResult();
ctx.getState().setError("Missing current user identity. You need to upgrade this Frontend to the same version as Master Frontend.");
result.setMaxJournalId(Catalog.getInstance().getMaxJournalId().longValue());
result.setPacket(getResultPacket());
return result;
}
StmtExecutor executor = null;
try {
executor = new StmtExecutor(ctx, request.getSql(), true);
@ -361,7 +376,7 @@ public class ConnectProcessor {
} catch (IOException e) {
// Client failed.
LOG.warn("Process one query failed because IOException: ", e);
ctx.getState().setError("Palo process failed");
ctx.getState().setError("Doris process failed: " + e.getMessage());
} catch (Throwable e) {
// Catch all throwable.
// If reach here, maybe palo bug.

1
fe/src/main/java/org/apache/doris/qe/MasterOpExecutor.java
View File

@ -85,6 +85,7 @@ public class MasterOpExecutor {
params.setStmt_id(ctx.getStmtId());
params.setLoadMemLimit(ctx.getSessionVariable().getLoadMemLimit());
params.setEnableStrictMode(ctx.getSessionVariable().getEnableInsertStrict());
params.setCurrent_user_ident(ctx.getCurrentUserIdentity().toThrift());
LOG.info("Forward statement {} to Master {}", ctx.getStmtId(), thriftAddress);

2
gensrc/thrift/FrontendService.thrift
View File

@ -419,6 +419,8 @@ struct TMasterOpRequest {
11: optional i64 sqlMode
12: optional i64 loadMemLimit
13: optional bool enableStrictMode
// this can replace the "user" field
14: optional Types.TUserIdentity current_user_ident
}
struct TColumnDefinition {