upstream commit

To prevent screwing up terminal settings when printing to
 the terminal, for ASCII and UTF-8, escape bytes not forming characters and
 bytes forming non-printable characters with vis(3) VIS_OCTAL. For other
 character sets, abort printing of the current string in these cases.  In
 particular, * let scp(1) respect the local user's LC_CTYPE locale(1); *
 sanitize data received from the remote host; * sanitize filenames, usernames,
 and similar data even locally; * take character display widths into account
 for the progressmeter.

This is believed to be sufficient to keep the local terminal safe
on OpenBSD, but bad things can still happen on other systems with
state-dependent locales because many places in the code print
unencoded ASCII characters into the output stream.

Using feedback from djm@ and martijn@,
various aspects discussed with many others.

deraadt@ says it should go in now, i probably already hesitated too long

Upstream-ID: e66afbc94ee396ddcaffd433b9a3b80f387647e0

1 files changed, 26 insertions, 20 deletions

diff --git a/sftp.c b/sftp.c
index 3d2d13aaf..6a7048431 100644
--- a/sftp.c
+++ b/sftp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp.c,v 1.173 2016/04/08 08:19:17 djm Exp $ */
+/* $OpenBSD: sftp.c,v 1.174 2016/05/25 23:48:45 schwarze Exp $ */
 /*
  * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
  *
@@ -49,6 +49,7 @@ typedef void EditLine;
 #endif
 #include <limits.h>
 #include <signal.h>
+#include <stdarg.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -63,6 +64,7 @@ typedef void EditLine;
 #include "log.h"
 #include "pathnames.h"
 #include "misc.h"
+#include "utf8.h"
 
 #include "sftp.h"
 #include "ssherr.h"
@@ -644,9 +646,11 @@ process_get(struct sftp_conn *conn, char *src, char *dst, char *pwd,
 
                 resume |= global_aflag;
                 if (!quiet && resume)
-                        printf("Resuming %s to %s\n", g.gl_pathv[i], abs_dst);
+                        mprintf("Resuming %s to %s\n",
+                            g.gl_pathv[i], abs_dst);
                 else if (!quiet && !resume)
-                        printf("Fetching %s to %s\n", g.gl_pathv[i], abs_dst);
+                        mprintf("Fetching %s to %s\n",
+                            g.gl_pathv[i], abs_dst);
                 if (pathname_is_dir(g.gl_pathv[i]) && (rflag || global_rflag)) {
                         if (download_dir(conn, g.gl_pathv[i], abs_dst, NULL,
                             pflag || global_pflag, 1, resume,
@@ -735,10 +739,11 @@ process_put(struct sftp_conn *conn, char *src, char *dst, char *pwd,
 
                 resume |= global_aflag;
                 if (!quiet && resume)
-                        printf("Resuming upload of %s to %s\n", g.gl_pathv[i],
-                                abs_dst);
+                        mprintf("Resuming upload of %s to %s\n",
+                            g.gl_pathv[i], abs_dst);
                 else if (!quiet && !resume)
-                        printf("Uploading %s to %s\n", g.gl_pathv[i], abs_dst);
+                        mprintf("Uploading %s to %s\n",
+                            g.gl_pathv[i], abs_dst);
                 if (pathname_is_dir(g.gl_pathv[i]) && (rflag || global_rflag)) {
                         if (upload_dir(conn, g.gl_pathv[i], abs_dst,
                             pflag || global_pflag, 1, resume,
@@ -839,12 +844,12 @@ do_ls_dir(struct sftp_conn *conn, char *path, char *strip_path, int lflag)
                                 attrib_to_stat(&d[n]->a, &sb);
                                 lname = ls_file(fname, &sb, 1,
                                     (lflag & LS_SI_UNITS));
-                                printf("%s\n", lname);
+                                mprintf("%s\n", lname);
                                 free(lname);
                         } else
-                                printf("%s\n", d[n]->longname);
+                                mprintf("%s\n", d[n]->longname);
                 } else {
-                        printf("%-*s", colspace, fname);
+                        mprintf("%-*s", colspace, fname);
                         if (c >= columns) {
                                 printf("\n");
                                 c = 1;
@@ -925,10 +930,10 @@ do_globbed_ls(struct sftp_conn *conn, char *path, char *strip_path,
                         }
                         lname = ls_file(fname, g.gl_statv[i], 1,
                             (lflag & LS_SI_UNITS));
-                        printf("%s\n", lname);
+                        mprintf("%s\n", lname);
                         free(lname);
                 } else {
-                        printf("%-*s", colspace, fname);
+                        mprintf("%-*s", colspace, fname);
                         if (c >= columns) {
                                 printf("\n");
                                 c = 1;
@@ -1456,7 +1461,7 @@ parse_dispatch_command(struct sftp_conn *conn, const char *cmd, char **pwd,
                 remote_glob(conn, path1, GLOB_NOCHECK, NULL, &g);
                 for (i = 0; g.gl_pathv[i] && !interrupted; i++) {
                         if (!quiet)
-                                printf("Removing %s\n", g.gl_pathv[i]);
+                                mprintf("Removing %s\n", g.gl_pathv[i]);
                         err = do_rm(conn, g.gl_pathv[i]);
                         if (err != 0 && err_abort)
                                 break;
@@ -1556,7 +1561,8 @@ parse_dispatch_command(struct sftp_conn *conn, const char *cmd, char **pwd,
                 remote_glob(conn, path1, GLOB_NOCHECK, NULL, &g);
                 for (i = 0; g.gl_pathv[i] && !interrupted; i++) {
                         if (!quiet)
-                                printf("Changing mode on %s\n", g.gl_pathv[i]);
+                                mprintf("Changing mode on %s\n",
+                                    g.gl_pathv[i]);
                         err = do_setstat(conn, g.gl_pathv[i], &a);
                         if (err != 0 && err_abort)
                                 break;
@@ -1586,12 +1592,12 @@ parse_dispatch_command(struct sftp_conn *conn, const char *cmd, char **pwd,
                         aa->flags &= SSH2_FILEXFER_ATTR_UIDGID;
                         if (cmdnum == I_CHOWN) {
                                 if (!quiet)
-                                        printf("Changing owner on %s\n",
+                                        mprintf("Changing owner on %s\n",
                                             g.gl_pathv[i]);
                                 aa->uid = n_arg;
                         } else {
                                 if (!quiet)
-                                        printf("Changing group on %s\n",
+                                        mprintf("Changing group on %s\n",
                                             g.gl_pathv[i]);
                                 aa->gid = n_arg;
                         }
@@ -1601,7 +1607,7 @@ parse_dispatch_command(struct sftp_conn *conn, const char *cmd, char **pwd,
                 }
                 break;
         case I_PWD:
-                printf("Remote working directory: %s\n", *pwd);
+                mprintf("Remote working directory: %s\n", *pwd);
                 break;
         case I_LPWD:
                 if (!getcwd(path_buf, sizeof(path_buf))) {
@@ -1609,7 +1615,7 @@ parse_dispatch_command(struct sftp_conn *conn, const char *cmd, char **pwd,
                         err = -1;
                         break;
                 }
-                printf("Local working directory: %s\n", path_buf);
+                mprintf("Local working directory: %s\n", path_buf);
                 break;
         case I_QUIT:
                 /* Processed below */
@@ -1678,7 +1684,7 @@ complete_display(char **list, u_int len)
         for (y = 0; list[y]; y++) {
                 llen = strlen(list[y]);
                 tmp = llen > len ? list[y] + len : "";
-                printf("%-*s", colspace, tmp);
+                mprintf("%-*s", colspace, tmp);
                 if (m >= columns) {
                         printf("\n");
                         m = 1;
@@ -2062,7 +2068,7 @@ interactive_loop(struct sftp_conn *conn, char *file1, char *file2)
 
                 if (remote_is_dir(conn, dir) && file2 == NULL) {
                         if (!quiet)
-                                printf("Changing to: %s\n", dir);
+                                mprintf("Changing to: %s\n", dir);
                         snprintf(cmd, sizeof cmd, "cd \"%s\"", dir);
                         if (parse_dispatch_command(conn, cmd,
                             &remote_path, 1) != 0) {
@@ -2106,7 +2112,7 @@ interactive_loop(struct sftp_conn *conn, char *file1, char *file2)
                                 break;
                         }
                         if (!interactive) { /* Echo command */
-                                printf("sftp> %s", cmd);
+                                mprintf("sftp> %s", cmd);
                                 if (strlen(cmd) > 0 &&
                                     cmd[strlen(cmd) - 1] != '\n')
                                         printf("\n");