SHA256
1
0
forked from pool/shadow

Accepting request 1043310 from Base:System

- bsc#1205502: Fix useradd audit event logging of ID field
  * Add shadow-audit-no-id.patch

OBS-URL: https://build.opensuse.org/request/show/1043310
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/shadow?expand=0&rev=53
This commit is contained in:
Dominique Leuenberger 2022-12-18 16:22:23 +00:00 committed by Git OBS Bridge
commit 50d83362ee
3 changed files with 45 additions and 0 deletions

36
shadow-audit-no-id.patch Normal file
View File

@ -0,0 +1,36 @@
From 3cfc7955b33c85472a7cf11a0ecf1c6851db7c26 Mon Sep 17 00:00:00 2001
From: Michael Vetter <jubalh@iodoru.org>
Date: Thu, 15 Dec 2022 11:52:58 +0100
Subject: [PATCH] Fix useradd audit event logging of ID field
When useradd sends its ADD_USER event, it is filling in the id field. This is not yet written to disk. When auditd sees the event and the log format is enriched, auditd tries to lookup the user name but it does not exist. This causes the event to never be resolvable since ausearch relies on the lookup information attached by auditd.
The fix is to not send the id information for any event until after close_files() is called. Just the acct field is all that is
Patch by Steve Grubb (afaik).
Reported at https://bugzilla.redhat.com/show_bug.cgi?id=1713432
---
src/useradd.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/useradd.c b/src/useradd.c
index e59e47681..87abd6e33 100644
--- a/src/useradd.c
+++ b/src/useradd.c
@@ -2225,9 +2225,14 @@ static void usr_update (unsigned long subuid_count, unsigned long subgid_count)
#endif /* ENABLE_SUBIDS */
#ifdef WITH_AUDIT
+ /*
+ * Even though we have the ID of the user, we won't send it now
+ * because its not written to disk yet. After close_files it is
+ * and we can use the real ID thereafter.
+ */
audit_logger (AUDIT_ADD_USER, Prog,
"adding user",
- user_name, (unsigned int) user_id,
+ user_name, AUDIT_NO_ID,
SHADOW_AUDIT_SUCCESS);
#endif
/*

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Dec 16 10:04:44 UTC 2022 - Michael Vetter <mvetter@suse.com>
- bsc#1205502: Fix useradd audit event logging of ID field
* Add shadow-audit-no-id.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Nov 8 21:15:44 UTC 2022 - Michael Vetter <mvetter@suse.com> Tue Nov 8 21:15:44 UTC 2022 - Michael Vetter <mvetter@suse.com>

View File

@ -57,6 +57,8 @@ Patch6: shadow-login_defs-suse.patch
Patch7: useradd-userkeleton.patch Patch7: useradd-userkeleton.patch
# PATCH-FIX-SUSE disable_new_audit_function.patch adam.majer@suse.de -- Disable newer libaudit functionality for older distributions. # PATCH-FIX-SUSE disable_new_audit_function.patch adam.majer@suse.de -- Disable newer libaudit functionality for older distributions.
Patch8: disable_new_audit_function.patch Patch8: disable_new_audit_function.patch
# PATCH-FIX-UPSTREAM shadow-audit-no-id.patch mvetter@suse.com -- Fix useradd audit event logging of ID field (bsc#1205502) (gh/shadow-maint/shadow#606)
Patch9: shadow-audit-no-id.patch
BuildRequires: audit-devel > 2.3 BuildRequires: audit-devel > 2.3
BuildRequires: autoconf BuildRequires: autoconf
BuildRequires: automake BuildRequires: automake
@ -126,6 +128,7 @@ Development files for libsubid4.
%if 0%{?suse_version} < 1330 %if 0%{?suse_version} < 1330
%patch8 -p1 %patch8 -p1
%endif %endif
%patch9 -p1
iconv -f ISO88591 -t utf-8 doc/HOWTO > doc/HOWTO.utf8 iconv -f ISO88591 -t utf-8 doc/HOWTO > doc/HOWTO.utf8
mv -v doc/HOWTO.utf8 doc/HOWTO mv -v doc/HOWTO.utf8 doc/HOWTO