tribes/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2026-04-06 13:10:33 +02:00
Code Activity

system: Relax subordinate ID validation.

Browse Source 
https://codeberg.org/guix/guix/issues/3925 raised the inabilityy of the
subordinate IDs service of handling externally managed sub{u,g}id file
entries. This patch relaxes the checks in place for existing ranges,
by allowing subid-range records lower than %subordinate-id-min, leaving
all the space from subid 0 to %subordinate-id-min - 1 to external
users. Generic ranges are still allocated within %subordinate-id-min and
%subordinate-id-max.

* gnu/build/accounts.scm (<unused-id-range>)[min]: Change default value
to 0, allowing subid-ranges with a start lesser than
%subordinate-id-min.
(allocate-generic-range): Allocate generic ranges starting from
%subordinate-id-min, leaving ranges starting before %subordinate-id-min.
(allocate-specific-range): Move bounds check to...
(allocate-subids): ...here. Now bound validation is applied only to user
provided ranges.
* tests/accounts.scm: Test new behavior.

Fixes: guix/guix#3925
Change-Id: Id923b122c97a20f148684f5fb144fd9422810612
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
Merges: #4235
This commit is contained in:
Giacomo Leidi
2025-11-15 11:18:40 +01:00
committed by Ludovic Courtès
parent 94b26ff284
commit fdb46ae7b1
2 changed files with 33 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
tests/accounts.scm
View File

@@ -271,6 +271,23 @@ ada:100600:300\n")
(start %subordinate-id-min)
(count 100)))))
(test-equal "allocate-subids with externally managed state"
(list (subid-entry (name "guix-daemon") (start 904) (count 1))
(subid-entry (name "alice") (start 1085) (count 100))
(subid-entry (name "t") (start %subordinate-id-min) (count 899))
(subid-entry (name "x") (start 100899) (count 200)))
(allocate-subids (list
(subid-range (name "x") (count 200))
(subid-range (name "t") (count 899)))
;; Test use case from
;; https://codeberg.org/guix/guix/issues/3925
(list (subid-range (name "guix-daemon")
(start 904)
(count 1))
(subid-range (name "alice")
(start 1085)
(count 100)))))
(test-equal "allocate-subids with requested IDs ranges"
;; Make sure the requested sub ID for "k" and "root" are honored.
(list (subid-entry (name "x") (start %subordinate-id-min) (count 200))