From patchwork Sat Mar 19 11:34:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: fesoj000 X-Patchwork-Id: 37946 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id D717B27BBEA; Sat, 19 Mar 2022 11:35:17 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 7254927BBE9 for ; Sat, 19 Mar 2022 11:35:17 +0000 (GMT) Received: from localhost ([::1]:59400 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nVXMa-0002QK-Ju for patchwork@mira.cbaines.net; Sat, 19 Mar 2022 07:35:16 -0400 Received: from eggs.gnu.org ([209.51.188.92]:46448) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nVXMM-0002PB-8K for guix-patches@gnu.org; Sat, 19 Mar 2022 07:35:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:37033) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nVXML-0000kZ-Vt for guix-patches@gnu.org; Sat, 19 Mar 2022 07:35:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nVXML-0001IV-SP for guix-patches@gnu.org; Sat, 19 Mar 2022 07:35:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54309] [PATCH] services: auditd: use exclusive log directory for auditd References: In-Reply-To: Resent-From: fesoj000 Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 19 Mar 2022 11:35:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54309 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54309@debbugs.gnu.org Received: via spool by 54309-submit@debbugs.gnu.org id=B54309.16476896874961 (code B ref 54309); Sat, 19 Mar 2022 11:35:01 +0000 Received: (at 54309) by debbugs.gnu.org; 19 Mar 2022 11:34:47 +0000 Received: from localhost ([127.0.0.1]:59163 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nVXM7-0001Hx-Ab for submit@debbugs.gnu.org; Sat, 19 Mar 2022 07:34:47 -0400 Received: from mail-ej1-f48.google.com ([209.85.218.48]:46818) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nVXM5-0001Hi-Bo for 54309@debbugs.gnu.org; Sat, 19 Mar 2022 07:34:45 -0400 Received: by mail-ej1-f48.google.com with SMTP id qx21so21386927ejb.13 for <54309@debbugs.gnu.org>; Sat, 19 Mar 2022 04:34:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:date:mime-version:user-agent:from:subject :content-language:to:content-transfer-encoding; bh=uKNaWvlncFhUDTgle8JtNcbH0aqqfFmIyj95YQb9gCc=; b=emhO0YsUQsvL4uh7sdEudM0pUyyTEPc4I6a/gWFr286VPrTNtg351W1u7HB77UgxgW tvH1zON83V48NUDwEf/aEl9tNC0s7czI9oKN7P3HVlXTG3UqJAegEoxKhwuRB7rdYicL 8dF4fIS1Ut2i7Uyxf84gQs8URoWnXDszJkZ0w+7p9OnbXRZwoo+BxbgvU8skSkuTlmxM FozrhgtuOMo8++nV2E/L7lSXJoCmy/aBe5+9r33BQgK4sMoujq7U16b4oI+cgDE7sZ0f NHQb8FUFLx3C28C5EJ5k1RJTaKyHwguTktec9MZOEJhZQoyXTmIIzKqh9DP3erDJc05P hc3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:from :subject:content-language:to:content-transfer-encoding; bh=uKNaWvlncFhUDTgle8JtNcbH0aqqfFmIyj95YQb9gCc=; b=NjNBxZuEX8PDWAXCBj4e2uAV9QXkZuNQYpH+zso/LtfLpzhsnY/NJ4OdItZK3JOvk8 1sLkfSwNCUSySHFVCHxKqPk5ImG7jYDom2ZhToFipG/eAWp1CyGpSmKOUW94ethK2i7s BxciQJtBhOKh20C/q4iMgyF1rioTTBuDSR0xbYAWVf+CydPG78JccCfNRUugahxbpw0i SDDwAyV4yPP3LdJE051sQdeFxEFhJ4EYlX1kLTt72s6HoDhIYtfXjwNyWLyupwWUvexL Kfs/lSnYgrOjSIWhj8ScUjb+bCBXFFxLPfCfDlnvGvK7z4VaqoifUs2xRwoj17Xs5hDG seJw== X-Gm-Message-State: AOAM530criElChXr6N/a0fVn8nvuaJN3sbh3RfBcoiaeS1LxH1F0oldS KkUdagaWhE3mgL1cuIyIt6nP3y56Rq8= X-Google-Smtp-Source: ABdhPJx/v+Yrf6/quVp15RQ0aOy4rr3uwRC0mZm2RLT7fzQpAmYRuyR9ghbrfZGCXDL7xNo1oDBrNQ== X-Received: by 2002:a17:907:6e8d:b0:6d7:1261:d468 with SMTP id sh13-20020a1709076e8d00b006d71261d468mr12736261ejc.390.1647689679321; Sat, 19 Mar 2022 04:34:39 -0700 (PDT) Received: from ?IPV6:2003:ee:af2f:e00:c2f9:c2bb:bf95:1fc5? (p200300eeaf2f0e00c2f9c2bbbf951fc5.dip0.t-ipconnect.de. [2003:ee:af2f:e00:c2f9:c2bb:bf95:1fc5]) by smtp.gmail.com with ESMTPSA id ka6-20020a170907990600b006ce54c95e3csm4733533ejc.161.2022.03.19.04.34.38 for <54309@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 19 Mar 2022 04:34:38 -0700 (PDT) Message-ID: Date: Sat, 19 Mar 2022 12:34:38 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.7.0 From: fesoj000 Content-Language: en-US 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Use /var/log/audit for auditd. This is the upstream default. Further, make the inline config file more readable. * gnu/services/auditd.scm: add auditd-activation function and extend activation-service-type. --- gnu/services/auditd.scm | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/gnu/services/auditd.scm b/gnu/services/auditd.scm index abde811f51..e9e19c61be 100644 --- a/gnu/services/auditd.scm +++ b/gnu/services/auditd.scm @@ -31,10 +31,15 @@ (define-module (gnu services auditd) %default-auditd-configuration-directory)) (define auditd.conf - (plain-file "auditd.conf" "log_file = /var/log/audit.log\nlog_format = \ -ENRICHED\nfreq = 1\nspace_left = 5%\nspace_left_action = \ -syslog\nadmin_space_left_action = ignore\ndisk_full_action = \ -ignore\ndisk_error_action = syslog\n")) + (plain-file "auditd.conf" "\ +log_format = ENRICHED +freq = 1 +space_left = 5% +space_left_action = syslog +admin_space_left_action = ignore +disk_full_action = ignore +disk_error_action = syslog +")) (define %default-auditd-configuration-directory (computed-file "auditd" @@ -50,6 +55,16 @@ (define-record-type* (default audit)) (configuration-directory auditd-configuration-configuration-directory)) ; file-like +(define (auditd-activation config) + (with-imported-modules '((guix build utils)) + #~(begin + (use-modules (guix build utils)) + ;; make sure /var/log exists before changing umask + (mkdir-p "/var/log") + (let* ((previous-umask (umask #o077))) + (mkdir-p "/var/log/audit") + (umask previous-umask))))) + (define (auditd-shepherd-service config) (let* ((audit (auditd-configuration-audit config)) (configuration-directory (auditd-configuration-configuration-directory config))) @@ -67,7 +82,9 @@ (define auditd-service-type (extensions (list (service-extension shepherd-root-service-type - auditd-shepherd-service))) + auditd-shepherd-service) + (service-extension activation-service-type + auditd-activation))) (default-value (auditd-configuration (configuration-directory %default-auditd-configuration-directory)))))