isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

When using AIX auth, don't display the AIX password incorrect message.

Browse Source 
Avoids a "3004-300 You entered an invalid login name or password"
message in addition to sudo's own "Sorry, try again" message.
This commit is contained in:
Todd C. Miller
2019-05-26 16:29:08 -06:00
parent 8c9b23b0ca
commit 07ed5b86f2
1 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
plugins/sudoers/auth/aix_auth.c
View File

@@ -147,6 +147,28 @@ sudo_aix_init(struct passwd *pw, sudo_auth *auth)
debug_return_int(AUTH_SUCCESS); debug_return_int(AUTH_SUCCESS);
} }
/* Ignore AIX password incorrect message */
static bool
sudo_aix_valid_message(const char *message)
{
const char *cp;
const char badpass_msgid[] = "3004-300";
debug_decl(sudo_aix_valid_message, SUDOERS_DEBUG_AUTH)
if (message == NULL || message[0] == '\0')
debug_return_bool(false);
/* Match "3004-300: You entered an invalid login name or password" */
for (cp = message; *cp != '\0'; cp++) {
if (isdigit((unsigned char)*cp)) {
if (strncmp(cp, badpass_msgid, strlen(badpass_msgid)) == 0)
debug_return_bool(false);
break;
}
}
debug_return_bool(true);
}
int int
sudo_aix_verify(struct passwd *pw, char *prompt, sudo_auth *auth, struct sudo_conv_callback *callback) sudo_aix_verify(struct passwd *pw, char *prompt, sudo_auth *auth, struct sudo_conv_callback *callback)
{ {
@@ -169,16 +191,8 @@ sudo_aix_verify(struct passwd *pw, char *prompt, sudo_auth *auth, struct sudo_co
if (result != 0) { if (result != 0) {
/* Display error message, if any. */ /* Display error message, if any. */
if (message != NULL) { if (sudo_aix_valid_message(message))
struct sudo_conv_message msg; sudo_printf(SUDO_CONV_ERROR_MSG, "%s", message);
struct sudo_conv_reply repl;
memset(&msg, 0, sizeof(msg));
msg.msg_type = SUDO_CONV_ERROR_MSG;
msg.msg = message;
memset(&repl, 0, sizeof(repl));
sudo_conv(1, &msg, &repl, NULL);
}
ret = pass ? AUTH_FAILURE : AUTH_INTR; ret = pass ? AUTH_FAILURE : AUTH_INTR;
} }
free(message); free(message);