From: Liliana Marie Prikler <liliana.prikler@gmail.com>
To: fesoj000 <fesoj000@gmail.com>, 54309@debbugs.gnu.org
Subject: [bug#54309] What is the process from here?
Date: Fri, 18 Mar 2022 23:36:35 +0100 [thread overview]
Message-ID: <87f117ba35bb40fe063d5cd0bee61039a5f9801e.camel@gmail.com> (raw)
In-Reply-To: <fafb2565-5593-aabb-1852-2af4e7dd7478@gmail.com>
Am Freitag, dem 18.03.2022 um 22:48 +0100 schrieb fesoj000:
> On 3/18/22 9:06 PM, Liliana Marie Prikler wrote:
> > > So, i assume that there has to be interest and time from a guix
> > > developer to review, maybe test and then integrate the
> > > changes/packages into one of the branches.
> > Note that there have already been two people reviewing; you
> > currently
> > owe me a v2 addressing the TOCTOU "race" of creating the audit
> > directory without 700 permissions.
> Yes, that is true. But i addressed the rest, i think. New version
> inline.
For the record, inline patches generate noise that's hard to separate
when applying, so you'd probably want to avoid them. If you don't have
git send-email set up regular attachments also work for some, though
they do become tedious as well with series.
> From 0605a2b5cc8beb816e3ff557d7be060a050f91b7 Mon Sep 17 00:00:00
> 2001
> From: fesoj000 <fesoj000@gmail.com>
> Date: Wed, 9 Mar 2022 20:07:42 +0100
> Subject: [PATCH] services: auditd: use exclusive log directory for
> auditd
>
> Use /var/log/audit for auditd. This is the upstream default.
>
> Further, rework the config file generated by auditd-service-type.
> Only
> write values which diverge from the upstream default.
>
> * gnu/services/auditd.scm: add auditd-activation function and extend
> activation-service-type.
> ---
> gnu/services/auditd.scm | 20 +++++++++++++++-----
> 1 file changed, 15 insertions(+), 5 deletions(-)
>
> diff --git a/gnu/services/auditd.scm b/gnu/services/auditd.scm
> index abde811f51..602a6c5a48 100644
> --- a/gnu/services/auditd.scm
> +++ b/gnu/services/auditd.scm
> @@ -31,10 +31,10 @@ (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" "\
> +space_left = 5%
> +space_left_action = syslog
> +"))
I can understand discarding the log_file entry because we now use
upstream default, but the rest should remain imo.
> (define %default-auditd-configuration-directory
> (computed-file "auditd"
> @@ -50,6 +50,14 @@ (define-record-type* <auditd-configuration>
> (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))
> + (let ((var-log-audit "/var/log/audit"))
> + (umask #o077)
> + (mkdir-p var-log-audit)))))
> +
This would also apply umask 077 to /var and /var/log if those don't
already exist. More importantly, code executed after that will also
inherit the umask, which I don't think is the intended consequence.
Cheers
next prev parent reply other threads:[~2022-03-18 22:37 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-09 19:21 [bug#54309] [PATCH] services: auditd: use exclusive log directory for auditd fesoj000
2022-03-09 19:36 ` Maxime Devos
2022-03-09 20:44 ` fesoj000
2022-03-09 21:00 ` fesoj000
2022-03-10 7:12 ` Liliana Marie Prikler
2022-03-10 10:36 ` fesoj000
2022-03-10 16:29 ` fesoj000
2022-03-18 19:17 ` [bug#54309] What is the process from here? fesoj000
2022-03-18 20:06 ` Liliana Marie Prikler
2022-03-18 21:48 ` fesoj000
2022-03-18 22:36 ` Liliana Marie Prikler [this message]
2022-03-19 11:10 ` fesoj000
2022-03-19 23:09 ` Maxime Devos
2022-03-22 16:50 ` fesoj000
2022-03-22 20:06 ` Liliana Marie Prikler
2022-03-19 11:34 ` [bug#54309] [PATCH] services: auditd: use exclusive log directory for auditd fesoj000
2022-03-19 23:13 ` Maxime Devos
2022-03-20 20:22 ` fesoj000
2022-03-20 20:30 ` Maxime Devos
2022-03-20 20:35 ` Maxime Devos
2022-03-23 20:22 ` [bug#54309] [PATCHv2] " fesoj000
2022-03-23 20:39 ` [bug#54309] [PATCHv3] " fesoj000
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87f117ba35bb40fe063d5cd0bee61039a5f9801e.camel@gmail.com \
--to=liliana.prikler@gmail.com \
--cc=54309@debbugs.gnu.org \
--cc=fesoj000@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).