mirror of
https://anongit.gentoo.org/git/repo/gentoo.git
synced 2026-05-06 07:27:03 -04:00
sec-policy/selinux-matrixd: backport upstream patch for postgres
Patch also sent upstream[1]. [1] https://github.com/SELinuxProject/refpolicy/pull/1052 Closes: https://bugs.gentoo.org/968058 Signed-off-by: Rahul Sandhu <nvraxn@posteo.uk> Merges: https://codeberg.org/gentoo/gentoo/pulls/810 Signed-off-by: Eli Schwartz <eschwartz@gentoo.org>
This commit is contained in:
committed by
Eli Schwartz
parent
2ae728511e
commit
04b4de821c
+47
@@ -0,0 +1,47 @@
|
||||
From 8d49a23bd5745be581d3f2f17fab6cd75be6c9db Mon Sep 17 00:00:00 2001
|
||||
From: Rahul Sandhu <nvraxn@posteo.uk>
|
||||
Date: Sun, 28 Dec 2025 16:47:55 +0000
|
||||
Subject: [PATCH] matrixd: gatekeep postgresql calls in an optional policy
|
||||
block
|
||||
|
||||
postgresql is a seperate policy module[1], and hence is not required
|
||||
for the matrixd policy to work; it's already behind a tunable policy
|
||||
block, and hence the boolean matrix_postgresql_connect.
|
||||
|
||||
[1] https://github.com/SELinuxProject/refpolicy/blob/main/policy/modules/services/postgresql.te
|
||||
|
||||
Closes: https://bugs.gentoo.org/968058
|
||||
Signed-off-by: Rahul Sandhu <nvraxn@posteo.uk>
|
||||
---
|
||||
refpolicy/policy/modules/services/matrixd.te | 11 ++++++-----
|
||||
1 file changed, 6 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/refpolicy/policy/modules/services/matrixd.te b/refpolicy/policy/modules/services/matrixd.te
|
||||
index 52396b877..1cd947dd1 100644
|
||||
--- a/refpolicy/policy/modules/services/matrixd.te
|
||||
+++ b/refpolicy/policy/modules/services/matrixd.te
|
||||
@@ -123,11 +123,6 @@ tunable_policy(`matrix_allow_federation',`
|
||||
corenet_dontaudit_udp_bind_all_ports(matrixd_t)
|
||||
')
|
||||
|
||||
-tunable_policy(`matrix_postgresql_connect',`
|
||||
- postgresql_stream_connect(matrixd_t)
|
||||
- postgresql_tcp_connect(matrixd_t)
|
||||
-')
|
||||
-
|
||||
tunable_policy(`matrix_bind_all_unreserved_tcp_ports',`
|
||||
corenet_tcp_bind_all_unreserved_ports(matrixd_t)
|
||||
')
|
||||
@@ -136,3 +131,9 @@ optional_policy(`
|
||||
apache_search_config(matrixd_t)
|
||||
')
|
||||
|
||||
+optional_policy(`
|
||||
+ tunable_policy(`matrix_postgresql_connect',`
|
||||
+ postgresql_stream_connect(matrixd_t)
|
||||
+ postgresql_tcp_connect(matrixd_t)
|
||||
+ ')
|
||||
+')
|
||||
--
|
||||
2.54.0
|
||||
|
||||
+10
@@ -12,3 +12,13 @@ DESCRIPTION="SELinux policy for matrixd"
|
||||
if [[ ${PV} != 9999* ]] ; then
|
||||
KEYWORDS="amd64 arm arm64 x86"
|
||||
fi
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/0001-matrixd-gatekeep-postgresql-calls-in-an-optional-pol.patch"
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
selinux-policy-2_src_prepare
|
||||
}
|
||||
+10
@@ -12,3 +12,13 @@ DESCRIPTION="SELinux policy for matrixd"
|
||||
if [[ ${PV} != 9999* ]] ; then
|
||||
KEYWORDS="amd64 arm arm64 x86"
|
||||
fi
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/0001-matrixd-gatekeep-postgresql-calls-in-an-optional-pol.patch"
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
selinux-policy-2_src_prepare
|
||||
}
|
||||
Reference in New Issue
Block a user