From: aduskett at gmail.com <aduskett@gmail.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH v6 4/6] support/testing: add polkit systemd test
Date: Fri, 6 Dec 2019 15:46:47 -0800 [thread overview]
Message-ID: <20191206234649.3972927-4-aduskett@gmail.com> (raw)
In-Reply-To: <20191206234649.3972927-1-aduskett@gmail.com>
From: Adam Duskett <Aduskett@gmail.com>
This test is a simple integration test of the polkit package on systems
running systemd.
It consists of the following:
- The brtest user attempts to restart the systemd-timesyncd service and is
denied.
- A systemd-timesyncd-restart.rules file provided by polkit-rules-test-systemd
is copied from /root/ to /etc/polkit-1/rules.d
- The brtest user attempts to restart the systemd-timesyncd service and should
now succeed.
Signed-off-by: Adam Duskett <Aduskett@gmail.com>
---
Changes v1 -> v5:
- Reorder this patch in the series.
- Add test to .gitlab-ci.yml
- Instead of a seperate test file for both systemd and initd, use just a single
file called test_polkit.py.
Changes v5 -> v6:
- Use self.assertRunOk in test_polkit.py
- Flake8 cleanup.
.gitlab-ci.yml | 1 +
DEVELOPERS | 2 +
.../package/br2-external/polkit/Config.in | 1 +
.../package/br2-external/polkit/external.desc | 1 +
.../package/br2-external/polkit/external.mk | 1 +
.../polkit-rules-test-systemd/Config.in | 6 +++
.../polkit-rules-test-systemd.mk | 20 ++++++++
.../systemd-timesyncd-restart.rules | 7 +++
support/testing/tests/package/test_polkit.py | 48 +++++++++++++++++++
9 files changed, 87 insertions(+)
create mode 100644 support/testing/tests/package/br2-external/polkit/Config.in
create mode 100644 support/testing/tests/package/br2-external/polkit/external.desc
create mode 100644 support/testing/tests/package/br2-external/polkit/external.mk
create mode 100644 support/testing/tests/package/br2-external/polkit/package/polkit-rules-test-systemd/Config.in
create mode 100644 support/testing/tests/package/br2-external/polkit/package/polkit-rules-test-systemd/polkit-rules-test-systemd.mk
create mode 100644 support/testing/tests/package/br2-external/polkit/package/polkit-rules-test-systemd/systemd-timesyncd-restart.rules
create mode 100644 support/testing/tests/package/test_polkit.py
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6deb97351b..475d205d4a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -425,6 +425,7 @@ tests.package.test_perl_libwww_perl.TestPerllibwwwperl: { extends: .runtime_test
tests.package.test_perl_mail_dkim.TestPerlMailDKIM: { extends: .runtime_test }
tests.package.test_perl_x10.TestPerlX10: { extends: .runtime_test }
tests.package.test_perl_xml_libxml.TestPerlXMLLibXML: { extends: .runtime_test }
+tests.package.test_polkit.TestPolkitSystemd: { extends: .runtime_test }
tests.package.test_prosody.TestProsodyLua51: { extends: .runtime_test }
tests.package.test_prosody.TestProsodyLuajit: { extends: .runtime_test }
tests.package.test_python.TestPython2: { extends: .runtime_test }
diff --git a/DEVELOPERS b/DEVELOPERS
index d5fd6e0e93..e63773c261 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -76,6 +76,8 @@ F: package/setools/
F: package/sngrep/
F: package/spidermonkey/
F: package/systemd/
+F: support/testing/tests/package/br2-external/polkit/
+F: support/testing/tests/package/test_polkit.py
F: support/testing/tests/package/test_python_gobject.py
N: Adam Heinrich <adam@adamh.cz>
diff --git a/support/testing/tests/package/br2-external/polkit/Config.in b/support/testing/tests/package/br2-external/polkit/Config.in
new file mode 100644
index 0000000000..bb555b5097
--- /dev/null
+++ b/support/testing/tests/package/br2-external/polkit/Config.in
@@ -0,0 +1 @@
+source "$BR2_EXTERNAL_POLKIT_PATH/package/polkit-rules-test-systemd/Config.in"
diff --git a/support/testing/tests/package/br2-external/polkit/external.desc b/support/testing/tests/package/br2-external/polkit/external.desc
new file mode 100644
index 0000000000..ecef48692b
--- /dev/null
+++ b/support/testing/tests/package/br2-external/polkit/external.desc
@@ -0,0 +1 @@
+name: POLKIT
diff --git a/support/testing/tests/package/br2-external/polkit/external.mk b/support/testing/tests/package/br2-external/polkit/external.mk
new file mode 100644
index 0000000000..64e369cce4
--- /dev/null
+++ b/support/testing/tests/package/br2-external/polkit/external.mk
@@ -0,0 +1 @@
+include $(sort $(wildcard $(BR2_EXTERNAL_POLKIT_PATH)/package/*/*.mk))
diff --git a/support/testing/tests/package/br2-external/polkit/package/polkit-rules-test-systemd/Config.in b/support/testing/tests/package/br2-external/polkit/package/polkit-rules-test-systemd/Config.in
new file mode 100644
index 0000000000..662b991d3b
--- /dev/null
+++ b/support/testing/tests/package/br2-external/polkit/package/polkit-rules-test-systemd/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_POLKIT_RULES_TEST_SYSTEMD
+ bool "polkit rules test for systemd"
+ depends on BR2_PACKAGE_POLKIT
+ help
+ Simple test to ensure polkit is loading and enforcing rules
+ correctly using a rules file meant for systemd.
diff --git a/support/testing/tests/package/br2-external/polkit/package/polkit-rules-test-systemd/polkit-rules-test-systemd.mk b/support/testing/tests/package/br2-external/polkit/package/polkit-rules-test-systemd/polkit-rules-test-systemd.mk
new file mode 100644
index 0000000000..19a6be2b2f
--- /dev/null
+++ b/support/testing/tests/package/br2-external/polkit/package/polkit-rules-test-systemd/polkit-rules-test-systemd.mk
@@ -0,0 +1,20 @@
+################################################################################
+#
+# polkit-rules-test-systemd
+#
+################################################################################
+
+POLKIT_RULES_TEST_SYSTEMD_DEPENDENCIES = polkit
+
+define POLKIT_RULES_TEST_SYSTEMD_USERS
+ brtest -1 brtest -1 =password /home/brtest /bin/sh brtest
+endef
+
+define POLKIT_RULES_TEST_SYSTEMD_INSTALL_TARGET_CMDS
+ mkdir -p $(TARGET_DIR)/etc/polkit-1/rules.d
+
+ $(INSTALL) -D $(POLKIT_RULES_TEST_SYSTEMD_PKGDIR)/systemd-timesyncd-restart.rules \
+ $(TARGET_DIR)/root/systemd-timesyncd-restart.rules
+endef
+
+$(eval $(generic-package))
diff --git a/support/testing/tests/package/br2-external/polkit/package/polkit-rules-test-systemd/systemd-timesyncd-restart.rules b/support/testing/tests/package/br2-external/polkit/package/polkit-rules-test-systemd/systemd-timesyncd-restart.rules
new file mode 100644
index 0000000000..9461195091
--- /dev/null
+++ b/support/testing/tests/package/br2-external/polkit/package/polkit-rules-test-systemd/systemd-timesyncd-restart.rules
@@ -0,0 +1,7 @@
+polkit.addRule(function(action, subject) {
+ if (action.id == "org.freedesktop.systemd1.manage-units" &&
+ action.lookup("unit") == "systemd-timesyncd.service" &&
+ subject.user == "brtest") {
+ return polkit.Result.YES;
+ }
+});
diff --git a/support/testing/tests/package/test_polkit.py b/support/testing/tests/package/test_polkit.py
new file mode 100644
index 0000000000..3ee06958a6
--- /dev/null
+++ b/support/testing/tests/package/test_polkit.py
@@ -0,0 +1,48 @@
+import os
+import infra.basetest
+
+
+class TestPolkitSystemd(infra.basetest.BRTest):
+ br2_external = [infra.filepath("tests/package/br2-external/polkit")]
+ config = \
+ """
+ BR2_aarch64=y
+ BR2_TOOLCHAIN_EXTERNAL=y
+ BR2_INIT_SYSTEMD=y
+ BR2_JLEVEL=10
+ BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0"
+ BR2_LINUX_KERNEL=y
+ BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+ BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.86"
+ BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
+ BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config"
+ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
+ BR2_PACKAGE_POLKIT=y
+ BR2_PACKAGE_SYSTEMD_POLKIT=y
+ BR2_TARGET_ROOTFS_CPIO=y
+ BR2_TARGET_ROOTFS_CPIO_GZIP=y
+ BR2_PACKAGE_POLKIT_RULES_TEST_SYSTEMD=y
+ """
+
+ def login(self):
+ img = os.path.join(self.builddir, "images", "rootfs.cpio.gz")
+ kern = os.path.join(self.builddir, "images", "Image")
+ self.emulator.boot(arch="aarch64",
+ kernel=kern,
+ kernel_cmdline=["console=ttyAMA0"],
+ options=[
+ "-M", "virt", "-cpu", "cortex-a57", "-m", "512M", "-initrd", img
+ ])
+ self.emulator.login()
+
+ def test_run(self):
+ self.login()
+
+ cmd = "su brtest -c '/bin/systemctl restart systemd-timesyncd.service'"
+ self.assertRunOk(cmd, timeout=10)
+
+ cmd = "mv /root/systemd-timesyncd-restart.rules /etc/polkit-1/rules.d"
+ self.assertRunOk(cmd, timeout=10)
+
+ cmd = "su brtest -c '/bin/systemctl restart systemd-timesyncd.service'"
+ self.assertRunOk(cmd, timeout=10)
--
2.23.0
next prev parent reply other threads:[~2019-12-06 23:46 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-06 23:46 [Buildroot] [PATCH v6 1/6] package/polkit: bump to version 0.116 aduskett at gmail.com
2019-12-06 23:46 ` [Buildroot] [PATCH v6 2/6] package/polkit: support different authentication frameworks aduskett at gmail.com
2019-12-08 15:02 ` Thomas Petazzoni
2019-12-06 23:46 ` [Buildroot] [PATCH v6 3/6] package/polkit: add systemd service file aduskett at gmail.com
2019-12-08 15:04 ` Thomas Petazzoni
2019-12-08 18:46 ` Adam Duskett
2019-12-08 19:57 ` Thomas Petazzoni
2019-12-08 21:31 ` Adam Duskett
2019-12-08 21:32 ` Adam Duskett
2019-12-06 23:46 ` aduskett at gmail.com [this message]
2019-12-08 15:07 ` [Buildroot] [PATCH v6 4/6] support/testing: add polkit systemd test Thomas Petazzoni
2019-12-06 23:46 ` [Buildroot] [PATCH v6 5/6] package/polkit: add init service file aduskett at gmail.com
2019-12-08 15:08 ` Thomas Petazzoni
2020-02-09 21:28 ` Carlos Santos
2019-12-06 23:46 ` [Buildroot] [PATCH v6 6/6] support/testing: add polkit initd test aduskett at gmail.com
2019-12-08 15:02 ` [Buildroot] [PATCH v6 1/6] package/polkit: bump to version 0.116 Thomas Petazzoni
2019-12-08 19:04 ` Adam Duskett
2019-12-08 19:58 ` Thomas Petazzoni
2019-12-09 19:03 ` Adam Duskett
2019-12-14 21:04 ` Thomas Petazzoni
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191206234649.3972927-4-aduskett@gmail.com \
--to=aduskett@gmail.com \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.