From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id ACc8KVeBXGLqTgEAgWs5BA (envelope-from ) for ; Sun, 17 Apr 2022 23:06:31 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id UNuPJleBXGIeWgAA9RJhRA (envelope-from ) for ; Sun, 17 Apr 2022 23:06:31 +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 34956286AF for ; Sun, 17 Apr 2022 23:06:31 +0200 (CEST) Received: from localhost ([::1]:40098 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ngC6I-0007X3-1K for larch@yhetil.org; Sun, 17 Apr 2022 17:06:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:32908) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ngC5u-0006Ll-Un for guix-patches@gnu.org; Sun, 17 Apr 2022 17:06:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:43553) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ngC5u-0000Z5-Ef for guix-patches@gnu.org; Sun, 17 Apr 2022 17:06:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ngC5u-000276-9S for guix-patches@gnu.org; Sun, 17 Apr 2022 17:06:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54997] [PATCH 12/12] 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: Sun, 17 Apr 2022 21:06:06 +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.16502295608029 (code B ref 54997); Sun, 17 Apr 2022 21:06:06 +0000 Received: (at 54997) by debbugs.gnu.org; 17 Apr 2022 21:06:00 +0000 Received: from localhost ([127.0.0.1]:37438 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ngC5n-00025L-P7 for submit@debbugs.gnu.org; Sun, 17 Apr 2022 17:06:00 -0400 Received: from eggs.gnu.org ([209.51.188.92]:39506) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ngC5d-00022g-KA for 54997@debbugs.gnu.org; Sun, 17 Apr 2022 17:05:50 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:58448) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ngC5Y-0000Wi-EW; Sun, 17 Apr 2022 17:05:44 -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=kJTPUmXGQfA/lMRs3JGx fKkn4nbbyBxAJP50lBLakQxrwcvjvfPG5Celi1p/aVm6sCTQG0N6w3mGs28frfyEEA4m7va51QImI MxMkVw3QeuAvoL15EaNeurv2VDNeIQiRu/DiCe+HsOVYzFQHfxUOu6BqQ+MmuLL6DhwGUH23XtZYk xpSt1QP6aRw8pgNoCXLAOrxkm0uQdPQ7dD3cCkU1TG2lDPLzwI8fjBGnPXPtCSjD/GMUgx+REyzTx Bz+iFA6BKqYRk0GahtvO87eS2syncxeHVJZ1Hy0DudYsuME54ykdaeVtOkDz+V1tDj9IMrNaxSBsD V+Vlm4QAkXC3GQ==; Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=38870 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 1ngC5Y-000268-2P; Sun, 17 Apr 2022 17:05:44 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Date: Sun, 17 Apr 2022 23:04:53 +0200 Message-Id: <20220417210453.27884-12-ludo@gnu.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220417210453.27884-1-ludo@gnu.org> References: <20220417210453.27884-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=1650229591; 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=Ov9swtTmjyNd+iI7FkfXhcvsckYmL5ob103iRzccRG/z++5jFPUcvYfA9bP0gaqQ3gUmnB VG7Lb4sG9iD0D5LJg+/QZiVIgwHW5N2vrvAuceU6pLDOEu8dHkjeA3Nbpu+9UiYTTc6OuE dN9JBrtORhcZqPNVoVTWP/aoTsKMel+VqPhfUkSkw7T5PRo3P8JBS3icualCP5N05FIajB O8g1O85ADs2CzXH1NWCGF3fhzaFnXsEVpQXO415Ra0FRwBqigHeLnP+saityvPNzaM1ZuL YnfuKAqPCZoVwvNO9jTujbJlBCXutB09GYUw4q8jCIb4vDourptkxUyxUTQFdg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1650229591; a=rsa-sha256; cv=none; b=pngQgTdKXWjFF0r3/eSdxHChEhq73DcUGLBJ7EGoZpS13qaHRADlw+awZQA+a2bGRgMM8N I2pUABzU+eAWpSq5r91zZg6m6Qwa9zRFr9oMC8r7mwiBjU+fsBzzUos0WZPypWUE7e7+RK 9NPWKpcphuZE0JKo0udKHAIxfvR+zDyBdafJnx8Q9FSUW/owmXTv8siqunmDgrsmdmsrcJ xVTOchFGhYqIUukP1lEnKWdugBG6xWSWbNZ6V0jqn109r5+Xa3/A+jM+KtizOxMQGrWY1L NXhFPUyUmVEhzgmTTKI3A4+D3sTIZNjs2IWXEUTVNGBizhkvXHSzEd16oZg/PQ== 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=kJTPUmXG; 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: -0.94 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=kJTPUmXG; 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: 34956286AF X-Spam-Score: -0.94 X-Migadu-Scanner: scn1.migadu.com X-TUID: oYOlUJCxKEzI * 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