pam_faillock: change /run/faillock/$USER permissions to 0660

This reverts commit 04993bd30f.

pam-1.3.1-determinine-user-exists.patch

@@ -0,0 +1,67 @@
+diff -up Linux-PAM-1.3.1/modules/pam_unix/passverify.c.determinine-user-exists Linux-PAM-1.3.1/modules/pam_unix/passverify.c
+--- Linux-PAM-1.3.1/modules/pam_unix/passverify.c.determinine-user-exists	2020-06-17 15:34:08.089162532 +0200
++++ Linux-PAM-1.3.1/modules/pam_unix/passverify.c	2020-06-17 15:36:13.233294407 +0200
+@@ -1087,6 +1087,12 @@ helper_verify_password(const char *name,
+ 	if (pwd == NULL || salt == NULL) {
+ 		helper_log_err(LOG_NOTICE, "check pass; user unknown");
+ 		retval = PAM_USER_UNKNOWN;
++	} else if (p[0] == '\0' && nullok) {
++		if (salt[0] == '\0') {
++			retval = PAM_SUCCESS;
++		} else {
++			retval = PAM_AUTH_ERR;
++		}
+ 	} else {
+ 		retval = verify_pwd_hash(p, salt, nullok);
+ 	}
+diff -up Linux-PAM-1.3.1/modules/pam_unix/support.c.determinine-user-exists Linux-PAM-1.3.1/modules/pam_unix/support.c
+--- Linux-PAM-1.3.1/modules/pam_unix/support.c.determinine-user-exists	2020-06-17 15:34:08.090162549 +0200
++++ Linux-PAM-1.3.1/modules/pam_unix/support.c	2020-06-17 15:34:08.101162736 +0200
+@@ -672,6 +672,8 @@ _unix_blankpasswd (pam_handle_t *pamh, u
+ 	struct passwd *pwd = NULL;
+ 	char *salt = NULL;
+ 	int retval;
++	int execloop = 1;
++	int nonexistent = 1;
+ 
+ 	D(("called"));
+ 
+@@ -686,14 +688,31 @@ _unix_blankpasswd (pam_handle_t *pamh, u
+ 
+ 	/* UNIX passwords area */
+ 
+-	retval = get_pwd_hash(pamh, name, &pwd, &salt);
++	/*
++	 * Execute this loop twice: one checking the password hash of an existing
++	 * user and another one for a non-existing user. This way the runtimes
++	 * are equal, making it more difficult to differentiate existing from
++	 * non-existing users.
++	 */
++	while (execloop) {
++		retval = get_pwd_hash(pamh, name, &pwd, &salt);
+ 
+-	if (retval == PAM_UNIX_RUN_HELPER) {
+-		/* salt will not be set here so we can return immediately */
+-		if (_unix_run_helper_binary(pamh, NULL, ctrl, name) == PAM_SUCCESS)
+-			return 1;
+-		else
+-			return 0;
++		if (retval == PAM_UNIX_RUN_HELPER) {
++			execloop = 0;
++			if(nonexistent) {
++				get_pwd_hash(pamh, "pam_unix_non_existent:", &pwd, &salt);
++			}
++			/* salt will not be set here so we can return immediately */
++			if (_unix_run_helper_binary(pamh, NULL, ctrl, name) == PAM_SUCCESS)
++				return 1;
++			else
++				return 0;
++		} else if (retval == PAM_USER_UNKNOWN) {
++			name = "root";
++			nonexistent = 0;
++		} else {
++			execloop = 0;
++		}
+ 	}
+ 
+ 	/* Does this user have a password? */

pam-1.3.1-faillock-change-file-permissions.patch

@@ -0,0 +1,50 @@
+From 395915dae1571e10e2766c999974de864655ea3a Mon Sep 17 00:00:00 2001
+From: ikerexxe <ipedrosa@redhat.com>
+Date: Mon, 15 Jun 2020 09:52:11 +0200
+Subject: [PATCH] pam_faillock: change /run/faillock/$USER permissions to 0660
+
+Nowadays, /run/faillock/$USER files have user:root ownership and 0600
+permissions. This forces the process that writes to these files to have
+CAP_DAC_OVERRIDE capabilites. Just by changing the permissions to 0660
+the capability can be removed, which leads to a more secure system.
+
+Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1661822
+---
+ modules/pam_faillock/faillock.c | 14 +++++++++++++-
+ 1 file changed, 13 insertions(+), 1 deletion(-)
+
+diff --git a/modules/pam_faillock/faillock.c b/modules/pam_faillock/faillock.c
+index e492f5f9..4ea94cbe 100644
+--- a/modules/pam_faillock/faillock.c
++++ b/modules/pam_faillock/faillock.c
+@@ -76,7 +76,7 @@ open_tally (const char *dir, const char *user, uid_t uid, int create)
+ 		flags |= O_CREAT;
+ 	}
+ 
+-	fd = open(path, flags, 0600);
++	fd = open(path, flags, 0660);
+ 
+ 	free(path);
+ 
+@@ -88,6 +88,18 @@ open_tally (const char *dir, const char *user, uid_t uid, int create)
+ 			if (st.st_uid != uid) {
+ 				ignore_return(fchown(fd, uid, -1));
+ 			}
++
++			/*
++			 * If umask is set to 022, as will probably in most systems, then the
++			 * group will not be able to write to the file. So, change the file
++			 * permissions just in case.
++			 * Note: owners of this file are user:root, so if the permissions are
++			 * not changed the root process writing to this file will require
++			 * CAP_DAC_OVERRIDE.
++			 */
++			if (!(st.st_mode & S_IWGRP)) {
++				ignore_return(fchmod(fd, 0660));
++			}
+ 		}
+ 	}
+ 
+-- 
+2.26.2
+

pam.spec

@@ -3,7 +3,7 @@
 Summary: An extensible library which provides authentication for applications
 Name: pam
 Version: 1.3.1
-Release: 21%{?dist}
+Release: 25%{?dist}
 # The library is BSD licensed with option to relicense as GPLv2+
 # - this option is redundant as the BSD license allows that anyway.
 # pam_timestamp, pam_loginuid, and pam_console modules are GPLv2+.
@@ -60,6 +60,10 @@ Patch48: pam-1.3.1-unix-improve-logging.patch
 Patch49: pam-1.3.1-tty-audit-manfix.patch
 Patch50: pam-1.3.1-fds-closing.patch
 Patch51: pam-1.3.1-authtok-verify-fix.patch
+# Upstreamed
+Patch52: pam-1.3.1-determinine-user-exists.patch
+# Upstreamed
+Patch53: pam-1.3.1-faillock-change-file-permissions.patch
 
 %global _pamlibdir %{_libdir}
 %global _moduledir %{_libdir}/security
@@ -150,6 +154,8 @@ cp %{SOURCE18} .
 %patch49 -p1 -b .tty-audit-manfix
 %patch50 -p1 -b .fds-closing
 %patch51 -p1 -b .authtok-verify-fix
+%patch52 -p1 -b .determinine-user-exists
+%patch53 -p1 -b .faillock-change-file-permissions
 
 autoreconf -i
 
@@ -399,6 +405,18 @@ done
 %doc doc/specs/rfc86.0.txt
 
 %changelog
+* Fri Jul 10 2020 Iker Pedrosa <ipedrosa@redhat.com> - 1.3.1-25
+- pam_faillock: change /run/faillock/$USER permissions to 0660 (#1661822)
+
+* Wed Jun 24 2020 Iker Pedrosa <ipedrosa@redhat.com> - 1.3.1-24
+- pam_unix and pam_usertype: avoid determining if user exists (#1629598)
+
+* Fri Mar 13 2020 Iker Pedrosa <ipedrosa@redhat.com> - 1.3.1-23
+- revert previous change
+
+* Mon Mar 9 2020 Iker Pedrosa <ipedrosa@redhat.com> - 1.3.1-22
+- pam_selinux: check unknown object classes or permissions in current policy
+
 * Wed Dec 18 2019 Tomáš Mráz <tmraz@redhat.com> 1.3.1-21
 - pam_faillock: Fix regression in admin_group support