>From 7efcdf55f881ecba2159431651f25aa55ee52240 Mon Sep 17 00:00:00 2001 From: Jakub Hrozek Date: Fri, 6 Nov 2015 15:45:19 +0100 Subject: [PATCH 2/3] DP: Check callback messages for valid UTF-8 https://fedorahosted.org/sssd/ticket/2861 Messages passed from Data Provider to responder must be valid UTF-8 strings. Because providers might not be completely under our control, we need to check if the messages we receive are valid UTF-8 and if they are not, use a fallback. --- src/providers/data_provider_be.c | 46 ++++++++++++++++++++++++++-------------- 1 file changed, 30 insertions(+), 16 deletions(-) diff --git a/src/providers/data_provider_be.c b/src/providers/data_provider_be.c index 5f299a7209d3d1f1e83c625ae9db6d731a5cf5ab..a9b33b5c6a047f21ebc779fd6a73a109ceadec9e 100644 --- a/src/providers/data_provider_be.c +++ b/src/providers/data_provider_be.c @@ -37,6 +37,7 @@ #include #include "util/util.h" +#include "util/sss_utf8.h" #include "confdb/confdb.h" #include "db/sysdb.h" #include "sbus/sssd_dbus.h" @@ -132,6 +133,28 @@ 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) +{ + bool ok; + + if (msg_in == NULL) { + /* No custom error, just use default */ + return dp_err_to_string(dp_err_type); + } + + ok = sss_utf8_check((const uint8_t *) msg_in, + strlen(msg_in)); + if (!ok) { + DEBUG(SSSDBG_MINOR_FAILURE, + "Back end message [%s] contains invalid non-UTF8 character, " \ + "using default\n", msg_in); + return dp_err_to_string(dp_err_type); + } + + return msg_in; +} + #define REQ_PHASE_ACCESS 0 #define REQ_PHASE_SELINUX 1 @@ -658,11 +681,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 +816,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 +1562,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 +1909,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, -- 2.4.3