Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -311,6 +311,9 @@ jobs:
--polarion-config=../polarion.yaml \
--output-polarion-testcase=$GITHUB_WORKSPACE/artifacts/testcase.xml \
${{ steps.select-tests.outputs.SELECT_TESTS }} \
--mh-not-topology=ipa --mh-not-topology=samba --mh-not-topology=ad \
--mh-not-topology=ipa-trust-samba \
-k "not test_logging__default_settings_logs_ and not test_failover and not test_autofs__propagate_offline_status_for_multiple_domains" \
--collect-only . |& tee $GITHUB_WORKSPACE/pytest-collect.log

- name: Run tests
Expand All @@ -331,6 +334,9 @@ jobs:
--output-polarion-testcase=$GITHUB_WORKSPACE/artifacts/testcase.xml \
--output-polarion-testrun=$GITHUB_WORKSPACE/artifacts/testrun.xml \
${{ steps.select-tests.outputs.SELECT_TESTS }} \
--mh-not-topology=ipa --mh-not-topology=samba --mh-not-topology=ad \
--mh-not-topology=ipa-trust-samba \
-k "not test_logging__default_settings_logs_ and not test_failover and not test_autofs__propagate_offline_status_for_multiple_domains" \
-vvv . |& tee $GITHUB_WORKSPACE/pytest.log

- name: Upload artifacts
Expand Down
52 changes: 51 additions & 1 deletion Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -301,6 +301,7 @@ if HAVE_CMOCKA
test_sbus_message \
test_sbus_opath \
test_fo_srv \
test_failover_server \
pam-srv-tests \
ssh-srv-tests \
test_ipa_subdom_util \
Expand Down Expand Up @@ -648,6 +649,25 @@ SSSD_FAILOVER_OBJ = \
src/providers/fail_over_srv.c \
$(SSSD_RESOLV_OBJ)

# Make sure to build new failover code to test compilation even though it is
# not used anywhere yet.
SSSD_NEW_FAILOVER_OBJ = \
src/providers/failover/failover.c \
src/providers/failover/failover_callback.c \
src/providers/failover/failover_refresh_candidates.c \
src/providers/failover/failover_group.c \
src/providers/failover/failover_server_resolve.c \
src/providers/failover/failover_server.c \
src/providers/failover/failover_srv.c \
src/providers/failover/failover_service.c \
src/providers/failover/failover_transaction.c \
src/providers/failover/failover_vtable_op.c \
src/providers/failover/failover_vtable.c \
src/providers/failover/ldap/failover_ldap_connect.c \
src/providers/failover/ldap/failover_ldap_kinit.c \
$(SSSD_RESOLV_OBJ) \
$(NULL)

SSSD_LIBS = \
$(TALLOC_LIBS) \
$(TEVENT_LIBS) \
Expand Down Expand Up @@ -840,6 +860,16 @@ dist_noinst_HEADERS = \
src/providers/be_refresh.h \
src/providers/fail_over.h \
src/providers/fail_over_srv.h \
src/providers/failover/failover.h \
src/providers/failover/failover_group.h \
src/providers/failover/failover_refresh_candidates.h \
src/providers/failover/failover_server.h \
src/providers/failover/failover_server_resolve.h \
src/providers/failover/failover_srv.h \
src/providers/failover/failover_transaction.h \
src/providers/failover/failover_vtable.h \
src/providers/failover/failover_vtable_op.h \
src/providers/failover/ldap/failover_ldap.h \
src/util/child_common.h \
src/util/child_bootstrap.h \
src/providers/simple/simple_access.h \
Expand Down Expand Up @@ -3471,6 +3501,24 @@ test_fo_srv_LDADD = \
libsss_test_common.la \
$(NULL)

test_failover_server_SOURCES = \
src/tests/cmocka/test_failover_server.c \
src/providers/failover/failover_server.c \
$(SSSD_RESOLV_TESTS_OBJ) \
$(NULL)
test_failover_server_CFLAGS = \
$(AM_CFLAGS) \
$(CMOCKA_CFLAGS) \
$(NULL)
test_failover_server_LDADD = \
$(CARES_LIBS) \
$(CMOCKA_LIBS) \
$(POPT_LIBS) \
$(SSSD_INTERNAL_LTLIBS) \
$(TALLOC_LIBS) \
libsss_test_common.la \
$(NULL)

test_sdap_initgr_SOURCES = \
src/tests/cmocka/common_mock_sdap.c \
src/tests/cmocka/common_mock_sysdb_objects.c \
Expand Down Expand Up @@ -4335,6 +4383,7 @@ libsss_ldap_common_la_SOURCES = \
src/util/sss_sockets.c \
src/util/sss_ldap.c \
src/util/cert_derb64_to_ldap_filter.c \
$(SSSD_NEW_FAILOVER_OBJ) \
$(NULL)
libsss_ldap_common_la_CFLAGS = \
$(AM_CFLAGS) \
Expand Down Expand Up @@ -4414,7 +4463,8 @@ libsss_krb5_common_la_LDFLAGS = \

libsss_ldap_la_SOURCES = \
src/providers/ldap/ldap_init.c \
src/providers/ldap/ldap_access.c
src/providers/ldap/ldap_access.c \
$(SSSD_NEW_FAILOVER_OBJ)
libsss_ldap_la_CFLAGS = \
$(AM_CFLAGS) \
$(OPENLDAP_CFLAGS)
Expand Down
88 changes: 88 additions & 0 deletions minimal-provider-notes.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
# Minimal SSSD provider

This is used as a proof of concept for the new failover implementation. It can
also be used to see what changes are required in order to switch to the new
code, however it really does only minimum amount of changes to get it working.
It would be very good to provide more thorough refactoring in the real
providers.

The minimal provider supports:
- services lookup (getent services)
- user authentication

## Populate LDAP

```
$ vim objects.ldif
dn: ou=users,dc=ldap,dc=test
objectClass: top
objectClass: organizationalUnit
ou: users

# Password is Secret123
dn: cn=user-1,ou=users,dc=ldap,dc=test
uid: user-1
uidNumber: 10000
homeDirectory: /home/user-1
gidNumber: 100000
cn: user-1
objectClass: posixAccount
objectClass: top
userPassword:: e1BCS0RGMi1TSEE1MTJ9MTAwMDAwJEVZU2lqOFgxTTVFZUIrMXlHQzdvZkhwZzd
XZXpYRGJwJG0vTVUyMUIrTGNNb2tkRVcvUFJ6YWlhc21zdlNDeVJWdGxPU3c3c05YbHk2NUxBcUcz
ODJqQUJWUEp2N1ZnOUtRdXhEamVlbmxEV3V5Ylg5UFdKMW5nPT0=

dn: ou=services,dc=ldap,dc=test
objectClass: top
objectClass: organizationalUnit
ou: services

dn: cn=service0,ou=services,dc=ldap,dc=test
objectClass: ipService
cn: service0
ipServiceProtocol: tcp
ipServicePort: 12345

$ ldapadd -D "cn=Directory Manager" -w Secret123 -H ldap://master.ldap.test -f objects.ldif -vv
```

## Verify LDAP contents

```
$ ldapsearch -D "cn=Directory Manager" -w Secret123 -H ldap://master.ldap.test -b dc=ldap,dc=test
```

## Configure SSSD for services lookup

```
[sssd]
domains = minimal

[domain/minimal]
debug_level = 9
id_provider = minimal

$ getent services -s sss service0
service0 12345/tcp
```

## Configure SSSD for user authentication

Note: user lookup is done by id provider

```
[sssd]
services = nss, pam
domains = minimal

[domain/minimal]
debug_level = 9
id_provider = ldap
auth_provider = minimal
ldap_uri = _srv_
dns_discovery_domain = ldap.test
ldap_tls_reqcert = never

$ su user-1
Password: Secret123
```
11 changes: 5 additions & 6 deletions src/providers/ad/ad_dyndns.c
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,6 @@ ad_dyndns_update_send(TALLOC_CTX *mem_ctx,

static void ad_dyndns_update_connect_done(struct tevent_req *subreq)
{
int dp_error;
int ret;
struct tevent_req *req;
struct ad_dyndns_update_state *state;
Expand All @@ -191,11 +190,14 @@ static void ad_dyndns_update_connect_done(struct tevent_req *subreq)
req = tevent_req_callback_data(subreq, struct tevent_req);
state = tevent_req_data(req, struct ad_dyndns_update_state);

ret = sdap_id_op_connect_recv(subreq, &dp_error);
ret = sdap_id_op_connect_recv(subreq);
talloc_zfree(subreq);

ctx = state->ad_ctx;
sdap_ctx = ctx->id_ctx->sdap_id_ctx;

if (ret != EOK) {
if (dp_error == DP_ERR_OFFLINE) {
if (be_is_offline(sdap_ctx->be)) {
DEBUG(SSSDBG_MINOR_FAILURE, "No server is available, "
"dynamic DNS update is skipped in offline mode.\n");
tevent_req_error(req, ERR_DYNDNS_OFFLINE);
Expand All @@ -208,9 +210,6 @@ static void ad_dyndns_update_connect_done(struct tevent_req *subreq)
return;
}

ctx = state->ad_ctx;
sdap_ctx = ctx->id_ctx->sdap_id_ctx;

ret = ldap_url_parse(ctx->service->sdap->uri, &lud);
if (ret != LDAP_SUCCESS) {
DEBUG(SSSDBG_CRIT_FAILURE, "Failed to parse ldap URI '%s': %d\n",
Expand Down
Loading
Loading