* send buffer.
*/
+static int psftp_connect(char *userhost, char *user, int portnumber);
+static int do_sftp_init(void);
+
/* ----------------------------------------------------------------------
* sftp client state.
*/
}
}
+/*
+ * Return a pointer to the portion of str that comes after the last
+ * slash (or backslash or colon, if `local' is TRUE).
+ */
+static char *stripslashes(char *str, int local)
+{
+ char *p;
+
+ if (local) {
+ p = strchr(str, ':');
+ if (p) str = p+1;
+ }
+
+ p = strrchr(str, '/');
+ if (p) str = p+1;
+
+ if (local) {
+ p = strrchr(str, '\\');
+ if (p) str = p+1;
+ }
+
+ return str;
+}
+
/* ----------------------------------------------------------------------
* Actual sftp commands.
*/
int sftp_cmd_null(struct sftp_command *cmd)
{
- return 0;
+ return 1; /* success */
}
int sftp_cmd_unknown(struct sftp_command *cmd)
{
printf("psftp: unknown command \"%s\"\n", cmd->words[0]);
- return 0;
+ return 0; /* failure */
}
int sftp_cmd_quit(struct sftp_command *cmd)
char *dir, *cdir;
int i;
+ if (back == NULL) {
+ printf("psftp: not connected to a host; use \"open host.name\"\n");
+ return 0;
+ }
+
if (cmd->nwords < 2)
dir = ".";
else
sfree(cdir);
- return 0;
+ return 1;
}
/*
struct fxp_handle *dirh;
char *dir;
+ if (back == NULL) {
+ printf("psftp: not connected to a host; use \"open host.name\"\n");
+ return 0;
+ }
+
if (cmd->nwords < 2)
dir = dupstr(homedir);
else
pwd = dir;
printf("Remote directory is now %s\n", pwd);
- return 0;
+ return 1;
+}
+
+/*
+ * Print current directory. Easy as pie.
+ */
+int sftp_cmd_pwd(struct sftp_command *cmd)
+{
+ if (back == NULL) {
+ printf("psftp: not connected to a host; use \"open host.name\"\n");
+ return 0;
+ }
+
+ printf("Remote directory is %s\n", pwd);
+ return 1;
}
/*
char *fname, *outfname;
uint64 offset;
FILE *fp;
+ int ret;
+
+ if (back == NULL) {
+ printf("psftp: not connected to a host; use \"open host.name\"\n");
+ return 0;
+ }
if (cmd->nwords < 2) {
printf("get: expects a filename\n");
printf("%s: %s\n", cmd->words[1], fxp_error());
return 0;
}
- outfname = (cmd->nwords == 2 ? cmd->words[1] : cmd->words[2]);
+ outfname = (cmd->nwords == 2 ?
+ stripslashes(cmd->words[1], 0) : cmd->words[2]);
fh = fxp_open(fname, SSH_FXF_READ);
if (!fh) {
* FIXME: we can use FXP_FSTAT here to get the file size, and
* thus put up a progress bar.
*/
+ ret = 1;
while (1) {
char buffer[4096];
int len;
break;
if (len == -1) {
printf("error while reading: %s\n", fxp_error());
+ ret = 0;
break;
}
wlen = fwrite(buffer, 1, len - wpos, fp);
if (wlen <= 0) {
printf("error while writing local file\n");
+ ret = 0;
break;
}
wpos += wlen;
}
- if (wpos < len) /* we had an error */
+ if (wpos < len) { /* we had an error */
+ ret = 0;
break;
+ }
offset = uint64_add32(offset, len);
}
fxp_close(fh);
sfree(fname);
- return 0;
+ return ret;
}
int sftp_cmd_get(struct sftp_command *cmd)
{
char *fname, *origoutfname, *outfname;
uint64 offset;
FILE *fp;
+ int ret;
+
+ if (back == NULL) {
+ printf("psftp: not connected to a host; use \"open host.name\"\n");
+ return 0;
+ }
if (cmd->nwords < 2) {
printf("put: expects a filename\n");
}
fname = cmd->words[1];
- origoutfname = (cmd->nwords == 2 ? cmd->words[1] : cmd->words[2]);
+ origoutfname = (cmd->nwords == 2 ?
+ stripslashes(cmd->words[1], 1) : cmd->words[2]);
outfname = canonify(origoutfname);
if (!outfname) {
printf("%s: %s\n", origoutfname, fxp_error());
* FIXME: we can use FXP_FSTAT here to get the file size, and
* thus put up a progress bar.
*/
+ ret = 1;
while (1) {
char buffer[4096];
int len;
len = fread(buffer, 1, sizeof(buffer), fp);
if (len == -1) {
printf("error while reading local file\n");
+ ret = 0;
break;
} else if (len == 0) {
break;
}
if (!fxp_write(fh, buffer, offset, len)) {
printf("error while writing: %s\n", fxp_error());
+ ret = 0;
break;
}
offset = uint64_add32(offset, len);
fclose(fp);
sfree(outfname);
- return 0;
+ return ret;
}
int sftp_cmd_put(struct sftp_command *cmd)
{
char *dir;
int result;
+ if (back == NULL) {
+ printf("psftp: not connected to a host; use \"open host.name\"\n");
+ return 0;
+ }
if (cmd->nwords < 2) {
printf("mkdir: expects a directory\n");
}
sfree(dir);
- return 0;
+ return 1;
}
int sftp_cmd_rmdir(struct sftp_command *cmd)
char *dir;
int result;
+ if (back == NULL) {
+ printf("psftp: not connected to a host; use \"open host.name\"\n");
+ return 0;
+ }
if (cmd->nwords < 2) {
printf("rmdir: expects a directory\n");
}
sfree(dir);
- return 0;
+ return 1;
}
int sftp_cmd_rm(struct sftp_command *cmd)
char *fname;
int result;
+ if (back == NULL) {
+ printf("psftp: not connected to a host; use \"open host.name\"\n");
+ return 0;
+ }
+
if (cmd->nwords < 2) {
printf("rm: expects a filename\n");
return 0;
}
sfree(fname);
- return 0;
-
+ return 1;
}
int sftp_cmd_mv(struct sftp_command *cmd)
char *srcfname, *dstfname;
int result;
+ if (back == NULL) {
+ printf("psftp: not connected to a host; use \"open host.name\"\n");
+ return 0;
+ }
+
if (cmd->nwords < 3) {
printf("mv: expects two filenames\n");
return 0;
sfree(srcfname);
sfree(dstfname);
- return 0;
+ return 1;
}
int sftp_cmd_chmod(struct sftp_command *cmd)
struct fxp_attrs attrs;
unsigned attrs_clr, attrs_xor, oldperms, newperms;
+ if (back == NULL) {
+ printf("psftp: not connected to a host; use \"open host.name\"\n");
+ return 0;
+ }
+
if (cmd->nwords < 3) {
printf("chmod: expects a mode specifier and a filename\n");
return 0;
printf("%s: %04o -> %04o\n", fname, oldperms, newperms);
sfree(fname);
- return 0;
+ return 1;
+}
+
+static int sftp_cmd_open(struct sftp_command *cmd)
+{
+ if (back != NULL) {
+ printf("psftp: already connected\n");
+ return 0;
+ }
+
+ if (cmd->nwords < 2) {
+ printf("open: expects a host name\n");
+ return 0;
+ }
+
+ if (psftp_connect(cmd->words[1], NULL, 0)) {
+ back = NULL; /* connection is already closed */
+ return -1; /* this is fatal */
+ }
+ do_sftp_init();
+ return 1;
+}
+
+static int sftp_cmd_lcd(struct sftp_command *cmd)
+{
+ char *currdir;
+ int len;
+
+ if (cmd->nwords < 2) {
+ printf("lcd: expects a local directory name\n");
+ return 0;
+ }
+
+ if (!SetCurrentDirectory(cmd->words[1])) {
+ LPVOID message;
+ int i;
+ FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER |
+ FORMAT_MESSAGE_FROM_SYSTEM |
+ FORMAT_MESSAGE_IGNORE_INSERTS,
+ NULL, GetLastError(),
+ MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
+ (LPTSTR)&message, 0, NULL);
+ i = strcspn((char *)message, "\n");
+ printf("lcd: unable to change directory: %.*s\n", i, (LPCTSTR)message);
+ LocalFree(message);
+ return 0;
+ }
+
+ currdir = smalloc(256);
+ len = GetCurrentDirectory(256, currdir);
+ if (len > 256)
+ currdir = srealloc(currdir, len);
+ GetCurrentDirectory(len, currdir);
+ printf("New local directory is %s\n", currdir);
+ sfree(currdir);
+
+ return 1;
+}
+
+static int sftp_cmd_lpwd(struct sftp_command *cmd)
+{
+ char *currdir;
+ int len;
+
+ currdir = smalloc(256);
+ len = GetCurrentDirectory(256, currdir);
+ if (len > 256)
+ currdir = srealloc(currdir, len);
+ GetCurrentDirectory(len, currdir);
+ printf("Current local directory is %s\n", currdir);
+ sfree(currdir);
+
+ return 1;
}
+static int sftp_cmd_pling(struct sftp_command *cmd)
+{
+ int exitcode;
+
+ exitcode = system(cmd->words[1]);
+ return (exitcode == 0);
+}
+
+static int sftp_cmd_help(struct sftp_command *cmd);
+
static struct sftp_cmd_lookup {
char *name;
+ /*
+ * For help purposes, there are two kinds of command:
+ *
+ * - primary commands, in which `longhelp' is non-NULL. In
+ * this case `shorthelp' is descriptive text, and `longhelp'
+ * is longer descriptive text intended to be printed after
+ * the command name.
+ *
+ * - alias commands, in which `longhelp' is NULL. In this case
+ * `shorthelp' is the name of a primary command, which
+ * contains the help that should double up for this command.
+ */
+ int listed; /* do we list this in primary help? */
+ char *shorthelp;
+ char *longhelp;
int (*obey) (struct sftp_command *);
} sftp_lookup[] = {
/*
* in ASCII order.
*/
{
- "bye", sftp_cmd_quit}, {
- "cd", sftp_cmd_cd}, {
- "chmod", sftp_cmd_chmod}, {
- "del", sftp_cmd_rm}, {
- "delete", sftp_cmd_rm}, {
- "dir", sftp_cmd_ls}, {
- "exit", sftp_cmd_quit}, {
- "get", sftp_cmd_get}, {
- "ls", sftp_cmd_ls}, {
- "mkdir", sftp_cmd_mkdir}, {
- "mv", sftp_cmd_mv}, {
- "put", sftp_cmd_put}, {
- "quit", sftp_cmd_quit}, {
- "reget", sftp_cmd_reget}, {
- "ren", sftp_cmd_mv}, {
- "rename", sftp_cmd_mv}, {
- "reput", sftp_cmd_reput}, {
- "rm", sftp_cmd_rm}, {
- "rmdir", sftp_cmd_rmdir},};
+ "!", TRUE, "run a local Windows command",
+ "<command>\n"
+ " Runs a local Windows command. For example, \"!del myfile\".\n",
+ sftp_cmd_pling
+ },
+ {
+ "bye", TRUE, "finish your SFTP session",
+ "\n"
+ " Terminates your SFTP session and quits the PSFTP program.\n",
+ sftp_cmd_quit
+ },
+ {
+ "cd", TRUE, "change your remote working directory",
+ " [ <New working directory> ]\n"
+ " Change the remote working directory for your SFTP session.\n"
+ " If a new working directory is not supplied, you will be\n"
+ " returned to your home directory.\n",
+ sftp_cmd_cd
+ },
+ {
+ "chmod", TRUE, "change file permissions and modes",
+ " ( <octal-digits> | <modifiers> ) <filename>\n"
+ " Change the file permissions on a file or directory.\n"
+ " <octal-digits> can be any octal Unix permission specifier.\n"
+ " Alternatively, <modifiers> can include:\n"
+ " u+r make file readable by owning user\n"
+ " u+w make file writable by owning user\n"
+ " u+x make file executable by owning user\n"
+ " u-r make file not readable by owning user\n"
+ " [also u-w, u-x]\n"
+ " g+r make file readable by members of owning group\n"
+ " [also g+w, g+x, g-r, g-w, g-x]\n"
+ " o+r make file readable by all other users\n"
+ " [also o+w, o+x, o-r, o-w, o-x]\n"
+ " a+r make file readable by absolutely everybody\n"
+ " [also a+w, a+x, a-r, a-w, a-x]\n"
+ " u+s enable the Unix set-user-ID bit\n"
+ " u-s disable the Unix set-user-ID bit\n"
+ " g+s enable the Unix set-group-ID bit\n"
+ " g-s disable the Unix set-group-ID bit\n"
+ " +t enable the Unix \"sticky bit\"\n"
+ " You can give more than one modifier for the same user (\"g-rwx\"), and\n"
+ " more than one user for the same modifier (\"ug+w\"). You can\n"
+ " use commas to separate different modifiers (\"u+rwx,g+s\").\n",
+ sftp_cmd_chmod
+ },
+ {
+ "del", TRUE, "delete a file",
+ " <filename>\n"
+ " Delete a file.\n",
+ sftp_cmd_rm
+ },
+ {
+ "delete", FALSE, "del", NULL, sftp_cmd_rm
+ },
+ {
+ "dir", TRUE, "list contents of a remote directory",
+ " [ <directory-name> ]\n"
+ " List the contents of a specified directory on the server.\n"
+ " If <directory-name> is not given, the current working directory\n"
+ " will be listed.\n",
+ sftp_cmd_ls
+ },
+ {
+ "exit", TRUE, "bye", NULL, sftp_cmd_quit
+ },
+ {
+ "get", TRUE, "download a file from the server to your local machine",
+ " <filename> [ <local-filename> ]\n"
+ " Downloads a file on the server and stores it locally under\n"
+ " the same name, or under a different one if you supply the\n"
+ " argument <local-filename>.\n",
+ sftp_cmd_get
+ },
+ {
+ "help", TRUE, "give help",
+ " [ <command> [ <command> ... ] ]\n"
+ " Give general help if no commands are specified.\n"
+ " If one or more commands are specified, give specific help on\n"
+ " those particular commands.\n",
+ sftp_cmd_help
+ },
+ {
+ "lcd", TRUE, "change local working directory",
+ " <local-directory-name>\n"
+ " Change the local working directory of the PSFTP program (the\n"
+ " default location where the \"get\" command will save files).\n",
+ sftp_cmd_lcd
+ },
+ {
+ "lpwd", TRUE, "print local working directory",
+ "\n"
+ " Print the local working directory of the PSFTP program (the\n"
+ " default location where the \"get\" command will save files).\n",
+ sftp_cmd_lpwd
+ },
+ {
+ "ls", TRUE, "dir", NULL,
+ sftp_cmd_ls
+ },
+ {
+ "mkdir", TRUE, "create a directory on the remote server",
+ " <directory-name>\n"
+ " Creates a directory with the given name on the server.\n",
+ sftp_cmd_mkdir
+ },
+ {
+ "mv", TRUE, "move or rename a file on the remote server",
+ " <source-filename> <destination-filename>\n"
+ " Moves or renames the file <source-filename> on the server,\n"
+ " so that it is accessible under the name <destination-filename>.\n",
+ sftp_cmd_mv
+ },
+ {
+ "open", TRUE, "connect to a host",
+ " [<user>@]<hostname>\n"
+ " Establishes an SFTP connection to a given host. Only usable\n"
+ " when you did not already specify a host name on the command\n"
+ " line.\n",
+ sftp_cmd_open
+ },
+ {
+ "put", TRUE, "upload a file from your local machine to the server",
+ " <filename> [ <remote-filename> ]\n"
+ " Uploads a file to the server and stores it there under\n"
+ " the same name, or under a different one if you supply the\n"
+ " argument <remote-filename>.\n",
+ sftp_cmd_put
+ },
+ {
+ "pwd", TRUE, "print your remote working directory",
+ "\n"
+ " Print the current remote working directory for your SFTP session.\n",
+ sftp_cmd_pwd
+ },
+ {
+ "quit", TRUE, "bye", NULL,
+ sftp_cmd_quit
+ },
+ {
+ "reget", TRUE, "continue downloading a file",
+ " <filename> [ <local-filename> ]\n"
+ " Works exactly like the \"get\" command, but the local file\n"
+ " must already exist. The download will begin at the end of the\n"
+ " file. This is for resuming a download that was interrupted.\n",
+ sftp_cmd_reget
+ },
+ {
+ "ren", TRUE, "mv", NULL,
+ sftp_cmd_mv
+ },
+ {
+ "rename", FALSE, "mv", NULL,
+ sftp_cmd_mv
+ },
+ {
+ "reput", TRUE, "continue uploading a file",
+ " <filename> [ <remote-filename> ]\n"
+ " Works exactly like the \"put\" command, but the remote file\n"
+ " must already exist. The upload will begin at the end of the\n"
+ " file. This is for resuming an upload that was interrupted.\n",
+ sftp_cmd_reput
+ },
+ {
+ "rm", TRUE, "del", NULL,
+ sftp_cmd_rm
+ },
+ {
+ "rmdir", TRUE, "remove a directory on the remote server",
+ " <directory-name>\n"
+ " Removes the directory with the given name on the server.\n"
+ " The directory will not be removed unless it is empty.\n",
+ sftp_cmd_rmdir
+ }
+};
+
+const struct sftp_cmd_lookup *lookup_command(char *name)
+{
+ int i, j, k, cmp;
+
+ i = -1;
+ j = sizeof(sftp_lookup) / sizeof(*sftp_lookup);
+ while (j - i > 1) {
+ k = (j + i) / 2;
+ cmp = strcmp(name, sftp_lookup[k].name);
+ if (cmp < 0)
+ j = k;
+ else if (cmp > 0)
+ i = k;
+ else {
+ return &sftp_lookup[k];
+ }
+ }
+ return NULL;
+}
+
+static int sftp_cmd_help(struct sftp_command *cmd)
+{
+ int i;
+ if (cmd->nwords == 1) {
+ /*
+ * Give short help on each command.
+ */
+ int maxlen;
+ maxlen = 0;
+ for (i = 0; i < sizeof(sftp_lookup) / sizeof(*sftp_lookup); i++) {
+ int len;
+ if (!sftp_lookup[i].listed)
+ continue;
+ len = strlen(sftp_lookup[i].name);
+ if (maxlen < len)
+ maxlen = len;
+ }
+ for (i = 0; i < sizeof(sftp_lookup) / sizeof(*sftp_lookup); i++) {
+ const struct sftp_cmd_lookup *lookup;
+ if (!sftp_lookup[i].listed)
+ continue;
+ lookup = &sftp_lookup[i];
+ printf("%-*s", maxlen+2, lookup->name);
+ if (lookup->longhelp == NULL)
+ lookup = lookup_command(lookup->shorthelp);
+ printf("%s\n", lookup->shorthelp);
+ }
+ } else {
+ /*
+ * Give long help on specific commands.
+ */
+ for (i = 1; i < cmd->nwords; i++) {
+ const struct sftp_cmd_lookup *lookup;
+ lookup = lookup_command(cmd->words[i]);
+ if (!lookup) {
+ printf("help: %s: command not found\n", cmd->words[i]);
+ } else {
+ printf("%s", lookup->name);
+ if (lookup->longhelp == NULL)
+ lookup = lookup_command(lookup->shorthelp);
+ printf("%s", lookup->longhelp);
+ }
+ }
+ }
+ return 1;
+}
/* ----------------------------------------------------------------------
* Command line reading and parsing.
char *p, *q, *r;
int quoting;
- if ((mode == 0) || (modeflags & 1)) {
- printf("psftp> ");
- }
+ if ((mode == 0) || (modeflags & 1)) {
+ printf("psftp> ");
+ }
fflush(stdout);
cmd = smalloc(sizeof(struct sftp_command));
linesize += 512;
line = srealloc(line, linesize);
ret = fgets(line + linelen, linesize - linelen, fp);
- if (modeflags & 1) {
- printf("%s", ret);
- }
if (!ret || (linelen == 0 && line[0] == '\0')) {
cmd->obey = sftp_cmd_quit;
- printf("quit\n");
+ if ((mode == 0) || (modeflags & 1))
+ printf("quit\n");
return cmd; /* eof */
}
len = linelen + strlen(line + linelen);
break;
}
}
+ if (modeflags & 1) {
+ printf("%s\n", line);
+ }
- /*
- * Parse the command line into words. The syntax is:
- * - double quotes are removed, but cause spaces within to be
- * treated as non-separating.
- * - a double-doublequote pair is a literal double quote, inside
- * _or_ outside quotes. Like this:
- *
- * firstword "second word" "this has ""quotes"" in" sodoes""this""
- *
- * becomes
- *
- * >firstword<
- * >second word<
- * >this has "quotes" in<
- * >sodoes"this"<
- */
p = line;
- while (*p) {
- /* skip whitespace */
- while (*p && (*p == ' ' || *p == '\t'))
- p++;
- /* mark start of word */
- q = r = p; /* q sits at start, r writes word */
- quoting = 0;
+ while (*p && (*p == ' ' || *p == '\t'))
+ p++;
+
+ if (*p == '!') {
+ /*
+ * Special case: the ! command. This is always parsed as
+ * exactly two words: one containing the !, and the second
+ * containing everything else on the line.
+ */
+ cmd->nwords = cmd->wordssize = 2;
+ cmd->words = srealloc(cmd->words, cmd->wordssize * sizeof(char *));
+ cmd->words[0] = "!";
+ cmd->words[1] = p+1;
+ } else {
+
+ /*
+ * Parse the command line into words. The syntax is:
+ * - double quotes are removed, but cause spaces within to be
+ * treated as non-separating.
+ * - a double-doublequote pair is a literal double quote, inside
+ * _or_ outside quotes. Like this:
+ *
+ * firstword "second word" "this has ""quotes"" in" and""this""
+ *
+ * becomes
+ *
+ * >firstword<
+ * >second word<
+ * >this has "quotes" in<
+ * >and"this"<
+ */
while (*p) {
- if (!quoting && (*p == ' ' || *p == '\t'))
- break; /* reached end of word */
- else if (*p == '"' && p[1] == '"')
- p += 2, *r++ = '"'; /* a literal quote */
- else if (*p == '"')
- p++, quoting = !quoting;
- else
- *r++ = *p++;
- }
- if (*p)
- p++; /* skip over the whitespace */
- *r = '\0';
- if (cmd->nwords >= cmd->wordssize) {
- cmd->wordssize = cmd->nwords + 16;
- cmd->words =
- srealloc(cmd->words, cmd->wordssize * sizeof(char *));
+ /* skip whitespace */
+ while (*p && (*p == ' ' || *p == '\t'))
+ p++;
+ /* mark start of word */
+ q = r = p; /* q sits at start, r writes word */
+ quoting = 0;
+ while (*p) {
+ if (!quoting && (*p == ' ' || *p == '\t'))
+ break; /* reached end of word */
+ else if (*p == '"' && p[1] == '"')
+ p += 2, *r++ = '"'; /* a literal quote */
+ else if (*p == '"')
+ p++, quoting = !quoting;
+ else
+ *r++ = *p++;
+ }
+ if (*p)
+ p++; /* skip over the whitespace */
+ *r = '\0';
+ if (cmd->nwords >= cmd->wordssize) {
+ cmd->wordssize = cmd->nwords + 16;
+ cmd->words =
+ srealloc(cmd->words, cmd->wordssize * sizeof(char *));
+ }
+ cmd->words[cmd->nwords++] = q;
}
- cmd->words[cmd->nwords++] = q;
}
/*
if (cmd->nwords == 0)
cmd->obey = sftp_cmd_null;
else {
- int i, j, k, cmp;
-
- cmd->obey = sftp_cmd_unknown;
-
- i = -1;
- j = sizeof(sftp_lookup) / sizeof(*sftp_lookup);
- while (j - i > 1) {
- k = (j + i) / 2;
- cmp = strcmp(cmd->words[0], sftp_lookup[k].name);
- if (cmp < 0)
- j = k;
- else if (cmp > 0)
- i = k;
- else {
- cmd->obey = sftp_lookup[k].obey;
- break;
- }
- }
+ const struct sftp_cmd_lookup *lookup;
+ lookup = lookup_command(cmd->words[0]);
+ if (!lookup)
+ cmd->obey = sftp_cmd_unknown;
+ else
+ cmd->obey = lookup->obey;
}
return cmd;
}
-void do_sftp(int mode, int modeflags, char *batchfile)
+static int do_sftp_init(void)
{
- FILE *fp;
-
/*
* Do protocol initialisation.
*/
if (!fxp_init()) {
fprintf(stderr,
"Fatal: unable to initialise SFTP: %s\n", fxp_error());
- return;
+ return 1; /* failure */
}
/*
printf("Remote working directory is %s\n", homedir);
}
pwd = dupstr(homedir);
+ return 0;
+}
+
+void do_sftp(int mode, int modeflags, char *batchfile)
+{
+ FILE *fp;
+ int ret;
/*
* Batch mode?
* Now we're ready to do Real Stuff.
*/
while (1) {
- struct sftp_command *cmd;
- cmd = sftp_getcmd(stdin, 0, 0);
- if (!cmd)
- break;
- if (cmd->obey(cmd) < 0)
- break;
- }
+ struct sftp_command *cmd;
+ cmd = sftp_getcmd(stdin, 0, 0);
+ if (!cmd)
+ break;
+ if (cmd->obey(cmd) < 0)
+ break;
+ }
} else {
fp = fopen(batchfile, "r");
if (!fp) {
- printf("Fatal: unable to open %s\n", batchfile);
- return;
+ printf("Fatal: unable to open %s\n", batchfile);
+ return;
}
while (1) {
- struct sftp_command *cmd;
- cmd = sftp_getcmd(fp, mode, modeflags);
- if (!cmd)
- break;
- if (cmd->obey(cmd) < 0)
+ struct sftp_command *cmd;
+ cmd = sftp_getcmd(fp, mode, modeflags);
+ if (!cmd)
+ break;
+ ret = cmd->obey(cmd);
+ if (ret < 0)
+ break;
+ if (ret == 0) {
+ if (!(modeflags & 2))
break;
- if (fxp_error() != NULL) {
- if (!(modeflags & 2))
- break;
- }
+ }
}
- fclose(fp);
+ fclose(fp);
}
}
static int verbose = 0;
-void verify_ssh_host_key(char *host, int port, char *keytype,
- char *keystr, char *fingerprint)
-{
- int ret;
- HANDLE hin;
- DWORD savemode, i;
-
- static const char absentmsg[] =
- "The server's host key is not cached in the registry. You\n"
- "have no guarantee that the server is the computer you\n"
- "think it is.\n"
- "The server's key fingerprint is:\n"
- "%s\n"
- "If you trust this host, enter \"y\" to add the key to\n"
- "PuTTY's cache and carry on connecting.\n"
- "If you want to carry on connecting just once, without\n"
- "adding the key to the cache, enter \"n\".\n"
- "If you do not trust this host, press Return to abandon the\n"
- "connection.\n"
- "Store key in cache? (y/n) ";
-
- static const char wrongmsg[] =
- "WARNING - POTENTIAL SECURITY BREACH!\n"
- "The server's host key does not match the one PuTTY has\n"
- "cached in the registry. This means that either the\n"
- "server administrator has changed the host key, or you\n"
- "have actually connected to another computer pretending\n"
- "to be the server.\n"
- "The new key fingerprint is:\n"
- "%s\n"
- "If you were expecting this change and trust the new key,\n"
- "enter \"y\" to update PuTTY's cache and continue connecting.\n"
- "If you want to carry on connecting but without updating\n"
- "the cache, enter \"n\".\n"
- "If you want to abandon the connection completely, press\n"
- "Return to cancel. Pressing Return is the ONLY guaranteed\n"
- "safe choice.\n"
- "Update cached key? (y/n, Return cancels connection) ";
-
- static const char abandoned[] = "Connection abandoned.\n";
-
- char line[32];
-
- /*
- * Verify the key against the registry.
- */
- ret = verify_host_key(host, port, keytype, keystr);
-
- if (ret == 0) /* success - key matched OK */
- return;
-
- if (ret == 2) { /* key was different */
- fprintf(stderr, wrongmsg, fingerprint);
- fflush(stderr);
- }
- if (ret == 1) { /* key was absent */
- fprintf(stderr, absentmsg, fingerprint);
- fflush(stderr);
- }
-
- hin = GetStdHandle(STD_INPUT_HANDLE);
- GetConsoleMode(hin, &savemode);
- SetConsoleMode(hin, (savemode | ENABLE_ECHO_INPUT |
- ENABLE_PROCESSED_INPUT | ENABLE_LINE_INPUT));
- ReadFile(hin, line, sizeof(line) - 1, &i, NULL);
- SetConsoleMode(hin, savemode);
-
- if (line[0] != '\0' && line[0] != '\r' && line[0] != '\n') {
- if (line[0] == 'y' || line[0] == 'Y')
- store_host_key(host, port, keytype, keystr);
- } else {
- fprintf(stderr, abandoned);
- exit(0);
- }
-}
-
-/*
- * Ask whether the selected cipher is acceptable (since it was
- * below the configured 'warn' threshold).
- * cs: 0 = both ways, 1 = client->server, 2 = server->client
- */
-void askcipher(char *ciphername, int cs)
-{
- HANDLE hin;
- DWORD savemode, i;
-
- static const char msg[] =
- "The first %scipher supported by the server is\n"
- "%s, which is below the configured warning threshold.\n"
- "Continue with connection? (y/n) ";
- static const char abandoned[] = "Connection abandoned.\n";
-
- char line[32];
-
- fprintf(stderr, msg,
- (cs == 0) ? "" :
- (cs == 1) ? "client-to-server " :
- "server-to-client ",
- ciphername);
- fflush(stderr);
-
- hin = GetStdHandle(STD_INPUT_HANDLE);
- GetConsoleMode(hin, &savemode);
- SetConsoleMode(hin, (savemode | ENABLE_ECHO_INPUT |
- ENABLE_PROCESSED_INPUT | ENABLE_LINE_INPUT));
- ReadFile(hin, line, sizeof(line) - 1, &i, NULL);
- SetConsoleMode(hin, savemode);
-
- if (line[0] == 'y' || line[0] == 'Y') {
- return;
- } else {
- fprintf(stderr, abandoned);
- exit(0);
- }
-}
-
/*
* Print an error message and perform a fatal exit.
*/
vsprintf(str + strlen(str), fmt, ap);
va_end(ap);
strcat(str, "\n");
- fprintf(stderr, str);
+ fputs(str, stderr);
- exit(1);
+ cleanup_exit(1);
}
void connection_fatal(char *fmt, ...)
{
vsprintf(str + strlen(str), fmt, ap);
va_end(ap);
strcat(str, "\n");
- fprintf(stderr, str);
-
- exit(1);
-}
+ fputs(str, stderr);
-void logevent(char *string)
-{
+ cleanup_exit(1);
}
-void ldisc_send(char *buf, int len)
+void ldisc_send(char *buf, int len, int interactive)
{
/*
* This is only here because of the calls to ldisc_send(NULL,
unsigned char *p = (unsigned char *) data;
unsigned len = (unsigned) datalen;
+ assert(len > 0);
+
/*
* stderr data is just spouted to local stderr and otherwise
* ignored.
}
}
-static char *password = NULL;
-static int get_line(const char *prompt, char *str, int maxlen, int is_pw)
-{
- HANDLE hin, hout;
- DWORD savemode, newmode, i;
-
- if (password) {
- static int tried_once = 0;
-
- if (tried_once) {
- return 0;
- } else {
- strncpy(str, password, maxlen);
- str[maxlen - 1] = '\0';
- tried_once = 1;
- return 1;
- }
- }
-
- hin = GetStdHandle(STD_INPUT_HANDLE);
- hout = GetStdHandle(STD_OUTPUT_HANDLE);
- if (hin == INVALID_HANDLE_VALUE || hout == INVALID_HANDLE_VALUE) {
- fprintf(stderr, "Cannot get standard input/output handles\n");
- exit(1);
- }
-
- GetConsoleMode(hin, &savemode);
- 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);
-
- SetConsoleMode(hin, savemode);
-
- if ((int) i > maxlen)
- i = maxlen - 1;
- else
- i = i - 2;
- str[i] = '\0';
-
- if (is_pw)
- WriteFile(hout, "\r\n", 2, &i, NULL);
-
- return 1;
-}
-
/*
* Initialize the Win$ock driver.
*/
winsock_ver = MAKEWORD(1, 1);
if (WSAStartup(winsock_ver, &wsadata)) {
fprintf(stderr, "Unable to initialise WinSock");
- exit(1);
+ cleanup_exit(1);
}
if (LOBYTE(wsadata.wVersion) != 1 || HIBYTE(wsadata.wVersion) != 1) {
fprintf(stderr, "WinSock version is incompatible with 1.1");
- exit(1);
+ cleanup_exit(1);
}
}
printf(" -v show verbose messages\n");
printf(" -P port connect to specified port\n");
printf(" -pw passw login with specified password\n");
- exit(1);
+ cleanup_exit(1);
}
/*
- * Main program. Parse arguments etc.
+ * Connect to a host.
*/
-int main(int argc, char *argv[])
+static int psftp_connect(char *userhost, char *user, int portnumber)
{
- int i;
- int portnumber = 0;
- char *user, *host, *userhost, *realhost;
+ char *host, *realhost;
char *err;
- int mode = 0;
- int modeflags = 0;
- char *batchfile = NULL;
-
- flags = FLAG_STDERR;
- ssh_get_line = &get_line;
- init_winsock();
- sk_init();
-
- userhost = user = NULL;
-
- for (i = 1; i < argc; i++) {
- if (argv[i][0] != '-') {
- if (userhost)
- usage();
- else
- userhost = dupstr(argv[i]);
- } else if (strcmp(argv[i], "-v") == 0) {
- verbose = 1, flags |= FLAG_VERBOSE;
- } else if (strcmp(argv[i], "-h") == 0 ||
- strcmp(argv[i], "-?") == 0) {
- usage();
- } else if (strcmp(argv[i], "-l") == 0 && i + 1 < argc) {
- user = argv[++i];
- } else if (strcmp(argv[i], "-P") == 0 && i + 1 < argc) {
- portnumber = atoi(argv[++i]);
- } else if (strcmp(argv[i], "-pw") == 0 && i + 1 < argc) {
- password = argv[++i];
- } else if (strcmp(argv[i], "-b") == 0 && i + 1 < argc) {
- mode = 1;
- batchfile = argv[++i];
- } else if (strcmp(argv[i], "-bc") == 0 && i + 1 < argc) {
- modeflags = modeflags | 1;
- } else if (strcmp(argv[i], "-be") == 0 && i + 1 < argc) {
- modeflags = modeflags | 2;
- } else if (strcmp(argv[i], "--") == 0) {
- i++;
- break;
- } else {
- usage();
- }
- }
- argc -= i;
- argv += i;
- back = NULL;
-
- if (argc > 0 || !userhost)
- usage();
/* Separate host and username */
host = userhost;
cfg.port = 22;
}
+ /*
+ * Trim leading whitespace off the hostname if it's there.
+ */
+ {
+ int space = strspn(cfg.host, " \t");
+ memmove(cfg.host, cfg.host+space, 1+strlen(cfg.host)-space);
+ }
+
+ /* See if host is of the form user@host */
+ if (cfg.host[0] != '\0') {
+ char *atsign = strchr(cfg.host, '@');
+ /* Make sure we're not overflowing the user field */
+ if (atsign) {
+ if (atsign - cfg.host < sizeof cfg.username) {
+ strncpy(cfg.username, cfg.host, atsign - cfg.host);
+ cfg.username[atsign - cfg.host] = '\0';
+ }
+ memmove(cfg.host, atsign + 1, 1 + strlen(atsign + 1));
+ }
+ }
+
+ /*
+ * Trim a colon suffix off the hostname if it's there.
+ */
+ cfg.host[strcspn(cfg.host, ":")] = '\0';
+
/* Set username */
if (user != NULL && user[0] != '\0') {
strncpy(cfg.username, user, sizeof(cfg.username) - 1);
printf("login as: ");
if (!fgets(cfg.username, sizeof(cfg.username), stdin)) {
fprintf(stderr, "psftp: aborting\n");
- exit(1);
+ cleanup_exit(1);
} else {
int len = strlen(cfg.username);
if (cfg.username[len - 1] == '\n')
/* SFTP uses SSH2 by default always */
cfg.sshprot = 2;
+ /*
+ * Disable scary things which shouldn't be enabled for simple
+ * things like SCP and SFTP: agent forwarding, port forwarding,
+ * X forwarding.
+ */
+ cfg.x11_forward = 0;
+ cfg.agentfwd = 0;
+ cfg.portfwd[0] = cfg.portfwd[1] = '\0';
+
/* Set up subsystem name. */
strcpy(cfg.remote_cmd, "sftp");
cfg.ssh_subsys = TRUE;
* Set up fallback option, for SSH1 servers or servers with the
* sftp subsystem not enabled but the server binary installed
* in the usual place. We only support fallback on Unix
- * systems, and we use the kludgy command string
+ * systems, and we use a kludgy piece of shellery which should
+ * try to find sftp-server in various places (the obvious
+ * systemwide spots /usr/lib and /usr/local/lib, and then the
+ * user's PATH) and finally give up.
*
- * if test ! -x /usr/lib/sftp-server -a -x /usr/local/lib/sftp-server
- * then
- * exec /usr/local/lib/sftp-server
- * else
- * exec /usr/lib/sftp-server
- * fi
+ * test -x /usr/lib/sftp-server && exec /usr/lib/sftp-server
+ * test -x /usr/local/lib/sftp-server && exec /usr/local/lib/sftp-server
+ * exec sftp-server
*
* the idea being that this will attempt to use either of the
* obvious pathnames and then give up, and when it does give up
* it will print the preferred pathname in the error messages.
*/
cfg.remote_cmd_ptr2 =
- "if test ! -x /usr/lib/sftp-server -a -x /usr/local/lib/sftp-server\n"
- "then\n"
- " exec /usr/local/lib/sftp-server\n"
- "else\n"
- " exec /usr/lib/sftp-server\n"
- "fi";
+ "test -x /usr/lib/sftp-server && exec /usr/lib/sftp-server\n"
+ "test -x /usr/local/lib/sftp-server && exec /usr/local/lib/sftp-server\n"
+ "exec sftp-server";
cfg.ssh_subsys2 = FALSE;
back = &ssh_backend;
- err = back->init(cfg.host, cfg.port, &realhost);
+ err = back->init(cfg.host, cfg.port, &realhost, 0);
if (err != NULL) {
- fprintf(stderr, "ssh_init: %s", err);
+ fprintf(stderr, "ssh_init: %s\n", err);
return 1;
}
ssh_sftp_init();
if (verbose && realhost != NULL)
printf("Connected to %s\n", realhost);
+ return 0;
+}
+
+/*
+ * Main program. Parse arguments etc.
+ */
+int main(int argc, char *argv[])
+{
+ int i;
+ int portnumber = 0;
+ char *userhost, *user;
+ int mode = 0;
+ int modeflags = 0;
+ char *batchfile = NULL;
+
+ flags = FLAG_STDERR | FLAG_INTERACTIVE;
+ ssh_get_line = &console_get_line;
+ init_winsock();
+ sk_init();
+
+ userhost = user = NULL;
+
+ for (i = 1; i < argc; i++) {
+ if (argv[i][0] != '-') {
+ if (userhost)
+ usage();
+ else
+ userhost = dupstr(argv[i]);
+ } else if (strcmp(argv[i], "-v") == 0) {
+ verbose = 1, flags |= FLAG_VERBOSE;
+ } else if (strcmp(argv[i], "-h") == 0 ||
+ strcmp(argv[i], "-?") == 0) {
+ usage();
+ } else if (strcmp(argv[i], "-l") == 0 && i + 1 < argc) {
+ user = argv[++i];
+ } else if (strcmp(argv[i], "-P") == 0 && i + 1 < argc) {
+ portnumber = atoi(argv[++i]);
+ } else if (strcmp(argv[i], "-pw") == 0 && i + 1 < argc) {
+ console_password = argv[++i];
+ } else if (strcmp(argv[i], "-b") == 0 && i + 1 < argc) {
+ mode = 1;
+ batchfile = argv[++i];
+ } else if (strcmp(argv[i], "-bc") == 0) {
+ modeflags = modeflags | 1;
+ } else if (strcmp(argv[i], "-batch") == 0) {
+ console_batch_mode = TRUE;
+ } else if (strcmp(argv[i], "-be") == 0) {
+ modeflags = modeflags | 2;
+ } else if (strcmp(argv[i], "--") == 0) {
+ i++;
+ break;
+ } else {
+ usage();
+ }
+ }
+ argc -= i;
+ argv += i;
+ back = NULL;
+
+ /*
+ * If a user@host string has already been provided, connect to
+ * it now.
+ */
+ if (userhost) {
+ if (psftp_connect(userhost, user, portnumber))
+ return 1;
+ if (do_sftp_init())
+ return 1;
+ } else {
+ printf("psftp: no hostname specified; use \"open host.name\""
+ " to connect\n");
+ }
do_sftp(mode, modeflags, batchfile);