/*
- * Copyright (c) 2001 Damien Miller. All rights reserved.
+ * Copyright (c) 2001,2002 Damien Miller. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-/* XXX: finish implementation of all commands */
-/* XXX: do fnmatch() instead of using raw pathname */
/* XXX: globbed ls */
/* XXX: recursive operations */
#include "includes.h"
-RCSID("$OpenBSD: sftp-int.c,v 1.25 2001/03/06 06:11:44 deraadt Exp $");
+RCSID("$OpenBSD: sftp-int.c,v 1.47 2002/06/23 09:30:14 deraadt Exp $");
#include "buffer.h"
#include "xmalloc.h"
#include "sftp.h"
#include "sftp-common.h"
+#include "sftp-glob.h"
#include "sftp-client.h"
#include "sftp-int.h"
-extern FILE* infile;
+/* File to read commands from */
+extern FILE *infile;
+
+/* Size of buffer used when copying files */
+extern size_t copy_buffer_len;
+
+/* Number of concurrent outstanding requests */
+extern int num_requests;
/* Seperators for interactive commands */
#define WHITESPACE " \t\r\n"
#define I_RM 18
#define I_RMDIR 19
#define I_SHELL 20
+#define I_SYMLINK 21
+#define I_VERSION 22
struct CMD {
const char *c;
};
const struct CMD cmds[] = {
+ { "bye", I_QUIT },
{ "cd", I_CHDIR },
{ "chdir", I_CHDIR },
{ "chgrp", I_CHGRP },
{ "dir", I_LS },
{ "exit", I_QUIT },
{ "get", I_GET },
+ { "mget", I_GET },
{ "help", I_HELP },
{ "lcd", I_LCHDIR },
{ "lchdir", I_LCHDIR },
{ "lls", I_LLS },
{ "lmkdir", I_LMKDIR },
+ { "ln", I_SYMLINK },
{ "lpwd", I_LPWD },
{ "ls", I_LS },
{ "lumask", I_LUMASK },
{ "mkdir", I_MKDIR },
{ "put", I_PUT },
+ { "mput", I_PUT },
{ "pwd", I_PWD },
{ "quit", I_QUIT },
{ "rename", I_RENAME },
{ "rm", I_RM },
{ "rmdir", I_RMDIR },
+ { "symlink", I_SYMLINK },
+ { "version", I_VERSION },
{ "!", I_SHELL },
{ "?", I_HELP },
{ NULL, -1}
};
-void
+static void
help(void)
{
printf("Available commands:\n");
printf("help Display this help text\n");
printf("get remote-path [local-path] Download file\n");
printf("lls [ls-options [path]] Display local directory listing\n");
+ printf("ln oldpath newpath Symlink remote file\n");
printf("lmkdir path Create local directory\n");
printf("lpwd Print local working directory\n");
printf("ls [path] Display remote directory listing\n");
printf("rename oldpath newpath Rename remote file\n");
printf("rmdir path Remove remote directory\n");
printf("rm path Delete remote file\n");
+ printf("symlink oldpath newpath Symlink remote file\n");
+ printf("version Show SFTP version\n");
printf("!command Execute 'command' in local shell\n");
printf("! Escape to local shell\n");
printf("? Synonym for help\n");
}
-void
+static void
local_do_shell(const char *args)
{
- int ret, status;
+ int status;
char *shell;
pid_t pid;
/* XXX: child has pipe fds to ssh subproc open - issue? */
if (args) {
debug3("Executing %s -c \"%s\"", shell, args);
- ret = execl(shell, shell, "-c", args, NULL);
+ execl(shell, shell, "-c", args, (char *)NULL);
} else {
debug3("Executing %s", shell);
- ret = execl(shell, shell, NULL);
+ execl(shell, shell, (char *)NULL);
}
fprintf(stderr, "Couldn't execute \"%s\": %s\n", shell,
strerror(errno));
_exit(1);
}
- if (waitpid(pid, &status, 0) == -1)
- fatal("Couldn't wait for child: %s", strerror(errno));
+ while (waitpid(pid, &status, 0) == -1)
+ if (errno != EINTR)
+ fatal("Couldn't wait for child: %s", strerror(errno));
if (!WIFEXITED(status))
error("Shell exited abormally");
else if (WEXITSTATUS(status))
error("Shell exited with status %d", WEXITSTATUS(status));
}
-void
+static void
local_do_ls(const char *args)
{
if (!args || !*args)
}
}
-char *
+static char *
+path_append(char *p1, char *p2)
+{
+ char *ret;
+ int len = strlen(p1) + strlen(p2) + 2;
+
+ ret = xmalloc(len);
+ strlcpy(ret, p1, len);
+ if (strcmp(p1, "/") != 0)
+ strlcat(ret, "/", len);
+ strlcat(ret, p2, len);
+
+ return(ret);
+}
+
+static char *
make_absolute(char *p, char *pwd)
{
- char buf[2048];
+ char *abs;
/* Derelativise */
if (p && p[0] != '/') {
- snprintf(buf, sizeof(buf), "%s/%s", pwd, p);
+ abs = path_append(pwd, p);
xfree(p);
- p = xstrdup(buf);
+ return(abs);
+ } else
+ return(p);
+}
+
+static int
+infer_path(const char *p, char **ifp)
+{
+ char *cp;
+
+ cp = strrchr(p, '/');
+ if (cp == NULL) {
+ *ifp = xstrdup(p);
+ return(0);
+ }
+
+ if (!cp[1]) {
+ error("Invalid path");
+ return(-1);
}
- return(p);
+ *ifp = xstrdup(cp + 1);
+ return(0);
}
-int
+static int
parse_getput_flags(const char **cpp, int *pflag)
{
const char *cp = *cpp;
return(0);
}
-int
+static int
get_pathname(const char **cpp, char **path)
{
const char *cp = *cpp, *end;
/* Check for quoted filenames */
if (*cp == '\"' || *cp == '\'') {
quot = *cp++;
-
+
end = strchr(cp, quot);
if (end == NULL) {
error("Unterminated quote");
return (-1);
}
-int
-infer_path(const char *p, char **ifp)
+static int
+is_dir(char *path)
{
- char *cp;
+ struct stat sb;
+
+ /* XXX: report errors? */
+ if (stat(path, &sb) == -1)
+ return(0);
- debug("XXX: P = \"%s\"", p);
+ return(sb.st_mode & S_IFDIR);
+}
- cp = strrchr(p, '/');
- if (cp == NULL) {
- *ifp = xstrdup(p);
+static int
+remote_is_dir(struct sftp_conn *conn, char *path)
+{
+ Attrib *a;
+
+ /* XXX: report errors? */
+ if ((a = do_stat(conn, path, 1)) == NULL)
+ return(0);
+ if (!(a->flags & SSH2_FILEXFER_ATTR_PERMISSIONS))
return(0);
+ return(a->perm & S_IFDIR);
+}
+
+static int
+process_get(struct sftp_conn *conn, char *src, char *dst, char *pwd, int pflag)
+{
+ char *abs_src = NULL;
+ char *abs_dst = NULL;
+ char *tmp;
+ glob_t g;
+ int err = 0;
+ int i;
+
+ abs_src = xstrdup(src);
+ abs_src = make_absolute(abs_src, pwd);
+
+ memset(&g, 0, sizeof(g));
+ debug3("Looking up %s", abs_src);
+ if (remote_glob(conn, abs_src, 0, NULL, &g)) {
+ error("File \"%s\" not found.", abs_src);
+ err = -1;
+ goto out;
}
- if (!cp[1]) {
- error("Invalid path");
- return(-1);
+ /* Only one match, dst may be file, directory or unspecified */
+ if (g.gl_pathv[0] && g.gl_matchc == 1) {
+ if (dst) {
+ /* If directory specified, append filename */
+ if (is_dir(dst)) {
+ if (infer_path(g.gl_pathv[0], &tmp)) {
+ err = 1;
+ goto out;
+ }
+ abs_dst = path_append(dst, tmp);
+ xfree(tmp);
+ } else
+ abs_dst = xstrdup(dst);
+ } else if (infer_path(g.gl_pathv[0], &abs_dst)) {
+ err = -1;
+ goto out;
+ }
+ printf("Fetching %s to %s\n", g.gl_pathv[0], abs_dst);
+ err = do_download(conn, g.gl_pathv[0], abs_dst, pflag);
+ goto out;
}
- *ifp = xstrdup(cp + 1);
- return(0);
+ /* Multiple matches, dst may be directory or unspecified */
+ if (dst && !is_dir(dst)) {
+ error("Multiple files match, but \"%s\" is not a directory",
+ dst);
+ err = -1;
+ goto out;
+ }
+
+ for (i = 0; g.gl_pathv[i]; i++) {
+ if (infer_path(g.gl_pathv[i], &tmp)) {
+ err = -1;
+ goto out;
+ }
+ if (dst) {
+ abs_dst = path_append(dst, tmp);
+ xfree(tmp);
+ } else
+ abs_dst = tmp;
+
+ printf("Fetching %s to %s\n", g.gl_pathv[i], abs_dst);
+ if (do_download(conn, g.gl_pathv[i], abs_dst, pflag) == -1)
+ err = -1;
+ xfree(abs_dst);
+ abs_dst = NULL;
+ }
+
+out:
+ xfree(abs_src);
+ if (abs_dst)
+ xfree(abs_dst);
+ globfree(&g);
+ return(err);
}
-int
+static int
+process_put(struct sftp_conn *conn, char *src, char *dst, char *pwd, int pflag)
+{
+ char *tmp_dst = NULL;
+ char *abs_dst = NULL;
+ char *tmp;
+ glob_t g;
+ int err = 0;
+ int i;
+
+ if (dst) {
+ tmp_dst = xstrdup(dst);
+ tmp_dst = make_absolute(tmp_dst, pwd);
+ }
+
+ memset(&g, 0, sizeof(g));
+ debug3("Looking up %s", src);
+ if (glob(src, 0, NULL, &g)) {
+ error("File \"%s\" not found.", src);
+ err = -1;
+ goto out;
+ }
+
+ /* Only one match, dst may be file, directory or unspecified */
+ if (g.gl_pathv[0] && g.gl_matchc == 1) {
+ if (tmp_dst) {
+ /* If directory specified, append filename */
+ if (remote_is_dir(conn, tmp_dst)) {
+ if (infer_path(g.gl_pathv[0], &tmp)) {
+ err = 1;
+ goto out;
+ }
+ abs_dst = path_append(tmp_dst, tmp);
+ xfree(tmp);
+ } else
+ abs_dst = xstrdup(tmp_dst);
+ } else {
+ if (infer_path(g.gl_pathv[0], &abs_dst)) {
+ err = -1;
+ goto out;
+ }
+ abs_dst = make_absolute(abs_dst, pwd);
+ }
+ printf("Uploading %s to %s\n", g.gl_pathv[0], abs_dst);
+ err = do_upload(conn, g.gl_pathv[0], abs_dst, pflag);
+ goto out;
+ }
+
+ /* Multiple matches, dst may be directory or unspecified */
+ if (tmp_dst && !remote_is_dir(conn, tmp_dst)) {
+ error("Multiple files match, but \"%s\" is not a directory",
+ tmp_dst);
+ err = -1;
+ goto out;
+ }
+
+ for (i = 0; g.gl_pathv[i]; i++) {
+ if (infer_path(g.gl_pathv[i], &tmp)) {
+ err = -1;
+ goto out;
+ }
+ if (tmp_dst) {
+ abs_dst = path_append(tmp_dst, tmp);
+ xfree(tmp);
+ } else
+ abs_dst = make_absolute(tmp, pwd);
+
+ printf("Uploading %s to %s\n", g.gl_pathv[i], abs_dst);
+ if (do_upload(conn, g.gl_pathv[i], abs_dst, pflag) == -1)
+ err = -1;
+ }
+
+out:
+ if (abs_dst)
+ xfree(abs_dst);
+ if (tmp_dst)
+ xfree(tmp_dst);
+ return(err);
+}
+
+static int
parse_args(const char **cpp, int *pflag, unsigned long *n_arg,
char **path1, char **path2)
{
return(-1);
/* Figure out which command we have */
- for(i = 0; cmds[i].c; i++) {
+ for (i = 0; cmds[i].c; i++) {
int cmdlen = strlen(cmds[i].c);
/* Check for command followed by whitespace */
/* Try to get second pathname (optional) */
if (get_pathname(&cp, path2))
return(-1);
- /* Otherwise try to guess it from first path */
- if (*path2 == NULL && infer_path(*path1, path2))
- return(-1);
break;
case I_RENAME:
- /* Get first pathname (mandatory) */
+ case I_SYMLINK:
if (get_pathname(&cp, path1))
return(-1);
if (get_pathname(&cp, path2))
case I_PWD:
case I_LPWD:
case I_HELP:
+ case I_VERSION:
break;
default:
fatal("Command not implemented");
return(cmdnum);
}
-int
-parse_dispatch_command(int in, int out, const char *cmd, char **pwd)
+static int
+parse_dispatch_command(struct sftp_conn *conn, const char *cmd, char **pwd)
{
char *path1, *path2, *tmp;
- int pflag, cmdnum;
+ int pflag, cmdnum, i;
unsigned long n_arg;
Attrib a, *aa;
char path_buf[MAXPATHLEN];
int err = 0;
+ glob_t g;
path1 = path2 = NULL;
cmdnum = parse_args(&cmd, &pflag, &n_arg, &path1, &path2);
+ memset(&g, 0, sizeof(g));
+
/* Perform command */
switch (cmdnum) {
case -1:
break;
case I_GET:
- path1 = make_absolute(path1, *pwd);
- err = do_download(in, out, path1, path2, pflag);
+ err = process_get(conn, path1, path2, *pwd, pflag);
break;
case I_PUT:
- path2 = make_absolute(path2, *pwd);
- err = do_upload(in, out, path1, path2, pflag);
+ err = process_put(conn, path1, path2, *pwd, pflag);
break;
case I_RENAME:
path1 = make_absolute(path1, *pwd);
path2 = make_absolute(path2, *pwd);
- err = do_rename(in, out, path1, path2);
+ err = do_rename(conn, path1, path2);
+ break;
+ case I_SYMLINK:
+ path2 = make_absolute(path2, *pwd);
+ err = do_symlink(conn, path1, path2);
break;
case I_RM:
path1 = make_absolute(path1, *pwd);
- err = do_rm(in, out, path1);
+ remote_glob(conn, path1, GLOB_NOCHECK, NULL, &g);
+ for (i = 0; g.gl_pathv[i]; i++) {
+ printf("Removing %s\n", g.gl_pathv[i]);
+ if (do_rm(conn, g.gl_pathv[i]) == -1)
+ err = -1;
+ }
break;
case I_MKDIR:
path1 = make_absolute(path1, *pwd);
attrib_clear(&a);
a.flags |= SSH2_FILEXFER_ATTR_PERMISSIONS;
a.perm = 0777;
- err = do_mkdir(in, out, path1, &a);
+ err = do_mkdir(conn, path1, &a);
break;
case I_RMDIR:
path1 = make_absolute(path1, *pwd);
- err = do_rmdir(in, out, path1);
+ err = do_rmdir(conn, path1);
break;
case I_CHDIR:
path1 = make_absolute(path1, *pwd);
- if ((tmp = do_realpath(in, out, path1)) == NULL) {
+ if ((tmp = do_realpath(conn, path1)) == NULL) {
err = 1;
break;
}
- if ((aa = do_stat(in, out, tmp)) == NULL) {
+ if ((aa = do_stat(conn, tmp, 0)) == NULL) {
xfree(tmp);
err = 1;
break;
break;
case I_LS:
if (!path1) {
- do_ls(in, out, *pwd);
+ do_ls(conn, *pwd);
break;
}
path1 = make_absolute(path1, *pwd);
- if ((tmp = do_realpath(in, out, path1)) == NULL)
+ if ((tmp = do_realpath(conn, path1)) == NULL)
break;
xfree(path1);
path1 = tmp;
- if ((aa = do_stat(in, out, path1)) == NULL)
+ if ((aa = do_stat(conn, path1, 0)) == NULL)
break;
- if ((aa->flags & SSH2_FILEXFER_ATTR_PERMISSIONS) &&
+ if ((aa->flags & SSH2_FILEXFER_ATTR_PERMISSIONS) &&
!S_ISDIR(aa->perm)) {
error("Can't ls: \"%s\" is not a directory", path1);
break;
}
- do_ls(in, out, path1);
+ do_ls(conn, path1);
break;
case I_LCHDIR:
if (chdir(path1) == -1) {
attrib_clear(&a);
a.flags |= SSH2_FILEXFER_ATTR_PERMISSIONS;
a.perm = n_arg;
- do_setstat(in, out, path1, &a);
+ remote_glob(conn, path1, GLOB_NOCHECK, NULL, &g);
+ for (i = 0; g.gl_pathv[i]; i++) {
+ printf("Changing mode on %s\n", g.gl_pathv[i]);
+ do_setstat(conn, g.gl_pathv[i], &a);
+ }
break;
case I_CHOWN:
path1 = make_absolute(path1, *pwd);
- if (!(aa = do_stat(in, out, path1)))
- break;
- if (!(aa->flags & SSH2_FILEXFER_ATTR_UIDGID)) {
- error("Can't get current ownership of "
- "remote file \"%s\"", path1);
- break;
+ remote_glob(conn, path1, GLOB_NOCHECK, NULL, &g);
+ for (i = 0; g.gl_pathv[i]; i++) {
+ if (!(aa = do_stat(conn, g.gl_pathv[i], 0)))
+ continue;
+ if (!(aa->flags & SSH2_FILEXFER_ATTR_UIDGID)) {
+ error("Can't get current ownership of "
+ "remote file \"%s\"", g.gl_pathv[i]);
+ continue;
+ }
+ printf("Changing owner on %s\n", g.gl_pathv[i]);
+ aa->flags &= SSH2_FILEXFER_ATTR_UIDGID;
+ aa->uid = n_arg;
+ do_setstat(conn, g.gl_pathv[i], aa);
}
- aa->flags &= SSH2_FILEXFER_ATTR_UIDGID;
- aa->uid = n_arg;
- do_setstat(in, out, path1, aa);
break;
case I_CHGRP:
path1 = make_absolute(path1, *pwd);
- if (!(aa = do_stat(in, out, path1)))
- break;
- if (!(aa->flags & SSH2_FILEXFER_ATTR_UIDGID)) {
- error("Can't get current ownership of "
- "remote file \"%s\"", path1);
- break;
+ remote_glob(conn, path1, GLOB_NOCHECK, NULL, &g);
+ for (i = 0; g.gl_pathv[i]; i++) {
+ if (!(aa = do_stat(conn, g.gl_pathv[i], 0)))
+ continue;
+ if (!(aa->flags & SSH2_FILEXFER_ATTR_UIDGID)) {
+ error("Can't get current ownership of "
+ "remote file \"%s\"", g.gl_pathv[i]);
+ continue;
+ }
+ printf("Changing group on %s\n", g.gl_pathv[i]);
+ aa->flags &= SSH2_FILEXFER_ATTR_UIDGID;
+ aa->gid = n_arg;
+ do_setstat(conn, g.gl_pathv[i], aa);
}
- aa->flags &= SSH2_FILEXFER_ATTR_UIDGID;
- aa->gid = n_arg;
- do_setstat(in, out, path1, aa);
break;
case I_PWD:
printf("Remote working directory: %s\n", *pwd);
case I_HELP:
help();
break;
+ case I_VERSION:
+ printf("SFTP protocol version %u\n", sftp_proto_version(conn));
+ break;
default:
fatal("%d is not implemented", cmdnum);
}
+ if (g.gl_pathc)
+ globfree(&g);
if (path1)
xfree(path1);
if (path2)
}
void
-interactive_loop(int fd_in, int fd_out)
+interactive_loop(int fd_in, int fd_out, char *file1, char *file2)
{
char *pwd;
+ char *dir = NULL;
char cmd[2048];
+ struct sftp_conn *conn;
+
+ conn = do_init(fd_in, fd_out, copy_buffer_len, num_requests);
+ if (conn == NULL)
+ fatal("Couldn't initialise connection to server");
- pwd = do_realpath(fd_in, fd_out, ".");
+ pwd = do_realpath(conn, ".");
if (pwd == NULL)
fatal("Need cwd");
+ if (file1 != NULL) {
+ dir = xstrdup(file1);
+ dir = make_absolute(dir, pwd);
+
+ if (remote_is_dir(conn, dir) && file2 == NULL) {
+ printf("Changing to: %s\n", dir);
+ snprintf(cmd, sizeof cmd, "cd \"%s\"", dir);
+ parse_dispatch_command(conn, cmd, &pwd);
+ } else {
+ if (file2 == NULL)
+ snprintf(cmd, sizeof cmd, "get %s", dir);
+ else
+ snprintf(cmd, sizeof cmd, "get %s %s", dir,
+ file2);
+
+ parse_dispatch_command(conn, cmd, &pwd);
+ xfree(dir);
+ return;
+ }
+ xfree(dir);
+ }
+#if HAVE_SETVBUF
setvbuf(stdout, NULL, _IOLBF, 0);
setvbuf(infile, NULL, _IOLBF, 0);
+#else
+ setlinebuf(stdout);
+ setlinebuf(infile);
+#endif
- for(;;) {
+ for (;;) {
char *cp;
printf("sftp> ");
if (cp)
*cp = '\0';
- if (parse_dispatch_command(fd_in, fd_out, cmd, &pwd))
+ if (parse_dispatch_command(conn, cmd, &pwd))
break;
}
xfree(pwd);
andersk / openssh.git / blobdiff