diff options
Diffstat (limited to 'src/providers/data_provider_be.c')
| -rw-r--r-- | src/providers/data_provider_be.c | 43 |
1 files changed, 27 insertions, 16 deletions
diff --git a/src/providers/data_provider_be.c b/src/providers/data_provider_be.c index 0cbfb0f5b..12b048642 100644 --- a/src/providers/data_provider_be.c +++ b/src/providers/data_provider_be.c @@ -132,6 +132,26 @@ static const char *dp_err_to_string(int dp_err_type) return "Unknown Error"; } +static const char *safe_be_req_err_msg(const char *msg_in, + int dp_err_type) +{ + dbus_bool_t ok; + + if (msg_in == NULL) { + /* No custom error, just use default */ + return dp_err_to_string(dp_err_type); + } + + ok = dbus_validate_utf8(msg_in, NULL); + if (!ok) { + DEBUG(SSSDBG_MINOR_FAILURE, + "Back end message is invalid, using default\n"); + return dp_err_to_string(dp_err_type); + } + + return msg_in; +} + #define REQ_PHASE_ACCESS 0 #define REQ_PHASE_SELINUX 1 @@ -658,11 +678,7 @@ static void get_subdomains_callback(struct be_req *req, */ err_maj = dp_err_type; err_min = errnum; - if (errstr) { - err_msg = errstr; - } else { - err_msg = dp_err_to_string(dp_err_type); - } + err_msg = safe_be_req_err_msg(errstr, dp_err_type); sbus_request_return_and_finish(dbus_req, DBUS_TYPE_UINT16, &err_maj, @@ -797,11 +813,7 @@ static void acctinfo_callback(struct be_req *req, err_maj = dp_err_type; err_min = errnum; - if (errstr) { - err_msg = errstr; - } else { - err_msg = dp_err_to_string(dp_err_type); - } + err_msg = safe_be_req_err_msg(errstr, dp_err_type); sbus_request_return_and_finish(dbus_req, DBUS_TYPE_UINT16, &err_maj, @@ -1547,10 +1559,13 @@ static void be_sudo_handler_callback(struct be_req *req, int dp_ret, const char *errstr) { + const char *err_msg = NULL; struct sbus_request *dbus_req; + dbus_req = (struct sbus_request *)(req->pvt); - be_sudo_handler_reply(dbus_req, dp_err, dp_ret, errstr); + err_msg = safe_be_req_err_msg(errstr, dp_err); + be_sudo_handler_reply(dbus_req, dp_err, dp_ret, err_msg); talloc_free(req); } @@ -1891,11 +1906,7 @@ static void be_autofs_handler_callback(struct be_req *req, err_maj = dp_err_type; err_min = errnum; - if (errstr) { - err_msg = errstr; - } else { - err_msg = dp_err_to_string(dp_err_type); - } + err_msg = safe_be_req_err_msg(errstr, dp_err_type); sbus_request_return_and_finish(dbus_req, DBUS_TYPE_UINT16, &err_maj, |