From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id 8MyhDwh3aWKJEQAAbAwnHQ (envelope-from ) for ; Wed, 27 Apr 2022 19:02:00 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id UCzODwh3aWKDDAAAauVa8A (envelope-from ) for ; Wed, 27 Apr 2022 19:02:00 +0200 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 0237026EA6 for ; Wed, 27 Apr 2022 19:02:00 +0200 (CEST) Received: from localhost ([::1]:34864 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1njl38-0001Xx-N8 for larch@yhetil.org; Wed, 27 Apr 2022 13:01:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34762) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1njkzQ-0004bX-CP for guix-patches@gnu.org; Wed, 27 Apr 2022 12:58:08 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50281) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1njkzQ-0005DM-1T for guix-patches@gnu.org; Wed, 27 Apr 2022 12:58:08 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1njkzQ-0003uv-0p for guix-patches@gnu.org; Wed, 27 Apr 2022 12:58:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54997] [PATCH v2 14/15] services: quassel: Use 'least-authority-wrapper'. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 27 Apr 2022 16:58:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54997 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54997@debbugs.gnu.org Cc: Ludovic =?UTF-8?Q?Court=C3=A8s?= Received: via spool by 54997-submit@debbugs.gnu.org id=B54997.165107864914876 (code B ref 54997); Wed, 27 Apr 2022 16:58:07 +0000 Received: (at 54997) by debbugs.gnu.org; 27 Apr 2022 16:57:29 +0000 Received: from localhost ([127.0.0.1]:44155 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1njkyn-0003rl-8S for submit@debbugs.gnu.org; Wed, 27 Apr 2022 12:57:29 -0400 Received: from eggs.gnu.org ([209.51.188.92]:41222) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1njkyN-0003oW-6U for 54997@debbugs.gnu.org; Wed, 27 Apr 2022 12:57:05 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:60030) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1njkyH-00054W-N0; Wed, 27 Apr 2022 12:56:57 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=3JvzXej9xh9iqV8fsnLduF9DnXG51SXcve0a7fRlY0U=; b=NXgpRzLwMtnNR2USaS93 Att0o+Rno06Umqu0lM5WvQAXg0PaoB5BUag4HMGOatwUc+m9qF/udGD3XN7q341VHXKPAVENJ/9/m NfNpESiK3TohTJdTf/q6wj2Vks032NlJKORm8klI8VEacnkLSp1CTp/QQ9tXBm4BE7VUIGkkyjivK TPHONg8kp4kL2krASKNocgH5/hWc+pa0L6GFcLr/Q3//h4aEydw6jJPoWD+EufHRwS/MIhIx8hmqB eVxcPdh/6zIFPbDo2gsYmM2hUYNh0VaGfhDHq/McsAgJTWZJHcv2i0mjyAPhmOqaMX72I16Rz1Dye kGO53PZTV6g0Mg==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201]:64439 helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1njkyH-0000Hl-72; Wed, 27 Apr 2022 12:56:57 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Date: Wed, 27 Apr 2022 18:56:34 +0200 Message-Id: <20220427165635.8015-15-ludo@gnu.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220427165635.8015-1-ludo@gnu.org> References: <878rrrk1v1.fsf_-_@gnu.org> <20220427165635.8015-1-ludo@gnu.org> MIME-Version: 1.0 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: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1651078920; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: 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=3JvzXej9xh9iqV8fsnLduF9DnXG51SXcve0a7fRlY0U=; b=gNXBWHsj6fxpkt84F5sRO2/HwZT5wNwvxbX1c/2ESDr0hFAWqax7AWd5Kxq+xHFHc7mZzK r1d5B9siUS+bXhZdLbVuefZK2ZV3C/XTqISEN8J77GORYmhGSg0HN3hH7V008w8vSOmlSd P4Ypq0DIEucKKGlx/lK6X2xZSZ6pbCvnkHSGHNrhaHYjhONJlsYnpWSHLnWIXy9wF5KfNa ycUZgwiSMbvkaCKhIQLEXGj+1EhBymHAeBf2Wpt2wDBkG8CFYk9F4l2pYp557mnWsVKFPt YGLyyZAq15MNk4DpGIlTTPccPyGXL0ib+FZMDYd1KVKozMKcze2extEqykO8NA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1651078920; a=rsa-sha256; cv=none; b=DYjXz2jAzCMV9sB5qdsImp/T7wt903pi3QBOiFlWNhq1lGDBaHH4ZF6O+brFPk76WKtAKq iqygFp0YZTnVGqWCOkGjUkU7qWmjmilSK16RcfIbRGTiyVUOnZt183LEzVVrfnfu7Bt1cx V8UYH3zOxNQm/a8w9MnwNn1ZJW5gPKvO+I8rlwhZ33yTAEfrnmlzGQJkzVd9ep/WSAIyGw DWYcm+RuK/ea4wcLWwVH9LSUUagWXVHoMUPhLht/nMniW6LgY1ouvQ3ktH91bE+Hwa82QK 8LmBcj8Nf+qdG+XYcGhPV0U/fMCvnY+fT5jMiyszGwB0cxP7zM1uBAGLiI3NdA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=NXgpRzLw; 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" X-Migadu-Spam-Score: -2.40 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=NXgpRzLw; 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" X-Migadu-Queue-Id: 0237026EA6 X-Spam-Score: -2.40 X-Migadu-Scanner: scn1.migadu.com X-TUID: iqblZGbtL5Gx * gnu/services/messaging.scm (quassel-shepherd-service): Use 'least-authority-wrapper' instead of 'make-forkexec-constructor/container'. --- gnu/services/messaging.scm | 42 ++++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/gnu/services/messaging.scm b/gnu/services/messaging.scm index 7fdd8cf285..05bf6e784b 100644 --- a/gnu/services/messaging.scm +++ b/gnu/services/messaging.scm @@ -939,29 +939,31 @@ (define-record-type* (define quassel-shepherd-service (match-lambda (($ quassel interface port loglevel) - (with-imported-modules (source-module-closure - '((gnu build shepherd) - (gnu system file-systems))) + (let ((quassel (least-authority-wrapper + (file-append quassel "/bin/quasselcore") + #:name "quasselcore" + #:mappings (list (file-system-mapping + (source "/var/lib/quassel") + (target source) + (writable? #t)) + (file-system-mapping + (source "/var/log/quassel") + (target source) + (writable? #t))) + ;; XXX: The daemon needs to live in the main user + ;; namespace, as root, so it can access /var/lib/quassel + ;; owned by "quasselcore". + #:namespaces (fold delq %namespaces '(net user))))) (list (shepherd-service (provision '(quassel)) (requirement '(user-processes networking)) - (modules '((gnu build shepherd) - (gnu system file-systems))) - (start #~(make-forkexec-constructor/container - (list #$(file-append quassel "/bin/quasselcore") - "--configdir=/var/lib/quassel" - "--logfile=/var/log/quassel/core.log" - (string-append "--loglevel=" #$loglevel) - (string-append "--port=" (number->string #$port)) - (string-append "--listen=" #$interface)) - #:mappings (list (file-system-mapping - (source "/var/lib/quassel") - (target source) - (writable? #t)) - (file-system-mapping - (source "/var/log/quassel") - (target source) - (writable? #t))))) + (start #~(make-forkexec-constructor + (list #$quassel + "--configdir=/var/lib/quassel" + "--logfile=/var/log/quassel/core.log" + (string-append "--loglevel=" #$loglevel) + (string-append "--port=" (number->string #$port)) + (string-append "--listen=" #$interface)))) (stop #~(make-kill-destructor)))))))) (define %quassel-account -- 2.35.1