#define PUTTY_DO_GLOBALS
#include "putty.h"
+#include "winstuff.h"
#include "storage.h"
#define TIME_POSIX_TO_WIN(t, ft) (*(LONGLONG*)&(ft) = \
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;
static void source(char *src);
static void rsource(char *src);
-static void sink(char *targ);
+static void sink(char *targ, char *src);
/* GUI Adaptation - Sept 2000 */
static void tell_char(FILE *stream, char c);
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,
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;
}
/*
+ * 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.
*
* To do this, we repeatedly call the SSH protocol module, with our
- * own trap in term_out() to catch the data that comes back. We do
- * this until we have enough data.
+ * 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 */
static unsigned pendlen=0, pendsize=0; /* length and phys. size of buffer */
-void term_out(void) {
+void from_backend(int is_stderr, char *data, int datalen) {
+ unsigned char *p = (unsigned char *)data;
+ unsigned len = (unsigned)datalen;
+
/*
- * Here we must deal with a block of data, in `inbuf', size
- * `inbuf_head'.
+ * stderr data is just spouted to local stderr and otherwise
+ * ignored.
*/
- unsigned char *p = inbuf;
- unsigned len = inbuf_head;
+ if (is_stderr) {
+ fwrite(data, 1, len, stderr);
+ return;
+ }
inbuf_head = 0;
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");
}
}
}
static int ssh_scp_recv(unsigned char *buf, int len) {
- SOCKET s;
-
outptr = buf;
outlen = len;
pendlen -= pendused;
if (pendlen == 0) {
pendsize = 0;
- free(pending);
+ sfree(pending);
pending = NULL;
}
if (outlen == 0)
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);
- term_out();
+ select_result((WPARAM)scp_ssh_socket, (LPARAM)FD_READ);
}
return 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);
- term_out();
+ select_result((WPARAM)scp_ssh_socket, (LPARAM)FD_READ);
}
}
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);
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");
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;
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)
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;
}
/*
/* 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);
va_list ap;
va_start(ap, fmt);
errs++;
- strcpy(str, "\01scp: ");
+ strcpy(str, "scp: ");
vsprintf(str+strlen(str), fmt, ap);
strcat(str, "\n");
back->send(str, strlen(str));
/*
* Execute the sink part of the SCP protocol.
*/
-static void sink(char *targ)
+static void sink(char *targ, char *src)
{
char buf[2048];
char namebuf[2048];
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 (targisdir) {
char t[2048];
+ char *p;
strcpy(t, targ);
if (targ[0] != '\0')
strcat(t, "/");
- strcat(t, namebuf);
+ p = namebuf + strlen(namebuf);
+ while (p > namebuf && p[-1] != '/' && p[-1] != '\\')
+ p--;
+ strcat(t, p);
strcpy(namebuf, t);
} else {
strcpy(namebuf, targ);
continue;
}
}
- sink(namebuf);
+ sink(namebuf, NULL);
/* can we set the timestamp for directories ? */
continue;
}
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);
do_cmd(host, user, cmd);
sfree(cmd);
- sink(targ);
+ sink(targ, src);
}
/*
flags = FLAG_STDERR;
ssh_get_password = &get_password;
init_winsock();
+ sk_init();
for (i = 1; i < argc; i++) {
if (argv[i][0] != '-')
}
argc -= i;
argv += i;
+ back = NULL;
if (list) {
if (argc != 1)
tolocal(argc, argv);
}
- if (connection_open) {
+ if (back != NULL && back->socket() != NULL) {
char ch;
back->special(TS_EOF);
ssh_scp_recv(&ch, 1);
projects / u / mdw / putty / blobdiff