Skip to content

Commit ac89f94

Browse files
committed
sysrepo: allow non-wheel users access to sysrepo data
Non-privileged users in the sys-cli group can now access sysrepo data. The data is now solely protected by the NCAM rules and not Unix file permissions. Any stray user that's not part of the (default) sys-cli group still can't access syrepo, like users added from the shell. Fixes #932 Signed-off-by: Richard Alpe <richard@bit42.se>
1 parent 3999840 commit ac89f94

File tree

8 files changed

+9
-5
lines changed

8 files changed

+9
-5
lines changed

configs/aarch64_defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ BR2_LINUX_KERNEL_INSTALL_TARGET=y
3434
BR2_PACKAGE_BUSYBOX_CONFIG="${BR2_EXTERNAL_INFIX_PATH}/board/common/busybox_defconfig"
3535
BR2_PACKAGE_STRACE=y
3636
BR2_PACKAGE_STRESS_NG=y
37+
BR2_PACKAGE_SYSREPO_GROUP="sys-cli"
3738
BR2_PACKAGE_JQ=y
3839
BR2_PACKAGE_E2FSPROGS=y
3940
BR2_PACKAGE_DBUS_CXX=y

configs/aarch64_minimal_defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ BR2_LINUX_KERNEL_INSTALL_TARGET=y
3434
BR2_PACKAGE_BUSYBOX_CONFIG="${BR2_EXTERNAL_INFIX_PATH}/board/common/busybox_defconfig"
3535
BR2_PACKAGE_STRACE=y
3636
BR2_PACKAGE_STRESS_NG=y
37+
BR2_PACKAGE_SYSREPO_GROUP="sys-cli"
3738
BR2_PACKAGE_JQ=y
3839
BR2_PACKAGE_E2FSPROGS=y
3940
BR2_PACKAGE_DBUS_CXX=y

configs/r2s_defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
4141
BR2_PACKAGE_BUSYBOX_CONFIG="$(BR2_EXTERNAL_INFIX_PATH)/board/common/busybox_defconfig"
4242
BR2_PACKAGE_STRACE=y
4343
BR2_PACKAGE_STRESS_NG=y
44+
BR2_PACKAGE_SYSREPO_GROUP="sys-cli"
4445
BR2_PACKAGE_JQ=y
4546
BR2_PACKAGE_E2FSPROGS=y
4647
BR2_PACKAGE_LINUX_FIRMWARE=y

configs/riscv64_defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
3939
BR2_PACKAGE_BUSYBOX_CONFIG="$(BR2_EXTERNAL_INFIX_PATH)/board/common/busybox_defconfig"
4040
BR2_PACKAGE_STRACE=y
4141
BR2_PACKAGE_STRESS_NG=y
42+
BR2_PACKAGE_SYSREPO_GROUP="sys-cli"
4243
BR2_PACKAGE_JQ=y
4344
BR2_PACKAGE_E2FSPROGS=y
4445
BR2_PACKAGE_LINUX_FIRMWARE=y

configs/x86_64_defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y
3434
BR2_PACKAGE_BUSYBOX_CONFIG="${BR2_EXTERNAL_INFIX_PATH}/board/common/busybox_defconfig"
3535
BR2_PACKAGE_STRACE=y
3636
BR2_PACKAGE_STRESS_NG=y
37+
BR2_PACKAGE_SYSREPO_GROUP="sys-cli"
3738
BR2_PACKAGE_JQ=y
3839
BR2_PACKAGE_E2FSPROGS=y
3940
BR2_PACKAGE_DBUS_CXX=y

configs/x86_64_minimal_defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y
3535
BR2_PACKAGE_BUSYBOX_CONFIG="${BR2_EXTERNAL_INFIX_PATH}/board/common/busybox_defconfig"
3636
BR2_PACKAGE_STRACE=y
3737
BR2_PACKAGE_STRESS_NG=y
38+
BR2_PACKAGE_SYSREPO_GROUP="sys-cli"
3839
BR2_PACKAGE_JQ=y
3940
BR2_PACKAGE_E2FSPROGS=y
4041
BR2_PACKAGE_DBUS_CXX=y

package/confd/confd.mk

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,10 @@ endef
7171
endif
7272

7373
define CONFD_PERMISSIONS
74-
/etc/sysrepo/data/ r 660 root wheel - - - - -
75-
/etc/sysrepo/data d 770 root wheel - - - - -
74+
/etc/sysrepo/data/ r 660 root sys-cli - - - - -
75+
/etc/sysrepo/data d 770 root sys-cli - - - - -
7676
endef
77+
7778
define CONFD_EMPTY_SYSREPO
7879
rm -rf $(TARGET_DIR)/etc/sysrepo/data/
7980
endef

src/confd/bin/load

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,6 @@ else
8282
fi
8383
fi
8484

85-
# Ensure users in admin group can access all datastores
86-
chgrp wheel /dev/shm/*
87-
8885
if [ ! -f "$fn" ]; then
8986
case "$config" in
9087
startup-config)

0 commit comments

Comments
 (0)