Fix pasting of newlines in local line editing mode. Possibly not a

[u/mdw/putty] / ssh.c

diff --git a/ssh.c b/ssh.c
index 9ef7e0c..5c10bc8 100644 (file)
--- a/ssh.c
+++ b/ssh.c
@@ -607,12 +607,6 @@ static int ssh1_rdpkt(unsigned char **data, int *datalen)
        (*data)++, (*datalen)--;
     }
 
-#ifdef FWHACK
-    if (st->len == 0x52656d6f) {       /* "Remo"te server has closed ... */
-       st->len = 0x300;               /* big enough to carry to end */
-    }
-#endif
-
     st->pad = 8 - (st->len % 8);
     st->biglen = st->len + st->pad;
     pktin.length = st->len - 5;
@@ -726,6 +720,7 @@ static int ssh1_rdpkt(unsigned char **data, int *datalen)
        buf[nowlen + msglen] = '\0';
        logevent(buf);
        bombout(("Server sent disconnect message:\n\"%s\"", buf+nowlen));
+       crReturn(0);
     }
 
     crFinish(0);
@@ -769,11 +764,7 @@ static int ssh2_rdpkt(unsigned char **data, int *datalen)
        pktin.data[st->i] = *(*data)++;
        (*datalen)--;
     }
-#ifdef FWHACK
-    if (!memcmp(pktin.data, "Remo", 4)) {      /* "Remo"te server has closed ... */
-       /* FIXME */
-    }
-#endif
+
     if (sccipher)
        sccipher->decrypt(pktin.data, st->cipherblk);
 
@@ -904,6 +895,7 @@ static int ssh2_rdpkt(unsigned char **data, int *datalen)
                 (reason > 0 && reason < lenof(ssh2_disconnect_reasons)) ?
                 ssh2_disconnect_reasons[reason] : "unknown",
                 buf+nowlen));
+       crReturn(0);
     }
 
     crFinish(0);
@@ -1600,6 +1592,9 @@ static void ssh_gotdata(unsigned char *data, int datalen)
     while (1) {
        while (datalen > 0) {
            if (s_rdpkt(&data, &datalen) == 0) {
+               if (ssh_state == SSH_STATE_CLOSED) {
+                   return;
+               }
                ssh_protocol(NULL, 0, 1);
                if (ssh_state == SSH_STATE_CLOSED) {
                    return;
@@ -1794,6 +1789,7 @@ static int do_ssh1_login(unsigned char *in, int inlen, int ispkt)
     struct MD5Context md5c;
     static unsigned long supported_ciphers_mask, supported_auths_mask;
     static int tried_publickey;
+    static int tis_auth_refused, ccard_auth_refused;
     static unsigned char session_id[16];
     static int cipher_type;
     static char username[100];
@@ -2042,6 +2038,7 @@ static int do_ssh1_login(unsigned char *in, int inlen, int ispkt)
     crWaitUntil(ispkt);
 
     tried_publickey = 0;
+    tis_auth_refused = ccard_auth_refused = 0;
 
     while (pktin.type == SSH1_SMSG_FAILURE) {
        static char password[100];
@@ -2049,12 +2046,8 @@ static int do_ssh1_login(unsigned char *in, int inlen, int ispkt)
        static int pos;
        static char c;
        static int pwpkt_type;
-       /*
-        * Show password prompt, having first obtained it via a TIS
-        * or CryptoCard exchange if we're doing TIS or CryptoCard
-        * authentication.
-        */
        pwpkt_type = SSH1_CMSG_AUTH_PASSWORD;
+
        if (agent_exists()) {
            /*
             * Attempt RSA authentication using Pageant.
@@ -2177,9 +2170,9 @@ static int do_ssh1_login(unsigned char *in, int inlen, int ispkt)
        if (*cfg.keyfile && !tried_publickey)
            pwpkt_type = SSH1_CMSG_AUTH_RSA;
 
-       if (pktin.type == SSH1_SMSG_FAILURE &&
-           cfg.try_tis_auth &&
-           (supported_auths_mask & (1 << SSH1_AUTH_TIS))) {
+       if (cfg.try_tis_auth &&
+           (supported_auths_mask & (1 << SSH1_AUTH_TIS)) &&
+           !tis_auth_refused) {
            pwpkt_type = SSH1_CMSG_AUTH_TIS_RESPONSE;
            logevent("Requested TIS authentication");
            send_packet(SSH1_CMSG_AUTH_TIS, PKT_END);
@@ -2188,6 +2181,8 @@ static int do_ssh1_login(unsigned char *in, int inlen, int ispkt)
                logevent("TIS authentication declined");
                if (flags & FLAG_INTERACTIVE)
                    c_write_str("TIS authentication refused.\r\n");
+               tis_auth_refused = 1;
+               continue;
            } else {
                int challengelen = ((pktin.body[0] << 24) |
                                    (pktin.body[1] << 16) |
@@ -2197,12 +2192,17 @@ static int do_ssh1_login(unsigned char *in, int inlen, int ispkt)
                if (challengelen > sizeof(prompt) - 1)
                    challengelen = sizeof(prompt) - 1;  /* prevent overrun */
                memcpy(prompt, pktin.body + 4, challengelen);
-               prompt[challengelen] = '\0';
+               /* Prompt heuristic comes from OpenSSH */
+               strncpy(prompt + challengelen,
+                       memchr(prompt, '\n', challengelen) ?
+                       "": "\r\nResponse: ",
+                       (sizeof prompt) - challengelen);
+               prompt[(sizeof prompt) - 1] = '\0';
            }
        }
-       if (pktin.type == SSH1_SMSG_FAILURE &&
-           cfg.try_tis_auth &&
-           (supported_auths_mask & (1 << SSH1_AUTH_CCARD))) {
+       if (cfg.try_tis_auth &&
+           (supported_auths_mask & (1 << SSH1_AUTH_CCARD)) &&
+           !ccard_auth_refused) {
            pwpkt_type = SSH1_CMSG_AUTH_CCARD_RESPONSE;
            logevent("Requested CryptoCard authentication");
            send_packet(SSH1_CMSG_AUTH_CCARD, PKT_END);
@@ -2210,6 +2210,8 @@ static int do_ssh1_login(unsigned char *in, int inlen, int ispkt)
            if (pktin.type != SSH1_SMSG_AUTH_CCARD_CHALLENGE) {
                logevent("CryptoCard authentication declined");
                c_write_str("CryptoCard authentication refused.\r\n");
+               ccard_auth_refused = 1;
+               continue;
            } else {
                int challengelen = ((pktin.body[0] << 24) |
                                    (pktin.body[1] << 16) |
@@ -2219,7 +2221,9 @@ static int do_ssh1_login(unsigned char *in, int inlen, int ispkt)
                if (challengelen > sizeof(prompt) - 1)
                    challengelen = sizeof(prompt) - 1;  /* prevent overrun */
                memcpy(prompt, pktin.body + 4, challengelen);
-               strncpy(prompt + challengelen, "\r\nResponse : ",
+               strncpy(prompt + challengelen,
+                       memchr(prompt, '\n', challengelen) ?
+                       "" : "\r\nResponse: ",
                        sizeof(prompt) - challengelen);
                prompt[sizeof(prompt) - 1] = '\0';
            }
@@ -2241,6 +2245,11 @@ static int do_ssh1_login(unsigned char *in, int inlen, int ispkt)
            sfree(comment);
        }
 
+       /*
+        * Show password prompt, having first obtained it via a TIS
+        * or CryptoCard exchange if we're doing TIS or CryptoCard
+        * authentication.
+        */
        if (ssh_get_line) {
            if (!ssh_get_line(prompt, password, sizeof(password), TRUE)) {
                /*
@@ -2256,7 +2265,9 @@ static int do_ssh1_login(unsigned char *in, int inlen, int ispkt)
                crReturn(1);
            }
        } else {
-           c_write_str(prompt);
+           /* Prompt may have come from server. We've munged it a bit, so
+            * we know it to be zero-terminated at least once. */
+           c_write_untrusted(prompt, strlen(prompt));
            pos = 0;
            ssh_send_ok = 1;
            while (pos >= 0) {
@@ -2714,7 +2725,7 @@ static void ssh1_protocol(unsigned char *in, int inlen, int ispkt)
     if (eof_needed)
        ssh_special(TS_EOF);
 
-    ldisc_send(NULL, 0);              /* cause ldisc to notice changes */
+    ldisc_send(NULL, 0, 0);           /* cause ldisc to notice changes */
     ssh_send_ok = 1;
     ssh_channels = newtree234(ssh_channelcmp);
     while (1) {
@@ -2984,6 +2995,15 @@ static void ssh1_protocol(unsigned char *in, int inlen, int ispkt)
                 * if no pty is available or in other odd cases. Ignore */
            } else if (pktin.type == SSH1_SMSG_EXIT_STATUS) {
                send_packet(SSH1_CMSG_EXIT_CONFIRMATION, PKT_END);
+                /*
+                 * In case `helpful' firewalls or proxies tack
+                 * extra human-readable text on the end of the
+                 * session which we might mistake for another
+                 * encrypted packet, we close the session once
+                 * we've sent EXIT_CONFIRMATION.
+                 */
+                ssh_state = SSH_STATE_CLOSED;
+                crReturnV;
            } else {
                bombout(("Strange packet received: type %d", pktin.type));
                crReturnV;
@@ -4616,7 +4636,7 @@ static void do_ssh2_authconn(unsigned char *in, int inlen, int ispkt)
     /*
      * Transfer data!
      */
-    ldisc_send(NULL, 0);              /* cause ldisc to notice changes */
+    ldisc_send(NULL, 0, 0);           /* cause ldisc to notice changes */
     ssh_send_ok = 1;
     while (1) {
        static int try_send;