X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/putty/blobdiff_plain/340cf649ea4e6fecb7aedc44ce8914f81d3ae5d8..01c034ad857128c51482a563befb374e38ebe668:/scp.c diff --git a/scp.c b/scp.c index 73d574fd..413cf4c8 100644 --- a/scp.c +++ b/scp.c @@ -20,6 +20,7 @@ #include #include #include +#include /* GUI Adaptation - Sept 2000 */ #include #include @@ -58,7 +59,7 @@ static int errs = 0; 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; @@ -71,11 +72,21 @@ 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 ldisc_send(char *buf, int len) { + /* + * This is only here because of the calls to ldisc_send(NULL, + * 0) in ssh.c. Nothing in PSCP actually needs to use the ldisc + * as an ldisc. So if we get called with any real data, I want + * to know about it. + */ + assert(len == 0); +} + void verify_ssh_host_key(char *host, int port, char *keytype, char *keystr, char *fingerprint) { int ret; @@ -123,12 +134,14 @@ void verify_ssh_host_key(char *host, int port, char *keytype, return; if (ret == 2) { /* key was different */ fprintf(stderr, wrongmsg, fingerprint); + fflush(stderr); if (fgets(line, sizeof(line), stdin) && line[0] != '\0' && line[0] != '\n') { if (line[0] == 'y' || line[0] == 'Y') store_host_key(host, port, keytype, keystr); } else { fprintf(stderr, abandoned); + fflush(stderr); exit(0); } } @@ -182,7 +195,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; @@ -298,8 +311,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"); } @@ -326,7 +339,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) @@ -376,7 +389,7 @@ static void bump(char *fmt, ...) strcat(str, "\n"); tell_str(stderr, str); - if (back->socket() != NULL) { + if (back != NULL && back->socket() != NULL) { char ch; back->special(TS_EOF); ssh_scp_recv(&ch, 1); @@ -384,12 +397,12 @@ static void bump(char *fmt, ...) exit(1); } -static int get_password(const char *prompt, char *str, int maxlen) +static int get_line(const char *prompt, char *str, int maxlen, int is_pw) { HANDLE hin, hout; - DWORD savemode, i; + DWORD savemode, newmode, i; - if (password) { + if (is_pw && password) { static int tried_once = 0; if (tried_once) { @@ -412,8 +425,12 @@ static int get_password(const char *prompt, char *str, int maxlen) bump("Cannot get standard input/output handles"); GetConsoleMode(hin, &savemode); - SetConsoleMode(hin, (savemode & (~ENABLE_ECHO_INPUT)) | - ENABLE_PROCESSED_INPUT | ENABLE_LINE_INPUT); + newmode = savemode | ENABLE_PROCESSED_INPUT | ENABLE_LINE_INPUT; + if (is_pw) + newmode &= ~ENABLE_ECHO_INPUT; + else + newmode |= ENABLE_ECHO_INPUT; + SetConsoleMode(hin, newmode); WriteFile(hout, prompt, strlen(prompt), &i, NULL); ReadFile(hin, str, maxlen-1, &i, NULL); @@ -423,7 +440,8 @@ static int get_password(const char *prompt, char *str, int maxlen) if ((int)i > maxlen) i = maxlen-1; else i = i - 2; str[i] = '\0'; - WriteFile(hout, "\r\n", 2, &i, NULL); + if (is_pw) + WriteFile(hout, "\r\n", 2, &i, NULL); } return 1; @@ -435,6 +453,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"); @@ -454,7 +473,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) @@ -490,7 +517,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); @@ -588,6 +616,7 @@ static void run_err(const char *fmt, ...) strcpy(str, "scp: "); vsprintf(str+strlen(str), fmt, ap); strcat(str, "\n"); + back->send("\001", 1); /* scp protocol error prefix */ back->send(str, strlen(str)); tell_user(stderr, "%s",str); va_end(ap); @@ -826,12 +855,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; @@ -1007,6 +1030,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); @@ -1163,8 +1207,16 @@ static void usage(void) printf(" -v show verbose messages\n"); printf(" -P port connect to specified port\n"); printf(" -pw passw login with specified password\n"); - /* GUI Adaptation - Sept 2000 */ +#if 0 + /* + * -gui is an internal option, used by GUI front ends to get + * pscp to pass progress reports back to them. It's not an + * ordinary user-accessible option, so it shouldn't be part of + * the command-line help. The only people who need to know + * about it are programmers, and they can read the source. + */ printf(" -gui hWnd GUI mode with the windows handle for receiving messages\n"); +#endif exit(1); } @@ -1179,7 +1231,7 @@ int main(int argc, char *argv[]) default_protocol = PROT_TELNET; flags = FLAG_STDERR; - ssh_get_password = &get_password; + ssh_get_line = &get_line; init_winsock(); sk_init(); @@ -1213,6 +1265,7 @@ int main(int argc, char *argv[]) } argc -= i; argv += i; + back = NULL; if (list) { if (argc != 1) @@ -1232,7 +1285,7 @@ int main(int argc, char *argv[]) tolocal(argc, argv); } - if (back->socket() != NULL) { + if (back != NULL && back->socket() != NULL) { char ch; back->special(TS_EOF); ssh_scp_recv(&ch, 1);