diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2019-01-26 23:41:28 +0100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2019-01-26 23:42:39 +0100 |
| commit | 391ffc4b9d31fa1f4ad566499fef9176ff8a07dc (patch) | |
| tree | 58ebbdac03a5cfe199f0edc3eedb36af756cd6d9 /scp.1 | |
| parent | upstream: make ssh-keyscan return a non-zero exit status if it (diff) | |
| download | openssh-391ffc4b9d31fa1f4ad566499fef9176ff8a07dc.tar.xz openssh-391ffc4b9d31fa1f4ad566499fef9176ff8a07dc.zip | |
upstream: check in scp client that filenames sent during
remote->local directory copies satisfy the wildcard specified by the user.
This checking provides some protection against a malicious server
sending unexpected filenames, but it comes at a risk of rejecting wanted
files due to differences between client and server wildcard expansion rules.
For this reason, this also adds a new -T flag to disable the check.
reported by Harry Sintonen
fix approach suggested by markus@;
has been in snaps for ~1wk courtesy deraadt@
OpenBSD-Commit-ID: 00f44b50d2be8e321973f3c6d014260f8f7a8eda
Diffstat (limited to 'scp.1')
| -rw-r--r-- | scp.1 | 16 |
1 files changed, 13 insertions, 3 deletions
@@ -8,9 +8,9 @@ .\" .\" Created: Sun May 7 00:14:37 1995 ylo .\" -.\" $OpenBSD: scp.1,v 1.84 2019/01/22 06:58:31 jmc Exp $ +.\" $OpenBSD: scp.1,v 1.85 2019/01/26 22:41:28 djm Exp $ .\" -.Dd $Mdocdate: January 22 2019 $ +.Dd $Mdocdate: January 26 2019 $ .Dt SCP 1 .Os .Sh NAME @@ -18,7 +18,7 @@ .Nd secure copy (remote file copy program) .Sh SYNOPSIS .Nm scp -.Op Fl 346BCpqrv +.Op Fl 346BCpqrTv .Op Fl c Ar cipher .Op Fl F Ar ssh_config .Op Fl i Ar identity_file @@ -222,6 +222,16 @@ to use for the encrypted connection. The program must understand .Xr ssh 1 options. +.It Fl T +Disable strict filename checking. +By default when copying files from a remote host to a local directory +.Nm +checks that the received filenames match those requested on the command-line +to prevent the remote end from sending unexpected or unwanted files. +Because of differences in how various operating systems and shells interpret +filename wildcards, these checks may cause wanted files to be rejected. +This option disables these checks at the expense of fully trusting that +the server will not send unexpected filenames. .It Fl v Verbose mode. Causes |