summaryrefslogtreecommitdiffstats
path: root/src/providers
diff options
context:
space:
mode:
authorPavel Reichl <preichl@redhat.com>2015-08-04 09:25:08 -0400
committerJakub Hrozek <jhrozek@redhat.com>2015-08-17 15:10:14 +0200
commite2e334b2f51118cb14c7391c4e4e44ff247ef638 (patch)
treed8d8ff0540185feb43ffe94bdad2b62c405e702b /src/providers
parent9da121c08b785b56733a11fa46e14c708dda62e9 (diff)
downloadsssd-e2e334b2f51118cb14c7391c4e4e44ff247ef638.tar.gz
sssd-e2e334b2f51118cb14c7391c4e4e44ff247ef638.tar.xz
sssd-e2e334b2f51118cb14c7391c4e4e44ff247ef638.zip
LDAP: sanitize group name when used in filter
cleanup_groups() uses DN of group in filter for ldbsearch. But the name might contain characters with special meaning for filtering like - "*()\/" Resolves: https://fedorahosted.org/sssd/ticket/2744 Reviewed-by: Pavel Březina <pbrezina@redhat.com>
Diffstat (limited to 'src/providers')
-rw-r--r--src/providers/ldap/ldap_id_cleanup.c88
1 files changed, 83 insertions, 5 deletions
diff --git a/src/providers/ldap/ldap_id_cleanup.c b/src/providers/ldap/ldap_id_cleanup.c
index be9496a2e..e44e48549 100644
--- a/src/providers/ldap/ldap_id_cleanup.c
+++ b/src/providers/ldap/ldap_id_cleanup.c
@@ -32,6 +32,12 @@
#include "providers/ldap/ldap_common.h"
#include "providers/ldap/sdap_async.h"
+static errno_t
+get_group_dn_with_filter_sanitized_name(TALLOC_CTX *mem_ctx,
+ struct sss_domain_info *domain,
+ const char *group_name,
+ const char **_group_dn);
+
/* ==Cleanup-Task========================================================= */
struct ldap_id_cleanup_ctx {
struct sdap_id_ctx *ctx;
@@ -318,7 +324,6 @@ static int cleanup_groups(TALLOC_CTX *memctx,
const char *attrs[] = { SYSDB_NAME, SYSDB_GIDNUM, NULL };
time_t now = time(NULL);
char *subfilter;
- const char *dn;
gid_t gid;
struct ldb_message **msgs;
size_t count;
@@ -359,10 +364,25 @@ static int cleanup_groups(TALLOC_CTX *memctx,
}
for (i = 0; i < count; i++) {
- dn = ldb_dn_get_linearized(msgs[i]->dn);
- if (!dn) {
- DEBUG(SSSDBG_CRIT_FAILURE, "Cannot linearize DN!\n");
- ret = EFAULT;
+ const char *dn;
+ const char *group_name;
+
+ group_name = ldb_msg_find_attr_as_string(msgs[i], SYSDB_NAME, NULL);
+ if (group_name == NULL) {
+ DEBUG(SSSDBG_MINOR_FAILURE, "No '%s' attribute.\n", SYSDB_NAME);
+ ret = EINVAL;
+ goto done;
+ }
+
+ /* DN might contain characters that need not to be sanitized in DN,
+ * but need to be sanitized in filter - e.g. '(', ')'
+ */
+ ret = get_group_dn_with_filter_sanitized_name(tmpctx, domain, group_name,
+ &dn);
+ if (ret != EOK) {
+ DEBUG(SSSDBG_MINOR_FAILURE,
+ "get_group_dn_with_filter_sanitized_name failed: %s:[%d].\n",
+ sss_strerror(ret), ret);
goto done;
}
@@ -429,3 +449,61 @@ done:
talloc_zfree(tmpctx);
return ret;
}
+
+static errno_t
+get_group_dn_with_filter_sanitized_name(TALLOC_CTX *mem_ctx,
+ struct sss_domain_info *domain,
+ const char *group_name,
+ const char **_group_dn)
+{
+ errno_t ret;
+ TALLOC_CTX *tmp_ctx;
+ const char *dn;
+ const char *sanitized_dn;
+ char *sanitized_group_name;
+ struct ldb_dn *group_base_dn;
+
+ tmp_ctx = talloc_new(NULL);
+ if (tmp_ctx == NULL) {
+ ret = ENOMEM;
+ }
+
+ /* sanitize group name */
+ ret = sss_filter_sanitize(tmp_ctx, group_name, &sanitized_group_name);
+ if (ret != EOK) {
+ DEBUG(SSSDBG_MINOR_FAILURE, "sss_filter_sanitize failed: %s:[%d]\n",
+ sss_strerror(ret), ret);
+ goto done;
+ }
+
+ /* group base dn */
+ group_base_dn = sysdb_group_base_dn(tmp_ctx, domain);
+ if (group_base_dn == NULL) {
+ DEBUG(SSSDBG_MINOR_FAILURE, "Cannot get group base DN!\n");
+ ret = EFAULT;
+ goto done;
+ }
+
+ dn = ldb_dn_get_linearized(group_base_dn);
+ if (dn == NULL) {
+ DEBUG(SSSDBG_MINOR_FAILURE, "Cannot linearize DN!\n");
+ ret = EFAULT;
+ goto done;
+ }
+
+ /* complete group DN with filter sanitized name */
+ sanitized_dn = talloc_asprintf(tmp_ctx, "%s=%s,%s",
+ SYSDB_NAME, sanitized_group_name, dn);
+ if (sanitized_dn == NULL) {
+ DEBUG(SSSDBG_MINOR_FAILURE, "Failed to build DN\n");
+ ret = ENOMEM;
+ goto done;
+ }
+
+ ret = EOK;
+ *_group_dn = talloc_steal(mem_ctx, sanitized_dn);
+
+done:
+ talloc_free(tmp_ctx);
+ return ret;
+}