New upstream release (8.0p1)

1 files changed, 76 insertions, 42 deletions

diff --git a/sftp.c b/sftp.c
index 7db86c2d3..44aa19d96 100644
--- a/sftp.c
+++ b/sftp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp.c,v 1.186 2018/09/07 04:26:56 dtucker Exp $ */
+/* $OpenBSD: sftp.c,v 1.190 2019/01/21 22:50:42 tb Exp $ */
 /*
  * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
  *
@@ -278,9 +278,9 @@ help(void)
         printf("Available commands:\n"
             "bye                                Quit sftp\n"
             "cd path                            Change remote directory to 'path'\n"
-            "chgrp grp path                     Change group of file 'path' to 'grp'\n"
-            "chmod mode path                    Change permissions of file 'path' to 'mode'\n"
-            "chown own path                     Change owner of file 'path' to 'own'\n"
+            "chgrp [-h] grp path                Change group of file 'path' to 'grp'\n"
+            "chmod [-h] mode path               Change permissions of file 'path' to 'mode'\n"
+            "chown [-h] own path                Change owner of file 'path' to 'own'\n"
             "df [-hi] [path]                    Display statistics for current directory or\n"
             "                                   filesystem containing 'path'\n"
             "exit                               Quit sftp\n"
@@ -389,7 +389,7 @@ make_absolute(char *p, const char *pwd)
         char *abs_str;
 
         /* Derelativise */
-        if (p && p[0] != '/') {
+        if (p && !path_absolute(p)) {
                 abs_str = path_append(pwd, p);
                 free(p);
                 return(abs_str);
@@ -562,6 +562,30 @@ parse_df_flags(const char *cmd, char **argv, int argc, int *hflag, int *iflag)
 }
 
 static int
+parse_ch_flags(const char *cmd, char **argv, int argc, int *hflag)
+{
+        extern int opterr, optind, optopt, optreset;
+        int ch;
+
+        optind = optreset = 1;
+        opterr = 0;
+
+        *hflag = 0;
+        while ((ch = getopt(argc, argv, "h")) != -1) {
+                switch (ch) {
+                case 'h':
+                        *hflag = 1;
+                        break;
+                default:
+                        error("%s: Invalid flag -%c", cmd, optopt);
+                        return -1;
+                }
+        }
+
+        return optind;
+}
+
+static int
 parse_no_flags(const char *cmd, char **argv, int argc)
 {
         extern int opterr, optind, optopt, optreset;
@@ -1296,7 +1320,7 @@ makeargv(const char *arg, int *argcp, int sloppy, char *lastquote,
 }
 
 static int
-parse_args(const char **cpp, int *ignore_errors, int *aflag,
+parse_args(const char **cpp, int *ignore_errors, int *disable_echo, int *aflag,
           int *fflag, int *hflag, int *iflag, int *lflag, int *pflag,
           int *rflag, int *sflag,
     unsigned long *n_arg, char **path1, char **path2)
@@ -1310,13 +1334,23 @@ parse_args(const char **cpp, int *ignore_errors, int *aflag,
         /* Skip leading whitespace */
         cp = cp + strspn(cp, WHITESPACE);
 
-        /* Check for leading '-' (disable error processing) */
+        /*
+         * Check for leading '-' (disable error processing) and '@' (suppress
+         * command echo)
+         */
         *ignore_errors = 0;
-        if (*cp == '-') {
-                *ignore_errors = 1;
-                cp++;
-                cp = cp + strspn(cp, WHITESPACE);
+        *disable_echo = 0;
+        for (;*cp != '\0'; cp++) {
+                if (*cp == '-') {
+                        *ignore_errors = 1;
+                } else if (*cp == '@') {
+                        *disable_echo = 1;
+                } else {
+                        /* all other characters terminate prefix processing */
+                        break;
+                }
         }
+        cp = cp + strspn(cp, WHITESPACE);
 
         /* Ignore blank lines and lines which begin with comment '#' char */
         if (*cp == '\0' || *cp == '#')
@@ -1446,7 +1480,7 @@ parse_args(const char **cpp, int *ignore_errors, int *aflag,
                 /* FALLTHROUGH */
         case I_CHOWN:
         case I_CHGRP:
-                if ((optidx = parse_no_flags(cmd, argv, argc)) == -1)
+                if ((optidx = parse_ch_flags(cmd, argv, argc, hflag)) == -1)
                         return -1;
                 /* Get numeric arg (mandatory) */
                 if (argc - optidx < 1)
@@ -1491,11 +1525,12 @@ parse_args(const char **cpp, int *ignore_errors, int *aflag,
 
 static int
 parse_dispatch_command(struct sftp_conn *conn, const char *cmd, char **pwd,
-    const char *startdir, int err_abort)
+    const char *startdir, int err_abort, int echo_command)
 {
+        const char *ocmd = cmd;
         char *path1, *path2, *tmp;
-        int ignore_errors = 0, aflag = 0, fflag = 0, hflag = 0,
-        iflag = 0;
+        int ignore_errors = 0, disable_echo = 1;
+        int aflag = 0, fflag = 0, hflag = 0, iflag = 0;
         int lflag = 0, pflag = 0, rflag = 0, sflag = 0;
         int cmdnum, i;
         unsigned long n_arg = 0;
@@ -1505,11 +1540,15 @@ parse_dispatch_command(struct sftp_conn *conn, const char *cmd, char **pwd,
         glob_t g;
 
         path1 = path2 = NULL;
-        cmdnum = parse_args(&cmd, &ignore_errors, &aflag, &fflag, &hflag,
-            &iflag, &lflag, &pflag, &rflag, &sflag, &n_arg, &path1, &path2);
+        cmdnum = parse_args(&cmd, &ignore_errors, &disable_echo, &aflag, &fflag,
+            &hflag, &iflag, &lflag, &pflag, &rflag, &sflag, &n_arg,
+            &path1, &path2);
         if (ignore_errors != 0)
                 err_abort = 0;
 
+        if (echo_command && !disable_echo)
+                mprintf("sftp> %s\n", ocmd);
+
         memset(&g, 0, sizeof(g));
 
         /* Perform command */
@@ -1608,7 +1647,7 @@ parse_dispatch_command(struct sftp_conn *conn, const char *cmd, char **pwd,
 
                 /* Strip pwd off beginning of non-absolute paths */
                 tmp = NULL;
-                if (*path1 != '/')
+                if (!path_absolute(path1))
                         tmp = *pwd;
 
                 path1 = make_absolute(path1, *pwd);
@@ -1660,7 +1699,8 @@ parse_dispatch_command(struct sftp_conn *conn, const char *cmd, char **pwd,
                         if (!quiet)
                                 mprintf("Changing mode on %s\n",
                                     g.gl_pathv[i]);
-                        err = do_setstat(conn, g.gl_pathv[i], &a);
+                        err = (hflag ? do_lsetstat : do_setstat)(conn,
+                            g.gl_pathv[i], &a);
                         if (err != 0 && err_abort)
                                 break;
                 }
@@ -1670,7 +1710,8 @@ parse_dispatch_command(struct sftp_conn *conn, const char *cmd, char **pwd,
                 path1 = make_absolute(path1, *pwd);
                 remote_glob(conn, path1, GLOB_NOCHECK, NULL, &g);
                 for (i = 0; g.gl_pathv[i] && !interrupted; i++) {
-                        if (!(aa = do_stat(conn, g.gl_pathv[i], 0))) {
+                        if (!(aa = (hflag ? do_lstat : do_stat)(conn,
+                            g.gl_pathv[i], 0))) {
                                 if (err_abort) {
                                         err = -1;
                                         break;
@@ -1698,7 +1739,8 @@ parse_dispatch_command(struct sftp_conn *conn, const char *cmd, char **pwd,
                                             g.gl_pathv[i]);
                                 aa->gid = n_arg;
                         }
-                        err = do_setstat(conn, g.gl_pathv[i], aa);
+                        err = (hflag ? do_lsetstat : do_setstat)(conn,
+                            g.gl_pathv[i], aa);
                         if (err != 0 && err_abort)
                                 break;
                 }
@@ -1936,7 +1978,7 @@ complete_match(EditLine *el, struct sftp_conn *conn, char *remote_path,
                 xasprintf(&tmp, "%s*", file);
 
         /* Check if the path is absolute. */
-        isabs = tmp[0] == '/';
+        isabs = path_absolute(tmp);
 
         memset(&g, 0, sizeof(g));
         if (remote != LOCAL) {
@@ -2169,7 +2211,7 @@ interactive_loop(struct sftp_conn *conn, char *file1, char *file2)
                                 mprintf("Changing to: %s\n", dir);
                         snprintf(cmd, sizeof cmd, "cd \"%s\"", dir);
                         if (parse_dispatch_command(conn, cmd,
-                            &remote_path, startdir, 1) != 0) {
+                            &remote_path, startdir, 1, 0) != 0) {
                                 free(dir);
                                 free(startdir);
                                 free(remote_path);
@@ -2183,7 +2225,7 @@ interactive_loop(struct sftp_conn *conn, char *file1, char *file2)
                             file2 == NULL ? "" : " ",
                             file2 == NULL ? "" : file2);
                         err = parse_dispatch_command(conn, cmd,
-                            &remote_path, startdir, 1);
+                            &remote_path, startdir, 1, 0);
                         free(dir);
                         free(startdir);
                         free(remote_path);
@@ -2199,8 +2241,6 @@ interactive_loop(struct sftp_conn *conn, char *file1, char *file2)
         interactive = !batchmode && isatty(STDIN_FILENO);
         err = 0;
         for (;;) {
-                char *cp;
-
                 signal(SIGINT, SIG_IGN);
 
                 if (el == NULL) {
@@ -2211,12 +2251,6 @@ interactive_loop(struct sftp_conn *conn, char *file1, char *file2)
                                         printf("\n");
                                 break;
                         }
-                        if (!interactive) { /* Echo command */
-                                mprintf("sftp> %s", cmd);
-                                if (strlen(cmd) > 0 &&
-                                    cmd[strlen(cmd) - 1] != '\n')
-                                        printf("\n");
-                        }
                 } else {
 #ifdef USE_LIBEDIT
                         const char *line;
@@ -2235,16 +2269,14 @@ interactive_loop(struct sftp_conn *conn, char *file1, char *file2)
 #endif /* USE_LIBEDIT */
                 }
 
-                cp = strrchr(cmd, '\n');
-                if (cp)
-                        *cp = '\0';
+                cmd[strcspn(cmd, "\n")] = '\0';
 
                 /* Handle user interrupts gracefully during commands */
                 interrupted = 0;
                 signal(SIGINT, cmd_interrupt);
 
                 err = parse_dispatch_command(conn, cmd, &remote_path,
-                    startdir, batchmode);
+                    startdir, batchmode, !interactive && el == NULL);
                 if (err != 0)
                         break;
         }
@@ -2330,11 +2362,10 @@ usage(void)
 
         fprintf(stderr,
             "usage: %s [-46aCfpqrv] [-B buffer_size] [-b batchfile] [-c cipher]\n"
-            "          [-D sftp_server_path] [-F ssh_config] "
-            "[-i identity_file] [-l limit]\n"
-            "          [-o ssh_option] [-P port] [-R num_requests] "
-            "[-S program]\n"
-            "          [-s subsystem | sftp_server] destination\n",
+            "          [-D sftp_server_path] [-F ssh_config] [-i identity_file]\n"
+            "          [-J destination] [-l limit] [-o ssh_option] [-P port]\n"
+            "          [-R num_requests] [-S program] [-s subsystem | sftp_server]\n"
+            "          destination\n",
             __progname);
         exit(1);
 }
@@ -2362,6 +2393,8 @@ main(int argc, char **argv)
         sanitise_stdfd();
         msetlocale();
 
+        seed_rng();
+
         __progname = ssh_get_progname(argv[0]);
         memset(&args, '\0', sizeof(args));
         args.list = NULL;
@@ -2375,7 +2408,7 @@ main(int argc, char **argv)
         infile = stdin;
 
         while ((ch = getopt(argc, argv,
-            "1246afhpqrvCc:D:i:l:o:s:S:b:B:F:P:R:")) != -1) {
+            "1246afhpqrvCc:D:i:l:o:s:S:b:B:F:J:P:R:")) != -1) {
                 switch (ch) {
                 /* Passed through to ssh(1) */
                 case '4':
@@ -2385,6 +2418,7 @@ main(int argc, char **argv)
                         break;
                 /* Passed through to ssh(1) with argument */
                 case 'F':
+                case 'J':
                 case 'c':
                 case 'i':
                 case 'o':