diff options
| author | aiju <devnull@localhost> | 2017-04-24 23:16:59 +0000 |
|---|---|---|
| committer | aiju <devnull@localhost> | 2017-04-24 23:16:59 +0000 |
| commit | ef7b42883242ec39eb4be18c2c5c49b03e5ceaf1 (patch) | |
| tree | a0be4ce7962c40cbb104eb78efd730330d0b4dfc /sys/src/cmd/ssh.c | |
| parent | fbf64184dff33adc9dec19db243f0eaba3594140 (diff) | |
ssh: loop keyboard-interactive on failure
Diffstat (limited to 'sys/src/cmd/ssh.c')
| -rw-r--r-- | sys/src/cmd/ssh.c | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/sys/src/cmd/ssh.c b/sys/src/cmd/ssh.c index 4595153da..c0877f289 100644 --- a/sys/src/cmd/ssh.c +++ b/sys/src/cmd/ssh.c @@ -52,6 +52,10 @@ enum { WinPackets = 8, // (1<<15) * 8 = 256K }; +enum { + MaxPwTries = 3 // retry this often for keyboard-interactive +}; + typedef struct { u32int seq; @@ -859,15 +863,21 @@ int kbintauth(void) { static char authmeth[] = "keyboard-interactive"; + int tries; char *name, *inst, *s, *a; int fd, i, n, m; int nquest, echo; uchar *ans, *answ; + tries = 0; if(!authok(authmeth)) return -1; +Loop: + if(++tries > MaxPwTries) + return -1; + sendpkt("bsssss", MSG_USERAUTH_REQUEST, user, strlen(user), service, strlen(service), @@ -880,8 +890,10 @@ Next0: switch(recvpkt()){ dispatch(); goto Next0; case MSG_USERAUTH_FAILURE: - authfailure(authmeth); - return -1; + werrstr("keyboard-interactive failed"); + if(authfailure(authmeth)) + return -1; + goto Loop; case MSG_USERAUTH_SUCCESS: return 0; case MSG_USERAUTH_INFO_REQUEST: @@ -940,8 +952,10 @@ Next1: switch(recvpkt()){ case MSG_USERAUTH_INFO_REQUEST: goto Retry; case MSG_USERAUTH_FAILURE: - authfailure(authmeth); - return -1; + werrstr("keyboard-interactive failed"); + if(authfailure(authmeth)) + return -1; + goto Loop; case MSG_USERAUTH_SUCCESS: return 0; } |