static void ssh_throttle_all(Ssh ssh, int enable, int bufsize);
static void ssh2_set_window(struct ssh_channel *c, unsigned newwin);
static int ssh_sendbuffer(void *handle);
+static void ssh_do_close(Ssh ssh);
struct rdpkt1_state_tag {
long len, pad, biglen, to_read;
#define bombout(msg) \
do { \
char *text = dupprintf msg; \
- ssh->state = SSH_STATE_CLOSED; \
- if (ssh->s) { sk_close(ssh->s); ssh->s = NULL; } \
+ ssh_do_close(ssh); \
logevent(text); \
connection_fatal(ssh->frontend, "%s", text); \
sfree(text); \
if (ssh->cipher && detect_attack(ssh->crcda_ctx, ssh->pktin.data,
st->biglen, NULL)) {
bombout(("Network attack (CRC compensation) detected!"));
- crReturn(0);
+ crStop(0);
}
if (ssh->cipher)
st->gotcrc = GET_32BIT(ssh->pktin.data + st->biglen - 4);
if (st->gotcrc != st->realcrc) {
bombout(("Incorrect CRC received on packet"));
- crReturn(0);
+ crStop(0);
}
ssh->pktin.body = ssh->pktin.data + st->pad + 1;
long stringlen = GET_32BIT(ssh->pktin.body);
if (stringlen + 4 != ssh->pktin.length) {
bombout(("Received data packet with bogus string length"));
- crReturn(0);
+ crStop(0);
}
}
buf[nowlen + msglen] = '\0';
/* logevent(buf); (this is now done within the bombout macro) */
bombout(("Server sent disconnect message:\n\"%s\"", buf+nowlen));
- crReturn(0);
+ crStop(0);
}
crFinish(0);
*/
if (st->len < 0 || st->pad < 0 || st->len + st->pad < 0) {
bombout(("Incoming packet was garbled on decryption"));
- crReturn(0);
+ crStop(0);
}
/*
&& !ssh->scmac->verify(ssh->sc_mac_ctx, ssh->pktin.data, st->len + 4,
st->incoming_sequence)) {
bombout(("Incorrect MAC received on packet"));
- crReturn(0);
+ crStop(0);
}
st->incoming_sequence++; /* whether or not we MACed */
ssh2_disconnect_reasons[reason] : "unknown",
buf+nowlen));
sfree(buf);
- crReturn(0);
+ crStop(0);
}
break;
case SSH2_MSG_IGNORE:
if (ssh->cfg.sshprot == 0 && !s->proto1) {
bombout(("SSH protocol version 1 required by user but not provided by server"));
- crReturn(0);
+ crStop(0);
}
if (ssh->cfg.sshprot == 3 && !s->proto2) {
bombout(("SSH protocol version 2 required by user but not provided by server"));
- crReturn(0);
+ crStop(0);
}
if (s->proto2 && (ssh->cfg.sshprot >= 2 || !s->proto1)) {
crFinishV;
}
-static int ssh_closing(Plug plug, char *error_msg, int error_code,
- int calling_back)
+static void ssh_do_close(Ssh ssh)
{
- Ssh ssh = (Ssh) plug;
+ int i;
+ struct ssh_channel *c;
+
ssh->state = SSH_STATE_CLOSED;
if (ssh->s) {
sk_close(ssh->s);
ssh->s = NULL;
}
+ /*
+ * Now we must shut down any port and X forwardings going
+ * through this connection.
+ */
+ if (ssh->channels) {
+ for (i = 0; NULL != (c = index234(ssh->channels, i)); i++) {
+ switch (c->type) {
+ case CHAN_X11:
+ x11_close(c->u.x11.s);
+ break;
+ case CHAN_SOCKDATA:
+ pfd_close(c->u.pfd.s);
+ break;
+ }
+ del234(ssh->channels, c);
+ if (ssh->version == 2)
+ bufchain_clear(&c->v.v2.outbuffer);
+ sfree(c);
+ }
+ }
+}
+
+static int ssh_closing(Plug plug, char *error_msg, int error_code,
+ int calling_back)
+{
+ Ssh ssh = (Ssh) plug;
+ ssh_do_close(ssh);
if (error_msg) {
/* A socket error has occurred. */
logevent(error_msg);
Ssh ssh = (Ssh) plug;
ssh_gotdata(ssh, (unsigned char *)data, len);
if (ssh->state == SSH_STATE_CLOSED) {
- if (ssh->s) {
- sk_close(ssh->s);
- ssh->s = NULL;
- }
+ ssh_do_close(ssh);
return 0;
}
return 1;
/* Agent channels require no buffer management. */
break;
case CHAN_SOCKDATA:
- pfd_override_throttle(c->u.x11.s, enable);
+ pfd_override_throttle(c->u.pfd.s, enable);
break;
}
}
if (ssh->pktin.type != SSH1_SMSG_PUBLIC_KEY) {
bombout(("Public key packet not received"));
- crReturn(0);
+ crStop(0);
}
logevent("Received public keys");
else
/* shouldn't happen */
bombout(("No supported ciphers found"));
- crReturn(0);
+ crStop(0);
}
/* Warn about chosen cipher if necessary. */
if (ssh->pktin.type != SSH1_SMSG_SUCCESS) {
bombout(("Encryption not successfully enabled"));
- crReturn(0);
+ crStop(0);
}
logevent("Successfully started encryption");
*/
logevent("No username provided. Abandoning session.");
ssh_closing((Plug)ssh, NULL, 0, 0);
- crReturn(1);
+ crStop(1);
}
} else {
int ret; /* need not be kept over crReturn */
logevent("Unable to authenticate");
connection_fatal(ssh->frontend, "Unable to authenticate");
ssh_closing((Plug)ssh, NULL, 0, 0);
- crReturn(1);
+ crStop(1);
}
} else {
/* Prompt may have come from server. We've munged it a bit, so
}
if (ssh->pktin.type != SSH1_SMSG_AUTH_RSA_CHALLENGE) {
bombout(("Bizarre response to offer of public key"));
- crReturn(0);
+ crStop(0);
}
{
continue; /* go and try password */
} else if (ssh->pktin.type != SSH1_SMSG_SUCCESS) {
bombout(("Bizarre response to RSA authentication response"));
- crReturn(0);
+ crStop(0);
}
break; /* we're through! */
logevent("Authentication refused");
} else if (ssh->pktin.type != SSH1_SMSG_SUCCESS) {
bombout(("Strange packet received, type %d", ssh->pktin.type));
- crReturn(0);
+ crStop(0);
}
}
{
Ssh ssh = c->ssh;
+ if (ssh->state != SSH_STATE_SESSION) {
+ assert(ssh->state == SSH_STATE_CLOSED);
+ return;
+ }
+
if (c && !c->closes) {
/*
* If the channel's remoteid is -1, we have sent
{
Ssh ssh = c->ssh;
+ if (ssh->state != SSH_STATE_SESSION) {
+ assert(ssh->state == SSH_STATE_CLOSED);
+ return 0;
+ }
+
if (ssh->version == 1) {
send_packet(ssh, SSH1_MSG_CHANNEL_DATA,
PKT_INT, c->remoteid,
{
Ssh ssh = c->ssh;
+ if (ssh->state != SSH_STATE_SESSION) {
+ assert(ssh->state == SSH_STATE_CLOSED);
+ return;
+ }
+
if (ssh->version == 1) {
if (c->v.v1.throttling && bufsize < SSH1_BUFFER_LIMIT) {
c->v.v1.throttling = 0;
if (ssh->pktin.type != SSH1_SMSG_SUCCESS
&& ssh->pktin.type != SSH1_SMSG_FAILURE) {
bombout(("Protocol confusion"));
- crReturnV;
+ crStopV;
} else if (ssh->pktin.type == SSH1_SMSG_FAILURE) {
logevent("Agent forwarding refused");
} else {
if (ssh->pktin.type != SSH1_SMSG_SUCCESS
&& ssh->pktin.type != SSH1_SMSG_FAILURE) {
bombout(("Protocol confusion"));
- crReturnV;
+ crStopV;
} else if (ssh->pktin.type == SSH1_SMSG_FAILURE) {
logevent("X11 forwarding refused");
} else {
}
} else {
while (*ssh->portfwd_strptr) ssh->portfwd_strptr++;
- dport = -1;
+ dport = dserv = -1;
}
sport = atoi(sports);
sserv = 0;
if (ssh->pktin.type != SSH1_SMSG_SUCCESS
&& ssh->pktin.type != SSH1_SMSG_FAILURE) {
bombout(("Protocol confusion"));
- crReturnV;
+ crStopV;
} else if (ssh->pktin.type == SSH1_SMSG_FAILURE) {
c_write_str(ssh, "Server refused port"
" forwarding\r\n");
if (ssh->pktin.type != SSH1_SMSG_SUCCESS
&& ssh->pktin.type != SSH1_SMSG_FAILURE) {
bombout(("Protocol confusion"));
- crReturnV;
+ crStopV;
} else if (ssh->pktin.type == SSH1_SMSG_FAILURE) {
c_write_str(ssh, "Server refused to allocate pty\r\n");
ssh->editing = ssh->echoing = 1;
if (ssh->pktin.type != SSH1_SMSG_SUCCESS
&& ssh->pktin.type != SSH1_SMSG_FAILURE) {
bombout(("Protocol confusion"));
- crReturnV;
+ crStopV;
} else if (ssh->pktin.type == SSH1_SMSG_FAILURE) {
c_write_str(ssh, "Server refused to compress\r\n");
}
} else if (ssh->pktin.type == SSH1_MSG_DISCONNECT) {
ssh_closing((Plug)ssh, NULL, 0, 0);
logevent("Received disconnect request");
- crReturnV;
+ crStopV;
} else if (ssh->pktin.type == SSH1_SMSG_X11_OPEN) {
/* Remote side is trying to open a channel to talk to our
* X-Server. Give them back a local channel number. */
ssh->pktin.type == SSH1_MSG_CHANNEL_CLOSE ? "" :
"_CONFIRMATION", c ? "half-open" : "nonexistent",
i));
+ crStopV;
}
} else if (ssh->pktin.type == SSH1_MSG_CHANNEL_DATA) {
/* Data sent down one of our channels. */
struct ssh_channel *c;
c = find234(ssh->channels, &i, ssh_channelfind);
if (c) {
- int bufsize;
+ int bufsize = 0;
switch (c->type) {
case CHAN_X11:
bufsize = x11_send(c->u.x11.s, (char *)p, len);
* we've sent EXIT_CONFIRMATION.
*/
ssh_closing((Plug)ssh, NULL, 0, 0);
- crReturnV;
+ crStopV;
} else {
bombout(("Strange packet received: type %d", ssh->pktin.type));
- crReturnV;
+ crStopV;
}
} else {
while (inlen > 0) {
if (ssh->pktin.type != SSH2_MSG_KEXINIT) {
bombout(("expected key exchange packet from server"));
- crReturn(0);
+ crStop(0);
}
ssh->kex = NULL;
ssh->hostkey = NULL;
if (!s->cscipher_tobe) {
bombout(("Couldn't agree a client-to-server cipher (available: %s)",
str ? str : "(null)"));
- crReturn(0);
+ crStop(0);
}
ssh2_pkt_getstring(ssh, &str, &len); /* server->client cipher */
if (!s->sccipher_tobe) {
bombout(("Couldn't agree a server-to-client cipher (available: %s)",
str ? str : "(null)"));
- crReturn(0);
+ crStop(0);
}
ssh2_pkt_getstring(ssh, &str, &len); /* client->server mac */
crWaitUntil(ispkt);
if (ssh->pktin.type != SSH2_MSG_KEX_DH_GEX_GROUP) {
bombout(("expected key exchange group packet from server"));
- crReturn(0);
+ crStop(0);
}
s->p = ssh2_pkt_getmp(ssh);
s->g = ssh2_pkt_getmp(ssh);
crWaitUntil(ispkt);
if (ssh->pktin.type != s->kex_reply_value) {
bombout(("expected key exchange reply packet from server"));
- crReturn(0);
+ crStop(0);
}
ssh2_pkt_getstring(ssh, &s->hostkeydata, &s->hostkeylen);
s->f = ssh2_pkt_getmp(ssh);
!ssh->hostkey->verifysig(s->hkey, s->sigdata, s->siglen,
(char *)s->exchange_hash, 20)) {
bombout(("Server's host key did not match the signature supplied"));
- crReturn(0);
+ crStop(0);
}
/*
crWaitUntil(ispkt);
if (ssh->pktin.type != SSH2_MSG_NEWKEYS) {
bombout(("expected new-keys packet from server"));
- crReturn(0);
+ crStop(0);
}
/*
crWaitUntilV(ispkt);
if (ssh->pktin.type != SSH2_MSG_SERVICE_ACCEPT) {
bombout(("Server refused user authentication protocol"));
- crReturnV;
+ crStopV;
}
/*
*/
logevent("No username provided. Abandoning session.");
ssh_closing((Plug)ssh, NULL, 0, 0);
- crReturnV;
+ crStopV;
}
} else {
int ret; /* need not be saved across crReturn */
} else if (ssh->pktin.type != SSH2_MSG_USERAUTH_FAILURE) {
bombout(("Strange packet received during authentication: type %d",
ssh->pktin.type));
- crReturnV;
+ crStopV;
}
s->gotit = FALSE;
connection_fatal(ssh->frontend,
"Unable to authenticate");
ssh_closing((Plug)ssh, NULL, 0, 0);
- crReturnV;
+ crStopV;
}
} else {
int ret; /* need not be saved across crReturn */
ssh2_pkt_addstring(ssh, "en"); /* language tag */
ssh2_pkt_send(ssh);
ssh_closing((Plug)ssh, NULL, 0, 0);
- crReturnV;
+ crStopV;
}
}
} while (!s->we_are_in);
crWaitUntilV(ispkt);
if (ssh->pktin.type != SSH2_MSG_CHANNEL_OPEN_CONFIRMATION) {
bombout(("Server refused to open a session"));
- crReturnV;
+ crStopV;
/* FIXME: error data comes back in FAILURE packet */
}
if (ssh2_pkt_getuint32(ssh) != ssh->mainchan->localid) {
bombout(("Server's channel confirmation cited wrong channel"));
- crReturnV;
+ crStopV;
}
ssh->mainchan->remoteid = ssh2_pkt_getuint32(ssh);
ssh->mainchan->type = CHAN_MAINSESSION;
if (ssh->pktin.type != SSH2_MSG_CHANNEL_FAILURE) {
bombout(("Unexpected response to X11 forwarding request:"
" packet type %d", ssh->pktin.type));
- crReturnV;
+ crStopV;
}
logevent("X11 forwarding refused");
} else {
}
} else {
while (*ssh->portfwd_strptr) ssh->portfwd_strptr++;
- dport = -1;
+ dport = dserv = -1;
}
sport = atoi(sports);
sserv = 0;
bombout(("Unexpected response to port "
"forwarding request: packet type %d",
ssh->pktin.type));
- crReturnV;
+ crStopV;
}
logevent("Server refused this port forwarding");
} else {
if (ssh->pktin.type != SSH2_MSG_CHANNEL_FAILURE) {
bombout(("Unexpected response to agent forwarding request:"
" packet type %d", ssh->pktin.type));
- crReturnV;
+ crStopV;
}
logevent("Agent forwarding refused");
} else {
if (ssh->pktin.type != SSH2_MSG_CHANNEL_FAILURE) {
bombout(("Unexpected response to pty request:"
" packet type %d", ssh->pktin.type));
- crReturnV;
+ crStopV;
}
c_write_str(ssh, "Server refused to allocate pty\r\n");
ssh->editing = ssh->echoing = 1;
if (ssh->pktin.type != SSH2_MSG_CHANNEL_FAILURE) {
bombout(("Unexpected response to shell/command request:"
" packet type %d", ssh->pktin.type));
- crReturnV;
+ crStopV;
}
/*
* We failed to start the command. If this is the
continue;
}
bombout(("Server refused to start a shell/command"));
- crReturnV;
+ crStopV;
} else {
logevent("Started a shell/command");
}
continue; /* extended but not stderr */
ssh2_pkt_getstring(ssh, &data, &length);
if (data) {
- int bufsize;
+ int bufsize = 0;
c->v.v2.locwindow -= length;
switch (c->type) {
case CHAN_MAINSESSION:
if (!c || ((int)c->remoteid) == -1) {
bombout(("Received CHANNEL_CLOSE for %s channel %d\n",
c ? "half-open" : "nonexistent", i));
+ crStopV;
}
/* Do pre-close processing on the channel. */
switch (c->type) {
ssh2_pkt_send(ssh);
#endif
ssh_closing((Plug)ssh, NULL, 0, 0);
- crReturnV;
+ crStopV;
}
continue; /* remote sends close; ignore (FIXME) */
} else if (ssh->pktin.type == SSH2_MSG_CHANNEL_WINDOW_ADJUST) {
ssh2_pkt_send(ssh);
connection_fatal(ssh->frontend, "%s", buf);
ssh_closing((Plug)ssh, NULL, 0, 0);
- crReturnV;
+ crStopV;
}
/*
}
} else {
bombout(("Strange packet received: type %d", ssh->pktin.type));
- crReturnV;
+ crStopV;
}
} else {
/*
sfree(ssh->do_ssh2_authconn_state);
if (ssh->s)
- sk_close(ssh->s);
+ ssh_do_close(ssh);
sfree(ssh);
}