Skip to content

Fix bug #114 (ESC causes failed login) and related timeout issue #193

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rdslw wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix bug #114 (ESC causes failed login) and related timeout issue #193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a0d4dd8
Fix ESC/timeout incorrectly counting as failed login attempt
Nov 15, 2025
779903c
Make ESC clear password field instead of canceling prompt
Nov 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion helpers/auth_x11.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1306,8 +1306,14 @@ int Prompt(const char *msg, char **response, int echo) {
BumpDisplayMarker(priv.pwlen, &priv.displaymarker,
&priv.last_keystroke);
break;
case 0: // Shouldn't happen.
case '\033': // Escape.
// Clear the input line (like Ctrl-U). User can still press ESC
// again or wait for timeout to cancel the prompt entirely.
priv.pwlen = 0;
BumpDisplayMarker(priv.pwlen, &priv.displaymarker,
&priv.last_keystroke);
break;
case 0: // Shouldn't happen.
done = 1;
break;
case '\r': // Return.
Expand Down
14 changes: 14 additions & 0 deletions helpers/authproto_pam.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,25 @@ int ConverseOne(const struct pam_message *msg, struct pam_response *resp) {
case PAM_PROMPT_ECHO_OFF: {
WritePacket(1, PTYPE_PROMPT_LIKE_PASSWORD, msg->msg);
char type = ReadPacket(0, &resp->resp, 0);
if (type == PTYPE_RESPONSE_CANCELLED) {
// User pressed ESC or prompt timed out. Return PAM_ABORT to cleanly
// abort the authentication session. Returning PAM_CONV_ERR instead would
// cause some PAM modules to attempt authentication with empty input,
// which trips faillock and counts as a failed login attempt.
return PAM_ABORT;
}
return type == PTYPE_RESPONSE_LIKE_PASSWORD ? PAM_SUCCESS : PAM_CONV_ERR;
}
case PAM_PROMPT_ECHO_ON: {
WritePacket(1, PTYPE_PROMPT_LIKE_USERNAME, msg->msg);
char type = ReadPacket(0, &resp->resp, 0);
if (type == PTYPE_RESPONSE_CANCELLED) {
// User pressed ESC or prompt timed out. Return PAM_ABORT to cleanly
// abort the authentication session. Returning PAM_CONV_ERR instead would
// cause some PAM modules to attempt authentication with empty input,
// which trips faillock and counts as a failed login attempt.
return PAM_ABORT;
}
return type == PTYPE_RESPONSE_LIKE_USERNAME ? PAM_SUCCESS : PAM_CONV_ERR;
}
case PAM_ERROR_MSG:
Expand Down