From aec447a206a34909a0becd6098d12b268270a4c3 Mon Sep 17 00:00:00 2001 From: Sumit Bose Date: Feb 21 2018 09:14:38 +0000 Subject: sysdb: add sysdb_attrs_add_base64_blob() Reviewed-by: Jakub Hrozek (cherry picked from commit 6cdeb0923c16e3fafe21aaadca6dac1d71474c31) --- diff --git a/src/db/sysdb.c b/src/db/sysdb.c index d4366a3..8552d77 100644 --- a/src/db/sysdb.c +++ b/src/db/sysdb.c @@ -23,6 +23,7 @@ #include "util/util.h" #include "util/strtonum.h" #include "util/sss_utf8.h" +#include "util/crypto/sss_crypto.h" #include "db/sysdb_private.h" #include "confdb/confdb.h" #include @@ -634,6 +635,27 @@ int sysdb_attrs_add_mem(struct sysdb_attrs *attrs, const char *name, return sysdb_attrs_add_val(attrs, name, &v); } +int sysdb_attrs_add_base64_blob(struct sysdb_attrs *attrs, const char *name, + const char *base64_str) +{ + struct ldb_val v; + int ret; + + if (base64_str == NULL) { + return EINVAL; + } + + v.data = sss_base64_decode(attrs, base64_str, &v.length); + if (v.data == NULL) { + DEBUG(SSSDBG_OP_FAILURE, "sss_base64_decode failed.\n"); + return ENOMEM; + } + + ret = sysdb_attrs_add_val(attrs, name, &v); + talloc_free(v.data); + return ret; +} + int sysdb_attrs_add_bool(struct sysdb_attrs *attrs, const char *name, bool value) { diff --git a/src/db/sysdb.h b/src/db/sysdb.h index 0413d2a..732ca14 100644 --- a/src/db/sysdb.h +++ b/src/db/sysdb.h @@ -323,6 +323,8 @@ int sysdb_attrs_add_lower_case_string(struct sysdb_attrs *attrs, bool safe, const char *name, const char *str); int sysdb_attrs_add_mem(struct sysdb_attrs *attrs, const char *name, const void *mem, size_t size); +int sysdb_attrs_add_base64_blob(struct sysdb_attrs *attrs, const char *name, + const char *base64_str); int sysdb_attrs_add_bool(struct sysdb_attrs *attrs, const char *name, bool value); int sysdb_attrs_add_long(struct sysdb_attrs *attrs, diff --git a/src/tests/cmocka/test_sysdb_utils.c b/src/tests/cmocka/test_sysdb_utils.c index b791f14..570fe02 100644 --- a/src/tests/cmocka/test_sysdb_utils.c +++ b/src/tests/cmocka/test_sysdb_utils.c @@ -103,6 +103,41 @@ static void test_sysdb_handle_original_uuid(void **state) talloc_free(dest_attrs); } +#define TEST_BASE64_ABC "YWJj" +#define TEST_BASE64_123 "AQID" +static void test_sysdb_attrs_add_base64_blob(void **state) +{ + struct sysdb_attrs *attrs; + struct ldb_message_element *el; + char zero[] = { '\1', '\2', '\3' }; + int ret; + + attrs = sysdb_new_attrs(NULL); + assert_non_null(attrs); + + ret = sysdb_attrs_add_base64_blob(attrs, "testAttrABC", TEST_BASE64_ABC); + assert_int_equal(ret, EOK); + + ret = sysdb_attrs_add_base64_blob(attrs, "testAttr000", TEST_BASE64_123); + assert_int_equal(ret, EOK); + + ret = sysdb_attrs_get_el(attrs, "testAttrABC", &el); + assert_int_equal(ret, EOK); + assert_int_equal(el->num_values, 1); + assert_non_null(el->values); + assert_non_null(el->values[0].data); + assert_int_equal(el->values[0].length, 3); + assert_memory_equal(el->values[0].data, "abc", 3); + + ret = sysdb_attrs_get_el(attrs, "testAttr000", &el); + assert_int_equal(ret, EOK); + assert_int_equal(el->num_values, 1); + assert_non_null(el->values); + assert_non_null(el->values[0].data); + assert_int_equal(el->values[0].length, 3); + assert_memory_equal(el->values[0].data, zero, 3); +} + int main(int argc, const char *argv[]) { int rv; @@ -116,6 +151,7 @@ int main(int argc, const char *argv[]) const struct CMUnitTest tests[] = { cmocka_unit_test(test_sysdb_handle_original_uuid), + cmocka_unit_test(test_sysdb_attrs_add_base64_blob), }; /* Set debug level to invalid value so we can deside if -d 0 was used. */