Allow flat name in the FQname format

https://fedorahosted.org/sssd/ticket/1648

Adds another expansion in the printf format that allows the user to use
the domain flat name in the format.

2 files changed, 423 insertions, 5 deletions

diff --git a/src/tests/cmocka/test_fqnames.c b/src/tests/cmocka/test_fqnames.c
new file mode 100644
index 00000000..e0735083
--- /dev/null
+++ b/src/tests/cmocka/test_fqnames.c
@@ -0,0 +1,287 @@
+/*
+    Authors:
+        Jakub Hrozek <jhrozek@redhat.com>
+
+    Copyright (C) 2013 Red Hat
+
+    SSSD tests: Fully Qualified Names Tests
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include <popt.h>
+
+#include "tests/cmocka/common_mock.h"
+
+#define NAME        "name"
+#define DOMNAME     "domname"
+#define FLATNAME    "flatname"
+
+struct fqdn_test_ctx {
+    struct sss_domain_info *dom;
+
+    struct sss_names_ctx *nctx;
+};
+
+void fqdn_test_setup(void **state)
+{
+    struct fqdn_test_ctx *test_ctx;
+
+    assert_true(leak_check_setup());
+
+    test_ctx = talloc_zero(global_talloc_context, struct fqdn_test_ctx);
+    assert_non_null(test_ctx);
+
+    test_ctx->dom = talloc_zero(test_ctx, struct sss_domain_info);
+    assert_non_null(test_ctx->dom);
+    test_ctx->dom->name = discard_const(DOMNAME);
+    test_ctx->dom->flat_name = discard_const(FLATNAME);
+
+    check_leaks_push(test_ctx);
+    *state = test_ctx;
+}
+
+void fqdn_test_teardown(void **state)
+{
+    struct fqdn_test_ctx *test_ctx = talloc_get_type(*state,
+                                                     struct fqdn_test_ctx);
+
+    if (test_ctx == NULL) {
+        DEBUG(SSSDBG_CRIT_FAILURE, ("Type mismatch\n"));
+        return;
+    }
+
+    assert_true(check_leaks_pop(test_ctx) == true);
+    talloc_free(test_ctx);
+    assert_true(leak_check_teardown());
+}
+
+void test_default(void **state)
+{
+    struct fqdn_test_ctx *test_ctx = talloc_get_type(*state,
+                                                     struct fqdn_test_ctx);
+    errno_t ret;
+
+    char *fqdn;
+    const int fqdn_size = 255;
+    char fqdn_s[fqdn_size];
+    size_t domsize;
+
+    if (test_ctx == NULL) {
+        DEBUG(SSSDBG_CRIT_FAILURE, ("Type mismatch\n"));
+        return;
+    }
+
+    ret = sss_names_init_from_args(test_ctx,
+                                   "(?P<name>[^@]+)@?(?P<domain>[^@]*$)",
+                                   "%1$s@%2$s", &test_ctx->nctx);
+    assert_int_equal(ret, EOK);
+    assert_int_equal(test_ctx->nctx->fq_flags, FQ_FMT_NAME | FQ_FMT_DOMAIN);
+
+    fqdn = sss_tc_fqname(test_ctx, test_ctx->nctx, test_ctx->dom, NAME);
+    assert_non_null(fqdn);
+    assert_string_equal(fqdn, NAME"@"DOMNAME);
+    talloc_free(fqdn);
+
+    ret = sss_fqname(fqdn_s, fqdn_size, test_ctx->nctx, test_ctx->dom, NAME);
+    assert_int_equal(ret + 1, sizeof(NAME"@"DOMNAME));
+    assert_string_equal(fqdn_s, NAME"@"DOMNAME);
+
+    domsize = sss_fqdom_len(test_ctx->nctx, test_ctx->dom);
+    assert_int_equal(domsize, sizeof(DOMNAME)-1);
+
+    talloc_free(test_ctx->nctx);
+}
+
+void test_all(void **state)
+{
+    struct fqdn_test_ctx *test_ctx = talloc_get_type(*state,
+                                                     struct fqdn_test_ctx);
+    errno_t ret;
+
+    char *fqdn;
+    const int fqdn_size = 255;
+    char fqdn_s[fqdn_size];
+    size_t domsize;
+
+    if (test_ctx == NULL) {
+        DEBUG(SSSDBG_CRIT_FAILURE, ("Type mismatch\n"));
+        return;
+    }
+
+    ret = sss_names_init_from_args(test_ctx,
+                                   "(?P<name>[^@]+)@?(?P<domain>[^@]*$)",
+                                   "%1$s@%2$s@%3$s", &test_ctx->nctx);
+    assert_int_equal(ret, EOK);
+    assert_int_equal(test_ctx->nctx->fq_flags,
+                     FQ_FMT_NAME | FQ_FMT_DOMAIN | FQ_FMT_FLAT_NAME);
+
+    fqdn = sss_tc_fqname(test_ctx, test_ctx->nctx, test_ctx->dom, NAME);
+    assert_non_null(fqdn);
+    assert_string_equal(fqdn, NAME"@"DOMNAME"@"FLATNAME);
+    talloc_free(fqdn);
+
+    ret = sss_fqname(fqdn_s, fqdn_size, test_ctx->nctx, test_ctx->dom, NAME);
+    assert_int_equal(ret + 1, sizeof(NAME"@"DOMNAME"@"FLATNAME));
+    assert_string_equal(fqdn_s, NAME"@"DOMNAME"@"FLATNAME);
+
+    domsize = sss_fqdom_len(test_ctx->nctx, test_ctx->dom);
+    assert_int_equal(domsize, sizeof(DOMNAME)-1 + sizeof(FLATNAME)-1);
+
+    talloc_free(test_ctx->nctx);
+}
+
+void test_flat(void **state)
+{
+    struct fqdn_test_ctx *test_ctx = talloc_get_type(*state,
+                                                     struct fqdn_test_ctx);
+    errno_t ret;
+
+    char *fqdn;
+    const int fqdn_size = 255;
+    char fqdn_s[fqdn_size];
+    size_t domsize;
+
+    if (test_ctx == NULL) {
+        DEBUG(SSSDBG_CRIT_FAILURE, ("Type mismatch\n"));
+        return;
+    }
+
+    ret = sss_names_init_from_args(test_ctx,
+                                   "(?P<name>[^@]+)@?(?P<domain>[^@]*$)",
+                                   "%1$s@%3$s", &test_ctx->nctx);
+    assert_int_equal(ret, EOK);
+    assert_int_equal(test_ctx->nctx->fq_flags, FQ_FMT_NAME | FQ_FMT_FLAT_NAME);
+
+    fqdn = sss_tc_fqname(test_ctx, test_ctx->nctx, test_ctx->dom, NAME);
+    assert_non_null(fqdn);
+    assert_string_equal(fqdn, NAME"@"FLATNAME);
+    talloc_free(fqdn);
+
+    ret = sss_fqname(fqdn_s, fqdn_size, test_ctx->nctx, test_ctx->dom, NAME);
+    assert_int_equal(ret + 1, sizeof(NAME"@"FLATNAME));
+    assert_string_equal(fqdn_s, NAME"@"FLATNAME);
+
+    domsize = sss_fqdom_len(test_ctx->nctx, test_ctx->dom);
+    assert_int_equal(domsize, sizeof(FLATNAME)-1);
+
+    talloc_free(test_ctx->nctx);
+}
+
+void test_flat_fallback(void **state)
+{
+    struct fqdn_test_ctx *test_ctx = talloc_get_type(*state,
+                                                     struct fqdn_test_ctx);
+    errno_t ret;
+
+    char *fqdn;
+    const int fqdn_size = 255;
+    char fqdn_s[fqdn_size];
+    size_t domsize;
+
+    if (test_ctx == NULL) {
+        DEBUG(SSSDBG_CRIT_FAILURE, ("Type mismatch\n"));
+        return;
+    }
+
+    ret = sss_names_init_from_args(test_ctx,
+                                   "(?P<name>[^@]+)@?(?P<domain>[^@]*$)",
+                                   "%1$s@%3$s", &test_ctx->nctx);
+    assert_int_equal(ret, EOK);
+    assert_int_equal(test_ctx->nctx->fq_flags, FQ_FMT_NAME | FQ_FMT_FLAT_NAME);
+
+    test_ctx->dom->flat_name = NULL;
+
+    /* If flat name is requested but does not exist, the code falls back to domain
+     * name
+     */
+    fqdn = sss_tc_fqname(test_ctx, test_ctx->nctx, test_ctx->dom, NAME);
+    assert_non_null(fqdn);
+    assert_string_equal(fqdn, NAME"@"DOMNAME);
+    talloc_free(fqdn);
+
+    ret = sss_fqname(fqdn_s, fqdn_size, test_ctx->nctx, test_ctx->dom, NAME);
+    assert_int_equal(ret + 1, sizeof(NAME"@"DOMNAME));
+    assert_string_equal(fqdn_s, NAME"@"DOMNAME);
+
+    domsize = sss_fqdom_len(test_ctx->nctx, test_ctx->dom);
+    assert_int_equal(domsize, sizeof(DOMNAME)-1);
+
+    talloc_free(test_ctx->nctx);
+}
+
+void test_init_nouser(void **state)
+{
+    struct fqdn_test_ctx *test_ctx = talloc_get_type(*state,
+                                                     struct fqdn_test_ctx);
+    errno_t ret;
+
+    if (test_ctx == NULL) {
+        DEBUG(SSSDBG_CRIT_FAILURE, ("Type mismatch\n"));
+        return;
+    }
+
+    ret = sss_names_init_from_args(test_ctx,
+                                   "(?P<name>[^@]+)@?(?P<domain>[^@]*$)",
+                                   "%2$s@%3$s", &test_ctx->nctx);
+    /* Initialization with no user name must fail */
+    assert_int_not_equal(ret, EOK);
+}
+
+int main(int argc, const char *argv[])
+{
+    poptContext pc;
+    int opt;
+    struct poptOption long_options[] = {
+        POPT_AUTOHELP
+        SSSD_DEBUG_OPTS
+        POPT_TABLEEND
+    };
+
+    const UnitTest tests[] = {
+        unit_test_setup_teardown(test_default,
+                                 fqdn_test_setup, fqdn_test_teardown),
+        unit_test_setup_teardown(test_all,
+                                 fqdn_test_setup, fqdn_test_teardown),
+        unit_test_setup_teardown(test_flat,
+                                 fqdn_test_setup, fqdn_test_teardown),
+        unit_test_setup_teardown(test_flat_fallback,
+                                 fqdn_test_setup, fqdn_test_teardown),
+        unit_test_setup_teardown(test_init_nouser,
+                                 fqdn_test_setup, fqdn_test_teardown),
+    };
+
+    /* Set debug level to invalid value so we can deside if -d 0 was used. */
+    debug_level = SSSDBG_INVALID;
+
+    pc = poptGetContext(argv[0], argc, argv, long_options, 0);
+    while((opt = poptGetNextOpt(pc)) != -1) {
+        switch(opt) {
+        default:
+            fprintf(stderr, "\nInvalid option %s: %s\n\n",
+                    poptBadOption(pc, 0), poptStrerror(opt));
+            poptPrintUsage(pc, stderr, 0);
+            return 1;
+        }
+    }
+    poptFreeContext(pc);
+
+    DEBUG_INIT(debug_level);
+
+    /* Even though normally the tests should clean up after themselves
+     * they might not after a failed run. Remove the old db to be sure */
+    tests_set_cwd();
+
+    return run_tests(tests);
+}
diff --git a/src/tests/cmocka/test_nss_srv.c b/src/tests/cmocka/test_nss_srv.c
index 092e6803..e8cc9aae 100644
--- a/src/tests/cmocka/test_nss_srv.c
+++ b/src/tests/cmocka/test_nss_srv.c
@@ -411,14 +411,109 @@ void test_nss_getpwnam_update(void **state)
     assert_string_equal(shell, "/bin/ksh");
 }
 
+/* Check that a FQDN is returned if the domain is FQDN-only and a
+ * FQDN is requested
+ */
+static int test_nss_getpwnam_check_fqdn(uint8_t *body, size_t blen)
+{
+    struct passwd pwd;
+    errno_t ret;
+
+    nss_test_ctx->cctx->rctx->domains[0].fqnames = false;
+
+    ret = parse_user_packet(body, blen, &pwd);
+    assert_int_equal(ret, EOK);
+
+    assert_int_equal(pwd.pw_uid, 124);
+    assert_int_equal(pwd.pw_gid, 457);
+    assert_string_equal(pwd.pw_name, "testuser_fqdn@"TEST_DOM_NAME);
+    assert_string_equal(pwd.pw_shell, "/bin/sh");
+    return EOK;
+}
+
+void test_nss_getpwnam_fqdn(void **state)
+{
+    errno_t ret;
+
+    /* Prime the cache with a valid user */
+    ret = sysdb_add_user(nss_test_ctx->tctx->sysdb,
+                         nss_test_ctx->tctx->dom,
+                         "testuser_fqdn", 124, 457, "test user",
+                         "/home/testuser", "/bin/sh", NULL,
+                         NULL, 300, 0);
+    assert_int_equal(ret, EOK);
+
+    mock_input_user("testuser_fqdn@"TEST_DOM_NAME);
+    will_return(__wrap_sss_packet_get_cmd, SSS_NSS_GETPWNAM);
+    mock_fill_user();
+
+    /* Query for that user, call a callback when command finishes */
+    set_cmd_cb(test_nss_getpwnam_check_fqdn);
+    nss_test_ctx->cctx->rctx->domains[0].fqnames = true;
+    ret = sss_cmd_execute(nss_test_ctx->cctx, SSS_NSS_GETPWNAM,
+                          nss_test_ctx->nss_cmds);
+    assert_int_equal(ret, EOK);
+
+    /* Wait until the test finishes with EOK */
+    ret = test_ev_loop(nss_test_ctx->tctx);
+    assert_int_equal(ret, EOK);
+}
+
+/*
+ * Check that FQDN processing is able to handle arbitrarily sized
+ * delimeter
+ */
+static int test_nss_getpwnam_check_resize_fqdn(uint8_t *body, size_t blen)
+{
+    struct passwd pwd;
+    errno_t ret;
+
+    nss_test_ctx->cctx->rctx->domains[0].fqnames = false;
+
+    ret = parse_user_packet(body, blen, &pwd);
+    assert_int_equal(ret, EOK);
+
+    assert_int_equal(pwd.pw_uid, 125);
+    assert_int_equal(pwd.pw_gid, 458);
+    assert_string_equal(pwd.pw_name, "testuser_fqdn_resize@@@@@"TEST_DOM_NAME);
+    assert_string_equal(pwd.pw_shell, "/bin/sh");
+    return EOK;
+}
+
+void test_nss_getpwnam_fqdn_resize(void **state)
+{
+    errno_t ret;
+
+    /* Prime the cache with a valid user */
+    ret = sysdb_add_user(nss_test_ctx->tctx->sysdb,
+                         nss_test_ctx->tctx->dom,
+                         "testuser_fqdn_resize", 125, 458, "test user",
+                         "/home/testuser", "/bin/sh", NULL,
+                         NULL, 300, 0);
+    assert_int_equal(ret, EOK);
+
+    mock_input_user("testuser_fqdn_resize@"TEST_DOM_NAME);
+    will_return(__wrap_sss_packet_get_cmd, SSS_NSS_GETPWNAM);
+    mock_fill_user();
+    will_return(__wrap_sss_packet_get_body, WRAP_CALL_REAL);
+
+    /* Query for that user, call a callback when command finishes */
+    set_cmd_cb(test_nss_getpwnam_check_resize_fqdn);
+    nss_test_ctx->cctx->rctx->domains[0].fqnames = true;
+    ret = sss_cmd_execute(nss_test_ctx->cctx, SSS_NSS_GETPWNAM,
+                          nss_test_ctx->nss_cmds);
+    assert_int_equal(ret, EOK);
+
+    /* Wait until the test finishes with EOK */
+    ret = test_ev_loop(nss_test_ctx->tctx);
+    assert_int_equal(ret, EOK);
+}
+
 /* Testsuite setup and teardown */
-void nss_test_setup(void **state)
+void test_nss_setup(struct sss_test_conf_param params[],
+                    void **state)
 {
     errno_t ret;
-    struct sss_test_conf_param params[] = {
-        { "enumerate", "false" },
-        { NULL, NULL },             /* Sentinel */
-    };
 
     nss_test_ctx = talloc_zero(NULL, struct nss_test_ctx);
     assert_non_null(nss_test_ctx);
@@ -451,6 +546,38 @@ void nss_test_setup(void **state)
     assert_non_null(nss_test_ctx->cctx);
 }
 
+void nss_test_setup(void **state)
+{
+    struct sss_test_conf_param params[] = {
+        { "enumerate", "false" },
+        { NULL, NULL },             /* Sentinel */
+    };
+
+    test_nss_setup(params, state);
+}
+
+void nss_fqdn_test_setup(void **state)
+{
+    struct sss_test_conf_param params[] = {
+        { "enumerate", "false" },
+        { "full_name_format", "%1$s@%2$s" },
+        { NULL, NULL },             /* Sentinel */
+    };
+
+    test_nss_setup(params, state);
+}
+
+void nss_fqdn_resize_test_setup(void **state)
+{
+    struct sss_test_conf_param params[] = {
+        { "enumerate", "false" },
+        { "full_name_format", "%1$s@@@@@%2$s" },
+        { NULL, NULL },             /* Sentinel */
+    };
+
+    test_nss_setup(params, state);
+}
+
 void nss_test_teardown(void **state)
 {
     talloc_free(nss_test_ctx);
@@ -479,6 +606,10 @@ int main(int argc, const char *argv[])
                                  nss_test_setup, nss_test_teardown),
         unit_test_setup_teardown(test_nss_getpwnam_update,
                                  nss_test_setup, nss_test_teardown),
+        unit_test_setup_teardown(test_nss_getpwnam_fqdn,
+                                 nss_fqdn_test_setup, nss_test_teardown),
+        unit_test_setup_teardown(test_nss_getpwnam_fqdn_resize,
+                                 nss_fqdn_resize_test_setup, nss_test_teardown),
     };
 
     /* Set debug level to invalid value so we can deside if -d 0 was used. */