X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/ca2d59436752b1d46a12d4d4fabd366fac81b0ca..0965bee0865fd8ea129b2de62a3c50e09c59a184:/scp.c diff --git a/scp.c b/scp.c index 401d444c..c13be5ec 100644 --- a/scp.c +++ b/scp.c @@ -53,13 +53,12 @@ static int statistics = 1; static int portnumber = 0; static char *password = NULL; static int errs = 0; -static int connection_open = 0; /* GUI Adaptation - Sept 2000 */ #define NAME_STR_MAX 2048 static char statname[NAME_STR_MAX+1]; static unsigned long statsize = 0; static int statperct = 0; -static time_t statelapsed = 0; +static unsigned long statelapsed = 0; static int gui_mode = 0; static char *gui_hwnd = NULL; @@ -72,9 +71,9 @@ static void tell_str(FILE *stream, char *str); static void tell_user(FILE *stream, char *fmt, ...); static void send_char_msg(unsigned int msg_id, char c); static void send_str_msg(unsigned int msg_id, char *str); -static void gui_update_stats(char *name, unsigned long size, int percentage, time_t elapsed); +static void gui_update_stats(char *name, unsigned long size, + int percentage, unsigned long elapsed); -void begin_session(void) { } void logevent(char *string) { } void verify_ssh_host_key(char *host, int port, char *keytype, @@ -183,7 +182,7 @@ static void tell_user(FILE *stream, char *fmt, ...) tell_str(stream, str); } -static void gui_update_stats(char *name, unsigned long size, int percentage, time_t elapsed) +static void gui_update_stats(char *name, unsigned long size, int percentage, unsigned long elapsed) { unsigned int i; @@ -242,6 +241,19 @@ void connection_fatal(char *fmt, ...) } /* + * Be told what socket we're supposed to be using. + */ +static SOCKET scp_ssh_socket; +char *do_select(SOCKET skt, int startup) { + if (startup) + scp_ssh_socket = skt; + else + scp_ssh_socket = INVALID_SOCKET; + return NULL; +} +extern int select_result(WPARAM, LPARAM); + +/* * Receive a block of data from the SSH link. Block until all data * is available. * @@ -249,6 +261,7 @@ void connection_fatal(char *fmt, ...) * own trap in from_backend() to catch the data that comes back. We * do this until we have enough data. */ + static unsigned char *outptr; /* where to put the data */ static unsigned outlen; /* how much data required */ static unsigned char *pending = NULL; /* any spare data */ @@ -285,8 +298,8 @@ void from_backend(int is_stderr, char *data, int datalen) { if (len > 0) { if (pendsize < pendlen + len) { pendsize = pendlen + len + 4096; - pending = (pending ? realloc(pending, pendsize) : - malloc(pendsize)); + pending = (pending ? srealloc(pending, pendsize) : + smalloc(pendsize)); if (!pending) fatalbox("Out of memory"); } @@ -295,8 +308,6 @@ void from_backend(int is_stderr, char *data, int datalen) { } } static int ssh_scp_recv(unsigned char *buf, int len) { - SOCKET s; - outptr = buf; outlen = len; @@ -315,7 +326,7 @@ static int ssh_scp_recv(unsigned char *buf, int len) { pendlen -= pendused; if (pendlen == 0) { pendsize = 0; - free(pending); + sfree(pending); pending = NULL; } if (outlen == 0) @@ -324,16 +335,12 @@ static int ssh_scp_recv(unsigned char *buf, int len) { while (outlen > 0) { fd_set readfds; - s = back->socket(); - if (s == INVALID_SOCKET) { - connection_open = FALSE; - return 0; - } + FD_ZERO(&readfds); - FD_SET(s, &readfds); + FD_SET(scp_ssh_socket, &readfds); if (select(1, &readfds, NULL, NULL, NULL) < 0) return 0; /* doom */ - back->msg(0, FD_READ); + select_result((WPARAM)scp_ssh_socket, (LPARAM)FD_READ); } return len; @@ -343,18 +350,15 @@ static int ssh_scp_recv(unsigned char *buf, int len) { * Loop through the ssh connection and authentication process. */ static void ssh_scp_init(void) { - SOCKET s; - - s = back->socket(); - if (s == INVALID_SOCKET) + if (scp_ssh_socket == INVALID_SOCKET) return; while (!back->sendok()) { fd_set readfds; FD_ZERO(&readfds); - FD_SET(s, &readfds); + FD_SET(scp_ssh_socket, &readfds); if (select(1, &readfds, NULL, NULL, NULL) < 0) return; /* doom */ - back->msg(0, FD_READ); + select_result((WPARAM)scp_ssh_socket, (LPARAM)FD_READ); } } @@ -372,7 +376,7 @@ static void bump(char *fmt, ...) strcat(str, "\n"); tell_str(stderr, str); - if (connection_open) { + if (back != NULL && back->socket() != NULL) { char ch; back->special(TS_EOF); ssh_scp_recv(&ch, 1); @@ -431,6 +435,7 @@ static int get_password(const char *prompt, char *str, int maxlen) static void do_cmd(char *host, char *user, char *cmd) { char *err, *realhost; + DWORD namelen; if (host == NULL || host[0] == '\0') bump("Empty host name"); @@ -439,6 +444,7 @@ static void do_cmd(char *host, char *user, char *cmd) do_defaults(host, &cfg); if (cfg.host[0] == '\0') { /* No settings for this host; use defaults */ + do_defaults(NULL, &cfg); strncpy(cfg.host, host, sizeof(cfg.host)-1); cfg.host[sizeof(cfg.host)-1] = '\0'; cfg.port = 22; @@ -449,7 +455,15 @@ static void do_cmd(char *host, char *user, char *cmd) strncpy(cfg.username, user, sizeof(cfg.username)-1); cfg.username[sizeof(cfg.username)-1] = '\0'; } else if (cfg.username[0] == '\0') { - bump("Empty user name"); + namelen = 0; + if (GetUserName(user, &namelen) == FALSE) + bump("Empty user name"); + user = smalloc(namelen * sizeof(char)); + GetUserName(user, &namelen); + if (verbose) tell_user(stderr, "Guessing user name: %s", user); + strncpy(cfg.username, user, sizeof(cfg.username)-1); + cfg.username[sizeof(cfg.username)-1] = '\0'; + free(user); } if (cfg.protocol != PROT_SSH) @@ -464,14 +478,12 @@ static void do_cmd(char *host, char *user, char *cmd) back = &ssh_backend; - err = back->init(NULL, cfg.host, cfg.port, &realhost); + err = back->init(cfg.host, cfg.port, &realhost); if (err != NULL) bump("ssh_init: %s", err); ssh_scp_init(); if (verbose && realhost != NULL) tell_user(stderr, "Connected to %s\n", realhost); - - connection_open = 1; } /* @@ -487,7 +499,8 @@ static void print_stats(char *name, unsigned long size, unsigned long done, /* GUI Adaptation - Sept 2000 */ if (gui_mode) - gui_update_stats(name, size, ((done *100) / size), now-start); + gui_update_stats(name, size, (int)(100 * (done*1.0/size)), + (unsigned long)difftime(now, start)); else { if (now > start) ratebs = (float) done / (now - start); @@ -823,12 +836,6 @@ static void sink(char *targ, char *src) if (sscanf(buf+1, "%u %lu %[^\n]", &mode, &size, namebuf) != 3) bump("Protocol error: Illegal file descriptor format"); /* Security fix: ensure the file ends up where we asked for it. */ - if (src) { - char *p = src + strlen(src); - while (p > src && p[-1] != '/' && p[-1] != '\\') - p--; - strcpy(namebuf, p); - } if (targisdir) { char t[2048]; char *p; @@ -1004,6 +1011,27 @@ static void toremote(int argc, char *argv[]) do { char *last; char namebuf[2048]; + /* + * Ensure that . and .. are never matched by wildcards, + * but only by deliberate action. + */ + if (!strcmp(fdat.cFileName, ".") || + !strcmp(fdat.cFileName, "..")) { + /* + * Find*File has returned a special dir. We require + * that _either_ `src' ends in a backslash followed + * by that string, _or_ `src' is precisely that + * string. + */ + int len = strlen(src), dlen = strlen(fdat.cFileName); + if (len == dlen && !strcmp(src, fdat.cFileName)) { + /* ok */; + } else if (len > dlen+1 && src[len-dlen-1] == '\\' && + !strcmp(src+len-dlen, fdat.cFileName)) { + /* ok */; + } else + continue; /* ignore this one */ + } if (strlen(src) + strlen(fdat.cFileName) >= sizeof(namebuf)) { tell_user(stderr, "%s: Name too long", src); @@ -1178,6 +1206,7 @@ int main(int argc, char *argv[]) flags = FLAG_STDERR; ssh_get_password = &get_password; init_winsock(); + sk_init(); for (i = 1; i < argc; i++) { if (argv[i][0] != '-') @@ -1209,6 +1238,7 @@ int main(int argc, char *argv[]) } argc -= i; argv += i; + back = NULL; if (list) { if (argc != 1) @@ -1228,7 +1258,7 @@ int main(int argc, char *argv[]) tolocal(argc, argv); } - if (connection_open) { + if (back != NULL && back->socket() != NULL) { char ch; back->special(TS_EOF); ssh_scp_recv(&ch, 1);