From: Fabian Bläse <fabian@blaese.de>
Date: Tue, 17 Mar 2020 15:55:57 +0000 (+0100)
Subject: session: deny access if password login is disabled
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=3df62bcebd2caff47506ccffb42df8d2d2123c06;p=oweals%2Frpcd.git

session: deny access if password login is disabled

The special characters '!' and '*' in /etc/shadow are
used to disable password login for a specific account.

The character 'x' has no special meaning, but should not
be interpreted as an empty password.

However, rpcd did treat these special characters like no
password was set, which allows access even though the account
is disabled.

By removing the additional checks for these characters, the
encrypted password string is passed to crypt, which returns NULL
if the salt has an invalid format and therefore access is denied.

Fixes: FS#2634

Signed-off-by: Fabian Bläse <fabian@blaese.de>
---

diff --git a/session.c b/session.c
index 13a2ef3..908e298 100644
--- a/session.c
+++ b/session.c
@@ -795,7 +795,7 @@ rpc_login_test_password(const char *hash, const char *password)
 	char *crypt_hash;
 
 	/* password is not set */
-	if (!hash || !*hash || !strcmp(hash, "!") || !strcmp(hash, "x"))
+	if (!hash || !*hash)
 	{
 		return true;
 	}