Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HDFS-11730: libhdfs++: RpcConnection should handle authorization error call id. Contributed by James Clampffer

This commit is contained in:
James 2017-05-03 12:03:29 -04:00 committed by James Clampffer
parent fdb88eb57e
commit b584e34f2f
3 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/include/hdfspp/status.h
View File

@ -44,6 +44,8 @@ class Status {
static Status Error(const char *error_message); static Status Error(const char *error_message);
static Status AuthenticationFailed(); static Status AuthenticationFailed();
static Status AuthenticationFailed(const char *msg); static Status AuthenticationFailed(const char *msg);
static Status AuthorizationFailed();
static Status AuthorizationFailed(const char *msg);
static Status Canceled(); static Status Canceled();
static Status PathNotFound(const char *msg); static Status PathNotFound(const char *msg);
static Status InvalidOffset(const char *msg); static Status InvalidOffset(const char *msg);

13
hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/lib/common/status.cc
View File

@ -143,6 +143,19 @@ Status Status::AuthenticationFailed(const char *msg) {
return Status(kAuthenticationFailed, formatted.c_str()); return Status(kAuthenticationFailed, formatted.c_str());
} }
Status Status::AuthorizationFailed() {
return Status::AuthorizationFailed(nullptr);
}
Status Status::AuthorizationFailed(const char *msg) {
std::string formatted = "AuthorizationFailed";
if(msg) {
formatted += ": ";
formatted += msg;
}
return Status(kPermissionDenied, formatted.c_str());
}
Status Status::Canceled() { Status Status::Canceled() {
return Status(kOperationCanceled, "Operation canceled"); return Status(kOperationCanceled, "Operation canceled");
} }

4
hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/lib/rpc/rpc_connection_impl.cc
View File

@ -175,9 +175,11 @@ Status RpcConnection::HandleRpcResponse(std::shared_ptr<Response> response) {
auto req = RemoveFromRunningQueue(h.callid()); auto req = RemoveFromRunningQueue(h.callid());
if (!req) { if (!req) {
LOG_WARN(kRPC, << "RPC response with Unknown call id " << h.callid()); LOG_WARN(kRPC, << "RPC response with Unknown call id " << (int32_t)h.callid());
if((int32_t)h.callid() == RpcEngine::kCallIdSasl) { if((int32_t)h.callid() == RpcEngine::kCallIdSasl) {
return Status::AuthenticationFailed("You have an unsecured client connecting to a secured server"); return Status::AuthenticationFailed("You have an unsecured client connecting to a secured server");
} else if((int32_t)h.callid() == RpcEngine::kCallIdAuthorizationFailed) {
return Status::AuthorizationFailed("RPC call id indicates an authorization failure");
} else { } else {
return Status::Error("Rpc response with unknown call id"); return Status::Error("Rpc response with unknown call id");
} }