diff options
| -rw-r--r-- | Makefile.am | 6 | ||||
| -rw-r--r-- | src/external/libunistring.m4 | 5 | ||||
| -rw-r--r-- | src/responder/common/responder.h | 2 | ||||
| -rw-r--r-- | src/responder/common/responder_common.c | 9 | ||||
| -rw-r--r-- | src/responder/nss/nsssrv_cmd.c | 21 | ||||
| -rw-r--r-- | src/responder/nss/nsssrv_netgroup.c | 7 | ||||
| -rw-r--r-- | src/responder/pam/pamsrv_cmd.c | 5 |
7 files changed, 53 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index 58c792825..a423ace39 100644 --- a/Makefile.am +++ b/Makefile.am @@ -412,7 +412,8 @@ sssd_nss_SOURCES = \ sssd_nss_LDADD = \ $(TDB_LIBS) \ $(SSSD_LIBS) \ - libsss_util.la + libsss_util.la \ + -lunistring sssd_pam_SOURCES = \ src/responder/pam/pam_LOCAL_domain.c \ @@ -423,7 +424,8 @@ sssd_pam_SOURCES = \ sssd_pam_LDADD = \ $(TDB_LIBS) \ $(SSSD_LIBS) \ - libsss_util.la + libsss_util.la \ + -lunistring sssd_be_SOURCES = \ src/providers/data_provider_be.c \ diff --git a/src/external/libunistring.m4 b/src/external/libunistring.m4 index 69c54fe3f..18ea3e62a 100644 --- a/src/external/libunistring.m4 +++ b/src/external/libunistring.m4 @@ -6,4 +6,9 @@ AC_CHECK_HEADERS(unistr.h, AC_CHECK_HEADERS(unicase.h, [AC_CHECK_LIB([unistring], [u8_casecmp], [ UNISTRING_LIBS="-lunistring" ], [AC_MSG_ERROR([No usable libunistring library found])])], [AC_MSG_ERROR([libunistring header files are not installed])] +) + +AC_CHECK_HEADERS(unistr.h, + [AC_CHECK_LIB([unistring], [u8_check], [ UNISTRING_LIBS="-lunistring" ], [AC_MSG_ERROR([No usable libunistring library found])])], + [AC_MSG_ERROR([libunistring header files are not installed])] )
\ No newline at end of file diff --git a/src/responder/common/responder.h b/src/responder/common/responder.h index 321cedda8..1b39fdd5b 100644 --- a/src/responder/common/responder.h +++ b/src/responder/common/responder.h @@ -174,4 +174,6 @@ int sss_dp_send_acct_req(struct resp_ctx *rctx, TALLOC_CTX *callback_memctx, int responder_logrotate(DBusMessage *message, struct sbus_connection *conn); +bool sss_utf8_check(const uint8_t *s, size_t n); + #endif /* __SSS_RESPONDER_H__ */ diff --git a/src/responder/common/responder_common.c b/src/responder/common/responder_common.c index 719f24647..f97ec06fd 100644 --- a/src/responder/common/responder_common.c +++ b/src/responder/common/responder_common.c @@ -32,6 +32,7 @@ #include <sys/time.h> #include <errno.h> #include <popt.h> +#include <unistr.h> #include "util/util.h" #include "db/sysdb.h" #include "confdb/confdb.h" @@ -627,3 +628,11 @@ int responder_logrotate(DBusMessage *message, return monitor_common_pong(message, conn); } + +bool sss_utf8_check(const uint8_t *s, size_t n) +{ + if (u8_check(s, n) == NULL) { + return true; + } + return false; +} diff --git a/src/responder/nss/nsssrv_cmd.c b/src/responder/nss/nsssrv_cmd.c index 8f4cb4401..a37bd7664 100644 --- a/src/responder/nss/nsssrv_cmd.c +++ b/src/responder/nss/nsssrv_cmd.c @@ -873,6 +873,13 @@ static int nss_cmd_getpwnam(struct cli_ctx *cctx) ret = EINVAL; goto done; } + + /* If the body isn't valid UTF-8, fail */ + if (!sss_utf8_check(body, blen)) { + ret = EINVAL; + goto done; + } + rawname = (const char *)body; domname = NULL; @@ -2140,6 +2147,13 @@ static int nss_cmd_getgrnam(struct cli_ctx *cctx) ret = EINVAL; goto done; } + + /* If the body isn't valid UTF-8, fail */ + if (!sss_utf8_check(body, blen)) { + ret = EINVAL; + goto done; + } + rawname = (const char *)body; domname = NULL; @@ -3180,6 +3194,13 @@ static int nss_cmd_initgroups(struct cli_ctx *cctx) ret = EINVAL; goto done; } + + /* If the body isn't valid UTF-8, fail */ + if (!sss_utf8_check(body, blen)) { + ret = EINVAL; + goto done; + } + rawname = (const char *)body; domname = NULL; diff --git a/src/responder/nss/nsssrv_netgroup.c b/src/responder/nss/nsssrv_netgroup.c index cd0ba723a..7d5665d41 100644 --- a/src/responder/nss/nsssrv_netgroup.c +++ b/src/responder/nss/nsssrv_netgroup.c @@ -113,6 +113,13 @@ int nss_cmd_setnetgrent(struct cli_ctx *client) ret = EINVAL; goto done; } + + /* If the body isn't valid UTF-8, fail */ + if (!sss_utf8_check(body, blen)) { + ret = EINVAL; + goto done; + } + rawname = (const char *)body; req = setnetgrent_send(cmdctx, rawname, cmdctx); diff --git a/src/responder/pam/pamsrv_cmd.c b/src/responder/pam/pamsrv_cmd.c index 1d2a2a58e..18ba3fdf3 100644 --- a/src/responder/pam/pamsrv_cmd.c +++ b/src/responder/pam/pamsrv_cmd.c @@ -70,6 +70,11 @@ static int extract_string(char **var, size_t size, uint8_t *body, size_t blen, if (str[size-1]!='\0') return EINVAL; + /* If the string isn't valid UTF-8, fail */ + if (!sss_utf8_check(str, size)) { + return EINVAL; + } + *c += size; *var = (char *) str; |