68ef824a5f
And also ... - Related: upstream#941 - return multiple server addresses to the Kerberos locator plugin - Related: upstream#3652 - kdcinfo doesn't get populated for other domains - Resolves: upstream#3747 - sss_ssh_authorizedkeys exits abruptly if SSHD closes its end of the pipe before reading all the SSH keys - Resolves: upstream#3607 - Handle conflicting e-mail addresses more gracefully - Resolves: upstream#3754 - SSSD AD uses LDAP filter to detect POSIX attributes stored in AD GC also for regular AD DC queries - Related: upstream#3219 - [RFE] Regular expression used in sssd.conf not being able to consume an @-sign in the user/group name. Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com>
277 lines
8.8 KiB
Diff
277 lines
8.8 KiB
Diff
From 079464a0fd417f09cfafa2bda9ff1a4e1afdbe8a Mon Sep 17 00:00:00 2001
|
|
From: Jakub Hrozek <jhrozek@redhat.com>
|
|
Date: Mon, 18 Jun 2018 09:12:13 +0200
|
|
Subject: [PATCH] TESTS: Add a basic SSH responder test
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Adds a basic test that makes sure that a list of SSH public keys can be
|
|
retrieved. This is to make sure we don't break the SSH integration later
|
|
on.
|
|
|
|
Related:
|
|
https://pagure.io/SSSD/sssd/issue/3747
|
|
|
|
Reviewed-by: Fabiano Fidêncio <fidencio@redhat.com>
|
|
(cherry picked from commit 804c5b538ad89a1a3897b93f39d716fa50530842)
|
|
---
|
|
src/tests/intg/Makefile.am | 1 +
|
|
src/tests/intg/test_ssh_pubkey.py | 232 ++++++++++++++++++++++++++++++
|
|
2 files changed, 233 insertions(+)
|
|
create mode 100644 src/tests/intg/test_ssh_pubkey.py
|
|
|
|
diff --git a/src/tests/intg/Makefile.am b/src/tests/intg/Makefile.am
|
|
index 9c5338261353f473d9051c0512c15a54ec38e1ec..a15022eb578394313155538898fe7cd7407eb9c0 100644
|
|
--- a/src/tests/intg/Makefile.am
|
|
+++ b/src/tests/intg/Makefile.am
|
|
@@ -36,6 +36,7 @@ dist_noinst_DATA = \
|
|
data/ad_schema.ldif \
|
|
test_pysss_nss_idmap.py \
|
|
test_infopipe.py \
|
|
+ test_ssh_pubkey.py \
|
|
$(NULL)
|
|
|
|
EXTRA_DIST = data/cwrap-dbus-system.conf.in
|
|
diff --git a/src/tests/intg/test_ssh_pubkey.py b/src/tests/intg/test_ssh_pubkey.py
|
|
new file mode 100644
|
|
index 0000000000000000000000000000000000000000..fbf55566e341373873057ec4e3af1d7f83202aa7
|
|
--- /dev/null
|
|
+++ b/src/tests/intg/test_ssh_pubkey.py
|
|
@@ -0,0 +1,232 @@
|
|
+#
|
|
+# ssh public key integration test
|
|
+#
|
|
+# Copyright (c) 2018 Red Hat, Inc.
|
|
+#
|
|
+# This 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; version 2 only
|
|
+#
|
|
+# 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/>.
|
|
+#
|
|
+
|
|
+import os
|
|
+import stat
|
|
+import signal
|
|
+import subprocess
|
|
+import time
|
|
+import ldap
|
|
+import ldap.modlist
|
|
+import pytest
|
|
+
|
|
+import config
|
|
+import ds_openldap
|
|
+import ent
|
|
+import ldap_ent
|
|
+from util import unindent, get_call_output
|
|
+
|
|
+LDAP_BASE_DN = "dc=example,dc=com"
|
|
+
|
|
+USER1_PUBKEY1 = "ssh-dss AAAAB3NzaC1kc3MAAACBAPMkvcU53RVhBtjwiC3IqeRIWR9Qwdv8\
|
|
+DmZzEsDD3Csd6jYxMsPZoXcPrHqwYcEj1s5MVqhdSFS0Cjz13e7gO6OMLInO3xMBSSFHjfp9RE1H\
|
|
+pgc4WisazzyJaW9EMkQo/DqvkFkKh31oqAmxcSbLAFJRg4TTIqm18qu8IRKS6m/RAAAAFQC97TA5\
|
|
+JSsMsaX1bRszC7y4PhMBvQAAAIEAt9Yo9v/h9W4nDbzUdkGwNRszlPEK+T12bJv0O9Fk6subD3Do\
|
|
+6A4Qru/Nr6voXoq8b018Wb7iFWvKOoz5uT/plWBKLXL2NN7ovTR+dUJIzvwurQZroukmU1EghNey\
|
|
+lkSHmDlxSoMK6Nh21uGu6l+b6x5pXNaZHMpsywG4kY8SoC0AAACAAWLHneEGvqkYA8La4Eob+Hjj\
|
|
+mAKilx8byxm3Kfb1XO+ZrR6XxadofZOaUYRMpPKgFjKAKPxJftPLiDjWM7lSe6h8df0dUMLVXt6m\
|
|
+eA83kE0uK5JOOGJfJDqmRed2YnfxUDNNFQGT4xFWGrNtYNbGyw9BWKbkooAsLqaO04zP3Rs= \
|
|
+user1@LDAP"
|
|
+
|
|
+USER1_PUBKEY2 = "ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAwHUUF3HPH+DkU6j8k7Q1wHG\
|
|
+RJY9NeLqSav3h95mTSCQYPSC7I9RTJ4OORgqCbEzrP/DYrrn4TtQ9dhRJar3ZY+F36SH5yFIXORb\
|
|
+lAIbFU+/anahBuFS9vHi1MqFPckGmwJ4QCpjQhdYxo1ro0e1RuGSaQNp/w9N6S/fDz4Cj4I99xDz\
|
|
+SeQeGHxYv0e60plQ8dUajmnaGmYRJHF9a6Ban7IWySActCja7eQP2zIRXEZMpuhl1E0U4y+gHTFI\
|
|
+gD3zQai3QrXm8RUrQURIJ0u6BlGS910OPbHqLpLTFWG08L8sNUcYzC+DY6yoCSO0n/Df3pVRS4C9\
|
|
+5Krf3FqppMTjdfQ== user1@LDAP"
|
|
+
|
|
+
|
|
+@pytest.fixture(scope="module")
|
|
+def ds_inst(request):
|
|
+ """LDAP server instance fixture"""
|
|
+ ds_inst = ds_openldap.DSOpenLDAP(
|
|
+ config.PREFIX, 10389, LDAP_BASE_DN,
|
|
+ "cn=admin", "Secret123"
|
|
+ )
|
|
+
|
|
+ try:
|
|
+ ds_inst.setup()
|
|
+ except:
|
|
+ ds_inst.teardown()
|
|
+ raise
|
|
+ request.addfinalizer(ds_inst.teardown)
|
|
+ return ds_inst
|
|
+
|
|
+
|
|
+@pytest.fixture(scope="module")
|
|
+def ldap_conn(request, ds_inst):
|
|
+ """LDAP server connection fixture"""
|
|
+ ldap_conn = ds_inst.bind()
|
|
+ ldap_conn.ds_inst = ds_inst
|
|
+ request.addfinalizer(ldap_conn.unbind_s)
|
|
+ return ldap_conn
|
|
+
|
|
+
|
|
+def create_ldap_entries(ldap_conn, ent_list=None):
|
|
+ """Add LDAP entries from ent_list"""
|
|
+ if ent_list is not None:
|
|
+ for entry in ent_list:
|
|
+ ldap_conn.add_s(entry[0], entry[1])
|
|
+
|
|
+
|
|
+def cleanup_ldap_entries(ldap_conn, ent_list=None):
|
|
+ """Remove LDAP entries added by create_ldap_entries"""
|
|
+ if ent_list is None:
|
|
+ for ou in ("Users", "Groups", "Netgroups", "Services", "Policies"):
|
|
+ for entry in ldap_conn.search_s("ou=" + ou + "," +
|
|
+ ldap_conn.ds_inst.base_dn,
|
|
+ ldap.SCOPE_ONELEVEL,
|
|
+ attrlist=[]):
|
|
+ ldap_conn.delete_s(entry[0])
|
|
+ else:
|
|
+ for entry in ent_list:
|
|
+ ldap_conn.delete_s(entry[0])
|
|
+
|
|
+
|
|
+def create_ldap_cleanup(request, ldap_conn, ent_list=None):
|
|
+ """Add teardown for removing all user/group LDAP entries"""
|
|
+ request.addfinalizer(lambda: cleanup_ldap_entries(ldap_conn, ent_list))
|
|
+
|
|
+
|
|
+def create_ldap_fixture(request, ldap_conn, ent_list=None):
|
|
+ """Add LDAP entries and add teardown for removing them"""
|
|
+ create_ldap_entries(ldap_conn, ent_list)
|
|
+ create_ldap_cleanup(request, ldap_conn, ent_list)
|
|
+
|
|
+
|
|
+SCHEMA_RFC2307_BIS = "rfc2307bis"
|
|
+
|
|
+
|
|
+def format_basic_conf(ldap_conn, schema):
|
|
+ """Format a basic SSSD configuration"""
|
|
+ schema_conf = "ldap_schema = " + schema + "\n"
|
|
+ schema_conf += "ldap_group_object_class = groupOfNames\n"
|
|
+ return unindent("""\
|
|
+ [sssd]
|
|
+ domains = LDAP
|
|
+ services = nss, ssh
|
|
+
|
|
+ [nss]
|
|
+
|
|
+ [ssh]
|
|
+ debug_level=10
|
|
+
|
|
+ [domain/LDAP]
|
|
+ {schema_conf}
|
|
+ id_provider = ldap
|
|
+ auth_provider = ldap
|
|
+ ldap_uri = {ldap_conn.ds_inst.ldap_url}
|
|
+ ldap_search_base = {ldap_conn.ds_inst.base_dn}
|
|
+ ldap_sudo_use_host_filter = false
|
|
+ debug_level=10
|
|
+ """).format(**locals())
|
|
+
|
|
+
|
|
+def create_conf_file(contents):
|
|
+ """Create sssd.conf with specified contents"""
|
|
+ conf = open(config.CONF_PATH, "w")
|
|
+ conf.write(contents)
|
|
+ conf.close()
|
|
+ os.chmod(config.CONF_PATH, stat.S_IRUSR | stat.S_IWUSR)
|
|
+
|
|
+
|
|
+def cleanup_conf_file():
|
|
+ """Remove sssd.conf, if it exists"""
|
|
+ if os.path.lexists(config.CONF_PATH):
|
|
+ os.unlink(config.CONF_PATH)
|
|
+
|
|
+
|
|
+def create_conf_cleanup(request):
|
|
+ """Add teardown for removing sssd.conf"""
|
|
+ request.addfinalizer(cleanup_conf_file)
|
|
+
|
|
+
|
|
+def create_conf_fixture(request, contents):
|
|
+ """
|
|
+ Create sssd.conf with specified contents and add teardown for removing it
|
|
+ """
|
|
+ create_conf_file(contents)
|
|
+ create_conf_cleanup(request)
|
|
+
|
|
+
|
|
+def create_sssd_process():
|
|
+ """Start the SSSD process"""
|
|
+ if subprocess.call(["sssd", "-D", "-f"]) != 0:
|
|
+ raise Exception("sssd start failed")
|
|
+
|
|
+
|
|
+def get_sssd_pid():
|
|
+ pid_file = open(config.PIDFILE_PATH, "r")
|
|
+ pid = int(pid_file.read())
|
|
+ return pid
|
|
+
|
|
+
|
|
+def cleanup_sssd_process():
|
|
+ """Stop the SSSD process and remove its state"""
|
|
+ try:
|
|
+ pid = get_sssd_pid()
|
|
+ os.kill(pid, signal.SIGTERM)
|
|
+ while True:
|
|
+ try:
|
|
+ os.kill(pid, signal.SIGCONT)
|
|
+ except:
|
|
+ break
|
|
+ time.sleep(1)
|
|
+ except:
|
|
+ pass
|
|
+ for path in os.listdir(config.DB_PATH):
|
|
+ os.unlink(config.DB_PATH + "/" + path)
|
|
+ for path in os.listdir(config.MCACHE_PATH):
|
|
+ os.unlink(config.MCACHE_PATH + "/" + path)
|
|
+
|
|
+
|
|
+def create_sssd_fixture(request):
|
|
+ """Start SSSD and add teardown for stopping it and removing its state"""
|
|
+ create_sssd_process()
|
|
+ create_sssd_cleanup(request)
|
|
+
|
|
+
|
|
+def create_sssd_cleanup(request):
|
|
+ """Add teardown for stopping SSSD and removing its state"""
|
|
+ request.addfinalizer(cleanup_sssd_process)
|
|
+
|
|
+
|
|
+@pytest.fixture
|
|
+def add_user_with_ssh_key(request, ldap_conn):
|
|
+ ent_list = ldap_ent.List(ldap_conn.ds_inst.base_dn)
|
|
+ ent_list.add_user("user1", 1001, 2001,
|
|
+ sshPubKey=(USER1_PUBKEY1, USER1_PUBKEY2))
|
|
+ ent_list.add_user("user2", 1002, 2001)
|
|
+ create_ldap_fixture(request, ldap_conn, ent_list)
|
|
+
|
|
+ conf = format_basic_conf(ldap_conn, SCHEMA_RFC2307_BIS)
|
|
+ create_conf_fixture(request, conf)
|
|
+ create_sssd_fixture(request)
|
|
+ return None
|
|
+
|
|
+
|
|
+def test_ssh_pubkey_retrieve(add_user_with_ssh_key):
|
|
+ """
|
|
+ Test that we can retrieve an SSH public key for a user who has one
|
|
+ and can't retrieve a key for a user who does not have one.
|
|
+ """
|
|
+ sshpubkey = get_call_output(["sss_ssh_authorizedkeys", "user1"])
|
|
+ assert sshpubkey == USER1_PUBKEY1 + '\n' + USER1_PUBKEY2 + '\n'
|
|
+
|
|
+ sshpubkey = get_call_output(["sss_ssh_authorizedkeys", "user2"])
|
|
+ assert len(sshpubkey) == 0
|
|
--
|
|
2.17.1
|
|
|