Blame SOURCES/0045-NSS-TESTS-Include-searches-for-non-fqnames-members-o.patch

ecf709
From 510971d2abc3b76799048cd608511d693f5c3edc Mon Sep 17 00:00:00 2001
ecf709
From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= <fidencio@redhat.com>
ecf709
Date: Wed, 1 Mar 2017 08:33:06 +0000
ecf709
Subject: [PATCH 45/54] NSS/TESTS: Include searches for non-fqnames members of
ecf709
 a subdomain
ecf709
MIME-Version: 1.0
ecf709
Content-Type: text/plain; charset=UTF-8
ecf709
Content-Transfer-Encoding: 8bit
ecf709
ecf709
Let's extend the NSS tests in order to also test looking up users, from
ecf709
a subdomain, by their short names (non fully qualified names).
ecf709
ecf709
Related:
ecf709
https://pagure.io/SSSD/sssd/issue/3001
ecf709
ecf709
Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com>
ecf709
ecf709
Reviewed-by: Sumit Bose <sbose@redhat.com>
ecf709
Reviewed-by: Pavel Březina <pbrezina@redhat.com>
ecf709
---
ecf709
 src/tests/cmocka/test_nss_srv.c | 246 ++++++++++++++++++++++++++++++++++------
ecf709
 1 file changed, 211 insertions(+), 35 deletions(-)
ecf709
ecf709
diff --git a/src/tests/cmocka/test_nss_srv.c b/src/tests/cmocka/test_nss_srv.c
ecf709
index b468204fb1729618830513322f0d901c4c801e94..ede72b341b60842ad470df2794aa90ea9797e999 100644
ecf709
--- a/src/tests/cmocka/test_nss_srv.c
ecf709
+++ b/src/tests/cmocka/test_nss_srv.c
ecf709
@@ -1648,16 +1648,29 @@ static int test_nss_getgrnam_members_check_subdom(uint32_t status,
ecf709
     tmp_ctx = talloc_new(nss_test_ctx);
ecf709
     assert_non_null(tmp_ctx);
ecf709
 
ecf709
-    exp_members[0] = sss_tc_fqname(tmp_ctx, nss_test_ctx->subdom->names,
ecf709
-                                   nss_test_ctx->subdom, submember1.pw_name);
ecf709
-    assert_non_null(exp_members[0]);
ecf709
-    exp_members[1] = sss_tc_fqname(tmp_ctx, nss_test_ctx->subdom->names,
ecf709
-                                   nss_test_ctx->subdom, submember2.pw_name);
ecf709
-    assert_non_null(exp_members[1]);
ecf709
+    if (nss_test_ctx->subdom->fqnames) {
ecf709
+        exp_members[0] = sss_tc_fqname(tmp_ctx,
ecf709
+                                       nss_test_ctx->subdom->names,
ecf709
+                                       nss_test_ctx->subdom,
ecf709
+                                       submember1.pw_name);
ecf709
+        assert_non_null(exp_members[0]);
ecf709
 
ecf709
-    expected.gr_name = sss_tc_fqname(tmp_ctx, nss_test_ctx->subdom->names,
ecf709
-                                     nss_test_ctx->subdom, testsubdomgroup.gr_name);
ecf709
-    assert_non_null(expected.gr_name);
ecf709
+        exp_members[1] = sss_tc_fqname(tmp_ctx,
ecf709
+                                       nss_test_ctx->subdom->names,
ecf709
+                                       nss_test_ctx->subdom,
ecf709
+                                       submember2.pw_name);
ecf709
+        assert_non_null(exp_members[1]);
ecf709
+
ecf709
+        expected.gr_name = sss_tc_fqname(tmp_ctx,
ecf709
+                                         nss_test_ctx->subdom->names,
ecf709
+                                         nss_test_ctx->subdom,
ecf709
+                                         testsubdomgroup.gr_name);
ecf709
+        assert_non_null(expected.gr_name);
ecf709
+    } else {
ecf709
+        exp_members[0] = submember1.pw_name;
ecf709
+        exp_members[1] = submember2.pw_name;
ecf709
+        expected.gr_name = testsubdomgroup.gr_name;
ecf709
+    }
ecf709
 
ecf709
     assert_int_equal(status, EOK);
ecf709
 
ecf709
@@ -1692,6 +1705,29 @@ void test_nss_getgrnam_members_subdom(void **state)
ecf709
     assert_int_equal(ret, EOK);
ecf709
 }
ecf709
 
ecf709
+void test_nss_getgrnam_members_subdom_nonfqnames(void **state)
ecf709
+{
ecf709
+    errno_t ret;
ecf709
+
ecf709
+    nss_test_ctx->subdom->fqnames = false;
ecf709
+
ecf709
+    mock_input_user_or_group("testsubdomgroup");
ecf709
+    mock_account_recv_simple();
ecf709
+    will_return(__wrap_sss_packet_get_cmd, SSS_NSS_GETGRNAM);
ecf709
+    will_return_always(__wrap_sss_packet_get_body, WRAP_CALL_REAL);
ecf709
+
ecf709
+    /* Query for that group, call a callback when command finishes */
ecf709
+    set_cmd_cb(test_nss_getgrnam_members_check_subdom);
ecf709
+    ret = sss_cmd_execute(nss_test_ctx->cctx, SSS_NSS_GETGRNAM,
ecf709
+                          nss_test_ctx->nss_cmds);
ecf709
+    assert_int_equal(ret, EOK);
ecf709
+
ecf709
+    /* Wait until the test finishes with EOK */
ecf709
+    ret = test_ev_loop(nss_test_ctx->tctx);
ecf709
+
ecf709
+    assert_int_equal(ret, EOK);
ecf709
+}
ecf709
+
ecf709
 static int test_nss_getgrnam_check_mix_dom(uint32_t status,
ecf709
                                            uint8_t *body, size_t blen)
ecf709
 {
ecf709
@@ -1710,9 +1746,15 @@ static int test_nss_getgrnam_check_mix_dom(uint32_t status,
ecf709
     tmp_ctx = talloc_new(nss_test_ctx);
ecf709
     assert_non_null(tmp_ctx);
ecf709
 
ecf709
-    exp_members[0] = sss_tc_fqname(tmp_ctx, nss_test_ctx->subdom->names,
ecf709
-                                   nss_test_ctx->subdom, submember1.pw_name);
ecf709
-    assert_non_null(exp_members[0]);
ecf709
+    if (nss_test_ctx->subdom->fqnames) {
ecf709
+        exp_members[0] = sss_tc_fqname(tmp_ctx,
ecf709
+                                       nss_test_ctx->subdom->names,
ecf709
+                                       nss_test_ctx->subdom,
ecf709
+                                       submember1.pw_name);
ecf709
+        assert_non_null(exp_members[0]);
ecf709
+    } else {
ecf709
+        exp_members[0] = submember1.pw_name;
ecf709
+    }
ecf709
     exp_members[1] = testmember1.pw_name;
ecf709
     exp_members[2] = testmember2.pw_name;
ecf709
 
ecf709
@@ -1756,6 +1798,35 @@ void test_nss_getgrnam_mix_dom(void **state)
ecf709
     assert_int_equal(ret, EOK);
ecf709
 }
ecf709
 
ecf709
+void test_nss_getgrnam_mix_dom_nonfqnames(void **state)
ecf709
+{
ecf709
+    errno_t ret;
ecf709
+
ecf709
+    nss_test_ctx->subdom->fqnames = false;
ecf709
+
ecf709
+    ret = store_group_member(nss_test_ctx,
ecf709
+                             testgroup_members.gr_name,
ecf709
+                             nss_test_ctx->tctx->dom,
ecf709
+                             submember1.pw_name,
ecf709
+                             nss_test_ctx->subdom,
ecf709
+                             SYSDB_MEMBER_USER);
ecf709
+    assert_int_equal(ret, EOK);
ecf709
+
ecf709
+    mock_input_user_or_group("testgroup_members");
ecf709
+    will_return(__wrap_sss_packet_get_cmd, SSS_NSS_GETGRNAM);
ecf709
+    will_return_always(__wrap_sss_packet_get_body, WRAP_CALL_REAL);
ecf709
+
ecf709
+    /* Query for that group, call a callback when command finishes */
ecf709
+    set_cmd_cb(test_nss_getgrnam_check_mix_dom);
ecf709
+    ret = sss_cmd_execute(nss_test_ctx->cctx, SSS_NSS_GETGRNAM,
ecf709
+                          nss_test_ctx->nss_cmds);
ecf709
+    assert_int_equal(ret, EOK);
ecf709
+
ecf709
+    /* Wait until the test finishes with EOK */
ecf709
+    ret = test_ev_loop(nss_test_ctx->tctx);
ecf709
+    assert_int_equal(ret, EOK);
ecf709
+}
ecf709
+
ecf709
 static int test_nss_getgrnam_check_mix_dom_fqdn(uint32_t status,
ecf709
                                                 uint8_t *body, size_t blen)
ecf709
 {
ecf709
@@ -1773,21 +1844,33 @@ static int test_nss_getgrnam_check_mix_dom_fqdn(uint32_t status,
ecf709
     tmp_ctx = talloc_new(nss_test_ctx);
ecf709
     assert_non_null(tmp_ctx);
ecf709
 
ecf709
-    exp_members[0] = sss_tc_fqname(tmp_ctx, nss_test_ctx->subdom->names,
ecf709
-                                   nss_test_ctx->subdom, submember1.pw_name);
ecf709
-    assert_non_null(exp_members[0]);
ecf709
-    exp_members[1] = sss_tc_fqname(tmp_ctx, nss_test_ctx->tctx->dom->names,
ecf709
-                                   nss_test_ctx->tctx->dom, testmember1.pw_name);
ecf709
-    assert_non_null(exp_members[1]);
ecf709
-    exp_members[2] = sss_tc_fqname(tmp_ctx, nss_test_ctx->tctx->dom->names,
ecf709
-                                   nss_test_ctx->tctx->dom, testmember2.pw_name);
ecf709
-    assert_non_null(exp_members[2]);
ecf709
+    if (nss_test_ctx->subdom->fqnames) {
ecf709
+        exp_members[0] = sss_tc_fqname(tmp_ctx,
ecf709
+                                       nss_test_ctx->subdom->names,
ecf709
+                                       nss_test_ctx->subdom,
ecf709
+                                       submember1.pw_name);
ecf709
+        assert_non_null(exp_members[0]);
ecf709
+    } else {
ecf709
+        exp_members[0] = submember1.pw_name;
ecf709
+    }
ecf709
+    if (nss_test_ctx->tctx->dom->fqnames) {
ecf709
+        exp_members[1] = sss_tc_fqname(tmp_ctx, nss_test_ctx->tctx->dom->names,
ecf709
+                                       nss_test_ctx->tctx->dom, testmember1.pw_name);
ecf709
+        assert_non_null(exp_members[1]);
ecf709
+        exp_members[2] = sss_tc_fqname(tmp_ctx, nss_test_ctx->tctx->dom->names,
ecf709
+                                       nss_test_ctx->tctx->dom, testmember2.pw_name);
ecf709
+        assert_non_null(exp_members[2]);
ecf709
 
ecf709
-    expected.gr_name = sss_tc_fqname(tmp_ctx,
ecf709
-                                     nss_test_ctx->tctx->dom->names,
ecf709
-                                     nss_test_ctx->tctx->dom,
ecf709
-                                     testgroup_members.gr_name);
ecf709
-    assert_non_null(expected.gr_name);
ecf709
+        expected.gr_name = sss_tc_fqname(tmp_ctx,
ecf709
+                                         nss_test_ctx->tctx->dom->names,
ecf709
+                                         nss_test_ctx->tctx->dom,
ecf709
+                                         testgroup_members.gr_name);
ecf709
+        assert_non_null(expected.gr_name);
ecf709
+    } else {
ecf709
+        exp_members[1] = testmember1.pw_name;
ecf709
+        exp_members[2] = testmember2.pw_name;
ecf709
+        expected.gr_name = testgroup_members.gr_name;
ecf709
+    }
ecf709
 
ecf709
     assert_int_equal(status, EOK);
ecf709
 
ecf709
@@ -1834,6 +1917,40 @@ void test_nss_getgrnam_mix_dom_fqdn(void **state)
ecf709
     assert_int_equal(ret, EOK);
ecf709
 }
ecf709
 
ecf709
+void test_nss_getgrnam_mix_dom_fqdn_nonfqnames(void **state)
ecf709
+{
ecf709
+    errno_t ret;
ecf709
+
ecf709
+    ret = store_group_member(nss_test_ctx,
ecf709
+                             testgroup_members.gr_name,
ecf709
+                             nss_test_ctx->tctx->dom,
ecf709
+                             submember1.pw_name,
ecf709
+                             nss_test_ctx->subdom,
ecf709
+                             SYSDB_MEMBER_USER);
ecf709
+    assert_int_equal(ret, EOK);
ecf709
+
ecf709
+    nss_test_ctx->tctx->dom->fqnames = false;
ecf709
+    nss_test_ctx->subdom->fqnames = false;
ecf709
+
ecf709
+
ecf709
+    mock_input_user_or_group("testgroup_members");
ecf709
+    will_return(__wrap_sss_packet_get_cmd, SSS_NSS_GETGRNAM);
ecf709
+    will_return_always(__wrap_sss_packet_get_body, WRAP_CALL_REAL);
ecf709
+
ecf709
+    /* Query for that group, call a callback when command finishes */
ecf709
+    set_cmd_cb(test_nss_getgrnam_check_mix_dom_fqdn);
ecf709
+    ret = sss_cmd_execute(nss_test_ctx->cctx, SSS_NSS_GETGRNAM,
ecf709
+                          nss_test_ctx->nss_cmds);
ecf709
+    assert_int_equal(ret, EOK);
ecf709
+
ecf709
+    /* Wait until the test finishes with EOK */
ecf709
+    ret = test_ev_loop(nss_test_ctx->tctx);
ecf709
+
ecf709
+    /* Restore FQDN settings */
ecf709
+    nss_test_ctx->tctx->dom->fqnames = false;
ecf709
+    assert_int_equal(ret, EOK);
ecf709
+}
ecf709
+
ecf709
 static int test_nss_getgrnam_check_mix_subdom(uint32_t status,
ecf709
                                               uint8_t *body, size_t blen)
ecf709
 {
ecf709
@@ -1851,20 +1968,37 @@ static int test_nss_getgrnam_check_mix_subdom(uint32_t status,
ecf709
     tmp_ctx = talloc_new(nss_test_ctx);
ecf709
     assert_non_null(tmp_ctx);
ecf709
 
ecf709
-    exp_members[0] = sss_tc_fqname(tmp_ctx, nss_test_ctx->subdom->names,
ecf709
-                                   nss_test_ctx->subdom, submember1.pw_name);
ecf709
-    assert_non_null(exp_members[0]);
ecf709
-    exp_members[1] = sss_tc_fqname(tmp_ctx, nss_test_ctx->subdom->names,
ecf709
-                                   nss_test_ctx->subdom, submember2.pw_name);
ecf709
-    assert_non_null(exp_members[1]);
ecf709
+    if (nss_test_ctx->subdom->fqnames) {
ecf709
+        exp_members[0] = sss_tc_fqname(tmp_ctx,
ecf709
+                                       nss_test_ctx->subdom->names,
ecf709
+                                       nss_test_ctx->subdom,
ecf709
+                                       submember1.pw_name);
ecf709
+        assert_non_null(exp_members[0]);
ecf709
+
ecf709
+        exp_members[1] = sss_tc_fqname(tmp_ctx,
ecf709
+                                       nss_test_ctx->subdom->names,
ecf709
+                                       nss_test_ctx->subdom,
ecf709
+                                       submember2.pw_name);
ecf709
+        assert_non_null(exp_members[1]);
ecf709
+    } else {
ecf709
+        exp_members[0] = submember1.pw_name;
ecf709
+        exp_members[1] = submember2.pw_name;
ecf709
+    }
ecf709
+
ecf709
     /* Important: this member is from a non-qualified domain, so his name will
ecf709
      * not be qualified either
ecf709
      */
ecf709
     exp_members[2] = testmember1.pw_name;
ecf709
 
ecf709
-    expected.gr_name = sss_tc_fqname(tmp_ctx, nss_test_ctx->subdom->names,
ecf709
-                                     nss_test_ctx->subdom, testsubdomgroup.gr_name);
ecf709
-    assert_non_null(expected.gr_name);
ecf709
+    if (nss_test_ctx->subdom->fqnames) {
ecf709
+        expected.gr_name = sss_tc_fqname(tmp_ctx,
ecf709
+                                         nss_test_ctx->subdom->names,
ecf709
+                                         nss_test_ctx->subdom,
ecf709
+                                         testsubdomgroup.gr_name);
ecf709
+        assert_non_null(expected.gr_name);
ecf709
+    } else {
ecf709
+        expected.gr_name = testsubdomgroup.gr_name;
ecf709
+    }
ecf709
 
ecf709
     assert_int_equal(status, EOK);
ecf709
 
ecf709
@@ -1906,6 +2040,36 @@ void test_nss_getgrnam_mix_subdom(void **state)
ecf709
     assert_int_equal(ret, EOK);
ecf709
 }
ecf709
 
ecf709
+void test_nss_getgrnam_mix_subdom_nonfqnames(void **state)
ecf709
+{
ecf709
+    errno_t ret;
ecf709
+
ecf709
+    nss_test_ctx->subdom->fqnames = false;
ecf709
+
ecf709
+    ret = store_group_member(nss_test_ctx,
ecf709
+                             testsubdomgroup.gr_name,
ecf709
+                             nss_test_ctx->subdom,
ecf709
+                             testmember1.pw_name,
ecf709
+                             nss_test_ctx->tctx->dom,
ecf709
+                             SYSDB_MEMBER_USER);
ecf709
+    assert_int_equal(ret, EOK);
ecf709
+
ecf709
+    mock_input_user_or_group("testsubdomgroup");
ecf709
+    mock_account_recv_simple();
ecf709
+    will_return(__wrap_sss_packet_get_cmd, SSS_NSS_GETGRNAM);
ecf709
+    will_return_always(__wrap_sss_packet_get_body, WRAP_CALL_REAL);
ecf709
+
ecf709
+    /* Query for that group, call a callback when command finishes */
ecf709
+    set_cmd_cb(test_nss_getgrnam_check_mix_subdom);
ecf709
+    ret = sss_cmd_execute(nss_test_ctx->cctx, SSS_NSS_GETGRNAM,
ecf709
+                          nss_test_ctx->nss_cmds);
ecf709
+    assert_int_equal(ret, EOK);
ecf709
+
ecf709
+    /* Wait until the test finishes with EOK */
ecf709
+    ret = test_ev_loop(nss_test_ctx->tctx);
ecf709
+    assert_int_equal(ret, EOK);
ecf709
+}
ecf709
+
ecf709
 struct group space_group = {
ecf709
     .gr_gid = 2123,
ecf709
     .gr_name = discard_const("space group"),
ecf709
@@ -4023,15 +4187,27 @@ int main(int argc, const char *argv[])
ecf709
         cmocka_unit_test_setup_teardown(test_nss_getgrnam_members_subdom,
ecf709
                                         nss_subdom_test_setup,
ecf709
                                         nss_subdom_test_teardown),
ecf709
+        cmocka_unit_test_setup_teardown(test_nss_getgrnam_members_subdom_nonfqnames,
ecf709
+                                        nss_subdom_test_setup,
ecf709
+                                        nss_subdom_test_teardown),
ecf709
         cmocka_unit_test_setup_teardown(test_nss_getgrnam_mix_dom,
ecf709
                                         nss_subdom_test_setup,
ecf709
                                         nss_subdom_test_teardown),
ecf709
+        cmocka_unit_test_setup_teardown(test_nss_getgrnam_mix_dom_nonfqnames,
ecf709
+                                        nss_subdom_test_setup,
ecf709
+                                        nss_subdom_test_teardown),
ecf709
         cmocka_unit_test_setup_teardown(test_nss_getgrnam_mix_dom_fqdn,
ecf709
                                         nss_subdom_test_setup,
ecf709
                                         nss_subdom_test_teardown),
ecf709
+        cmocka_unit_test_setup_teardown(test_nss_getgrnam_mix_dom_fqdn_nonfqnames,
ecf709
+                                        nss_subdom_test_setup,
ecf709
+                                        nss_subdom_test_teardown),
ecf709
         cmocka_unit_test_setup_teardown(test_nss_getgrnam_mix_subdom,
ecf709
                                         nss_subdom_test_setup,
ecf709
                                         nss_subdom_test_teardown),
ecf709
+        cmocka_unit_test_setup_teardown(test_nss_getgrnam_mix_subdom_nonfqnames,
ecf709
+                                        nss_subdom_test_setup,
ecf709
+                                        nss_subdom_test_teardown),
ecf709
         cmocka_unit_test_setup_teardown(test_nss_getgrnam_space,
ecf709
                                         nss_test_setup, nss_test_teardown),
ecf709
         cmocka_unit_test_setup_teardown(test_nss_getgrnam_space_sub,
ecf709
-- 
ecf709
2.9.3
ecf709