From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id gC5EA8YVxWY+pgAAe85BDQ:P1 (envelope-from ) for ; Tue, 20 Aug 2024 22:16:38 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id gC5EA8YVxWY+pgAAe85BDQ (envelope-from ) for ; Wed, 21 Aug 2024 00:16:38 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=VyF8iuHw; dkim=fail ("body hash did not verify") header.d=autistici.org header.s=stigmate header.b=pPcIYDd3; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1724192197; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=upDaK4+WtdN7IFD4sg66QCZd+HHdp+nB+Q0XHcXMf0Q=; b=NzaYu2w/v6h0W+EGLlT+WY8aiXDaOGCbUzFv9gaN2le/84mN//M++UKbfWlLiQWftl8mEX RXpBG1Y1DXM+pPpXbuLIQqjmE35S008whSthF/ypi6gavbMx/H2jTrInU1lfl+Q2Ruhsua EjJRNjKHg49bl9xadlUaUQk7A9iKLMTJLP9rBHsZeC13c2T+fLBlT2igHCJYY312VxUJi4 Kv4Gax4nw7t8IzX0KjmjElGRRCy76zJurfqwoouRmEUNYQQYmWHONFeiy62RAUaGDQpQaH aapY3UqA8NcDCoXmZ1O8loMs2Cg3eR4BsopBbkSjV9tcep5SmI0wy0JNfbaONQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1724192197; a=rsa-sha256; cv=none; b=WL5BqVa/dKonOSqO9L+uBDlE7dRC+8NgovCPseyo5Zjmu7Ke5EfkaPjC7lARMifISM6vnS ZnqZIBcM4ic4BbSYU/gyGA/j69mfAwSqM/eNZM8cTWjxx3fPwIX+MKd5p67AgJG+KmhtJM y/wEfQdlQm3CjVu7qfVYBQ6w+NdcTjVtcjnJkHh+ouA9Z9yhJEtgOHWKgNMeFjGFDqr6xA P2bWQVkeAmZ6BZe8cZ8UPwUClMVFTy+8WNfuzCXWbu0bF27/4i9CuMFohCo+qQQL1WLjsv pJV7dpvF0FcytjvqQ5z3RfkakA2qjExZTbtU6rYmROH9MJVNos5Sh06RO76Ppg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=VyF8iuHw; dkim=fail ("body hash did not verify") header.d=autistici.org header.s=stigmate header.b=pPcIYDd3; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id A6B107FA50 for ; Wed, 21 Aug 2024 00:16:37 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sgX9J-0000gT-5R; Tue, 20 Aug 2024 18:16:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sgX9H-0000fz-IE for guix-patches@gnu.org; Tue, 20 Aug 2024 18:16:19 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sgX9H-0005bB-7g for guix-patches@gnu.org; Tue, 20 Aug 2024 18:16:19 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:In-Reply-To:References:Subject; bh=/CpPWDx7HwQALqpfdG3azWXP5XxyeNDYiiPlqyW8amo=; b=VyF8iuHwwHFnvgt1PAxurV8F0iFBF+xHgz4V/lpebVMw5JtsZ8V7VrJCqFqVoh86tBRXIywmnXpuxb1p3n9rkFLsE6ANc8dAVuknxx4N7TqTXynxI3MdMdnxjvqJQ9H/lY45j4wNyba9xGFek1zBEx/UVdOzbN8U/Bj7VHbiMQigf2FqRPurfyTuh+d5KMeh/YqOjDKwVC2rr937msxW1Yehn1OgTGD2LCwYxKf0DqldXjdFVPDGGiVWLHoYxy2pJxFW+wCOUUJvoUofxqFwVRrD8bHY4FwgkqQZuqmiQUXOodjpYZjH3Wd8pnfBhcsP5QXU9E0f5LARjz5IMZmcjw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sgX9y-0008Ld-Of for guix-patches@gnu.org; Tue, 20 Aug 2024 18:17:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72337] [PATCH v3 1/3] accounts: Add /etc/subuid and /etc/subgid support. References: In-Reply-To: Resent-From: Giacomo Leidi Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 20 Aug 2024 22:17:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72337 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 72337@debbugs.gnu.org Cc: Giacomo Leidi Received: via spool by 72337-submit@debbugs.gnu.org id=B72337.172419217831997 (code B ref 72337); Tue, 20 Aug 2024 22:17:02 +0000 Received: (at 72337) by debbugs.gnu.org; 20 Aug 2024 22:16:18 +0000 Received: from localhost ([127.0.0.1]:33773 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sgX9F-0008K1-QE for submit@debbugs.gnu.org; Tue, 20 Aug 2024 18:16:18 -0400 Received: from confino.investici.org ([93.190.126.19]:36729) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sgX9D-0008Jq-I1 for 72337@debbugs.gnu.org; Tue, 20 Aug 2024 18:16:16 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=autistici.org; s=stigmate; t=1724192124; bh=/CpPWDx7HwQALqpfdG3azWXP5XxyeNDYiiPlqyW8amo=; h=From:To:Cc:Subject:Date:From; b=pPcIYDd3SDvy4Q0SBvTv/IeSbsbzwUuLUosMfcWfupoiflDxKOPJ8lAysWLx6+KIF kAzfMq8zZHEZxYouWK2wHTX5Riuivo0DcQQDVZ2lakwbN5Nxkg2/OtYzN1EaL8mZBv pihetJHQ2Z7nsxJSUFG5FDYIsopTqVTGA0dUlzTw= Received: from mx1.investici.org (unknown [127.0.0.1]) by confino.investici.org (Postfix) with ESMTP id 4WpP0r1Ccsz10yR; Tue, 20 Aug 2024 22:15:24 +0000 (UTC) Received: from [93.190.126.19] (mx1.investici.org [93.190.126.19]) (Authenticated sender: goodoldpaul@autistici.org) by localhost (Postfix) with ESMTPSA id 4WpP0r0Tmvz10y9; Tue, 20 Aug 2024 22:15:24 +0000 (UTC) Date: Wed, 21 Aug 2024 00:14:55 +0200 Message-ID: X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Giacomo Leidi X-ACL-Warn: , Giacomo Leidi via Guix-patches From: Giacomo Leidi via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -2.57 X-Spam-Score: -2.57 X-Migadu-Queue-Id: A6B107FA50 X-Migadu-Scanner: mx11.migadu.com X-TUID: 0Hco/Pai0D35 This commit adds a new record type, and serializers and deserializers for it in (gnu build accounts). Each instance of this record represents one line in either /etc/subuid or /etc/subgid. Since Shadow uses the same representation for both files, it should be ok if we do it as well. This commit adds also , a user facing representation of . It is supposed to be usable directly in OS configurations. * gnu/build/accounts.scm (subid-entry): New record; (write-subgid): add serializer for subgids; (write-subuid): add serializer for subuids; (read-subgid): add serializer for subgids; (read-subuid): add serializer for subuids. * gnu/system/accounts.scm (subid-range): New record. * test/accounts.scm: Test them. Change-Id: I6b037e40e354c069bf556412bb5b626bd3ea1b2c --- gnu/build/accounts.scm | 37 ++++++++++++++++++++++++--- gnu/system/accounts.scm | 17 +++++++++++++ tests/accounts.scm | 55 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 106 insertions(+), 3 deletions(-) diff --git a/gnu/build/accounts.scm b/gnu/build/accounts.scm index fa6f454b5e..ea8c69f205 100644 --- a/gnu/build/accounts.scm +++ b/gnu/build/accounts.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2019, 2021, 2023 Ludovic Courtès +;;; Copyright © 2024 Giacomo Leidi ;;; ;;; This file is part of GNU Guix. ;;; @@ -51,13 +52,23 @@ (define-module (gnu build accounts) group-entry-gid group-entry-members + subid-entry + subid-entry? + subid-entry-name + subid-entry-start + subid-entry-count + %password-lock-file write-group write-passwd write-shadow + write-subgid + write-subuid read-group read-passwd read-shadow + read-subgid + read-subuid %id-min %id-max @@ -68,11 +79,12 @@ (define-module (gnu build accounts) ;;; Commentary: ;;; -;;; This modules provides functionality equivalent to the C library's +;;; This module provides functionality equivalent to the C library's ;;; , , and routines, as well as a subset of the ;;; functionality of the Shadow command-line tools. It can parse and write -;;; /etc/passwd, /etc/shadow, and /etc/group. It can also take care of UID -;;; and GID allocation in a way similar to what 'useradd' does. +;;; /etc/passwd, /etc/shadow, /etc/group, /etc/subuid and /etc/subgid. It can +;;; also take care of UID and GID allocation in a way similar to what 'useradd' +;;; does. The same goes for sub UID and sub GID allocation. ;;; ;;; The benefit is twofold: less code is involved, and the ID allocation ;;; strategy and state preservation is made explicit. @@ -225,6 +237,17 @@ (define-database-entry ; (serialization list->comma-separated comma-separated->list) (default '()))) +(define-database-entry ; + subid-entry make-subid-entry + subid-entry? + (serialization #\: subid-entry->string string->subid-entry) + + (name subid-entry-name) + (start subid-entry-start + (serialization number->string string->number)) + (count subid-entry-count + (serialization number->string string->number))) + (define %password-lock-file ;; The password database lock file used by libc's 'lckpwdf'. Users should ;; grab this lock with 'with-file-lock' when they access the databases. @@ -265,6 +288,10 @@ (define write-shadow (database-writer "/etc/shadow" #o600 shadow-entry->string)) (define write-group (database-writer "/etc/group" #o644 group-entry->string)) +(define write-subuid + (database-writer "/etc/subuid" #o644 subid-entry->string)) +(define write-subgid + (database-writer "/etc/subgid" #o644 subid-entry->string)) (define (database-reader file string->entry) (lambda* (#:optional (file-or-port file)) @@ -287,6 +314,10 @@ (define read-shadow (database-reader "/etc/shadow" string->shadow-entry)) (define read-group (database-reader "/etc/group" string->group-entry)) +(define read-subuid + (database-reader "/etc/subuid" string->subid-entry)) +(define read-subgid + (database-reader "/etc/subgid" string->subid-entry)) ;;; diff --git a/gnu/system/accounts.scm b/gnu/system/accounts.scm index 586cff1842..9a006c188d 100644 --- a/gnu/system/accounts.scm +++ b/gnu/system/accounts.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès +;;; Copyright © 2024 Giacomo Leidi ;;; ;;; This file is part of GNU Guix. ;;; @@ -39,6 +40,12 @@ (define-module (gnu system accounts) user-group-id user-group-system? + subid-range + subid-range? + subid-range-name + subid-range-start + subid-range-count + sexp->user-account sexp->user-group @@ -85,6 +92,16 @@ (define-record-type* (system? user-group-system? ; Boolean (default #f))) +(define-record-type* + subid-range make-subid-range + subid-range? + (name subid-range-name) + (start subid-range-start (default #f)) ; number + (count subid-range-count ; number + ; from find_new_sub_gids.c and + ; find_new_sub_uids.c + (default 65536))) + (define (default-home-directory account) "Return the default home directory for ACCOUNT." (string-append "/home/" (user-account-name account))) diff --git a/tests/accounts.scm b/tests/accounts.scm index 78136390bb..4944c22f49 100644 --- a/tests/accounts.scm +++ b/tests/accounts.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2019 Ludovic Courtès +;;; Copyright © 2024 Giacomo Leidi ;;; ;;; This file is part of GNU Guix. ;;; @@ -41,6 +42,16 @@ (define %shadow-sample charlie:" (crypt "hey!" "$6$abc") ":17169:::::: nobody:!:0::::::\n")) +(define %subuid-sample + "\ +root:100000:300 +ada:100300:300\n") + +(define %subgid-sample + "\ +root:100000:600 +ada:100600:300\n") + (test-begin "accounts") @@ -135,6 +146,50 @@ (define %shadow-sample read-shadow) port)))) +(test-equal "write-subuid" + %subuid-sample + (call-with-output-string + (lambda (port) + (write-subuid (list (subid-entry + (name "root") + (start 100000) + (count 300)) + (subid-entry + (name "ada") + (start 100300) + (count 300))) + port)))) + +(test-equal "read-subuid + write-subuid" + %subuid-sample + (call-with-output-string + (lambda (port) + (write-subuid (call-with-input-string %subuid-sample + read-subuid) + port)))) + +(test-equal "write-subgid" + %subgid-sample + (call-with-output-string + (lambda (port) + (write-subgid (list (subid-entry + (name "root") + (start 100000) + (count 600)) + (subid-entry + (name "ada") + (start 100600) + (count 300))) + port)))) + +(test-equal "read-subgid + write-subgid" + %subgid-sample + (call-with-output-string + (lambda (port) + (write-subgid (call-with-input-string %subgid-sample + read-subgid) + port)))) + (define allocate-groups (@@ (gnu build accounts) allocate-groups)) (define allocate-passwd (@@ (gnu build accounts) allocate-passwd)) base-commit: 00245fdcd4909d7e6b20fe88f5d089717115adc1 -- 2.45.2