summaryrefslogtreecommitdiff
path: root/sftp.c
Commit message (Collapse)AuthorAgeFilesLines
* upstream: allow -A to explicitly enable agent forwarding in scp anddjm@openbsd.org2020-08-031-4/+7
| | | | | | | sftp. The default remains to not forward an agent, even when ssh_config enables it. ok jmc dtucker markus OpenBSD-Commit-ID: 36cc526aa3b0f94e4704b8d7b969dd63e8576822
* upstream: sort -N and add it to usage();jmc@openbsd.org2020-04-031-2/+2
| | | | OpenBSD-Commit-ID: 5b00e8db37c2b0a54c7831fed9e5f4db53ada332
* upstream: Add a flag to re-enable verbose output when in batchdjm@openbsd.org2020-04-031-3/+9
| | | | | | mode; requested in bz3135; ok dtucker OpenBSD-Commit-ID: 5ad2ed0e6440562ba9c84b666a5bbddc1afe2e2b
* upstream: Have sftp reject "-1" in the same way as ssh(1) anddtucker@openbsd.org2020-02-261-7/+4
| | | | | | | | scp(1) do instead of accepting and silently ignoring it since protocol 1 support has been removed. Spotted by shivakumar2696 at gmail.com, ok deraadt@ OpenBSD-Commit-ID: b79f95559a1c993214f4ec9ae3c34caa87e9d5de
* upstream: Replace all calls to signal(2) with a wrapper arounddtucker@openbsd.org2020-01-231-13/+13
| | | | | | | | sigaction(2). This wrapper blocks all other signals during the handler preventing races between handlers, and sets SA_RESTART which should reduce the potential for short read/write operations. OpenBSD-Commit-ID: 5e047663fd77a40d7b07bdabe68529df51fd2519
* upstream: fix a race condition in the SIGCHILD handler that could turndjm@openbsd.org2019-11-011-4/+7
| | | | | | in to a kill(-1); bz3084, reported by Gao Rui, ok dtucker@ OpenBSD-Commit-ID: ac2742e04a69d4c34223505b6a32f6d686e18896
* upstream: remove some duplicate #includesdjm@openbsd.org2019-10-021-2/+1
| | | | OpenBSD-Commit-ID: ed6827ab921eff8027669848ef4f70dc1da4098c
* upstream: Fix a typo and make <esc><right> move right to thetb@openbsd.org2019-07-121-2/+2
| | | | | | | | | closest end of a word just like <esc><left> moves left to the closest beginning of a word. ok djm OpenBSD-Commit-ID: 6afe01b05ed52d8b12eb1fda6e9af5afb5e198ee
* upstream: from tim: - for reput, it is remote-path which isjmc@openbsd.org2019-06-211-5/+5
| | | | | | | | | | | | | | | | | | | optional, not local-path - sync help from deraadt: - prefer -R and undocument -r (but add a comment for future editors) from schwarze: - prefer -p and undocument -P (as above. the comment was schwarze's too) more: - add the -f flag to reput and reget - sort help (i can;t remember who suggested this originally) djm and deraadt were ok with earlier versions of this; tim and schwarze ok OpenBSD-Commit-ID: 3c699b53b46111f5c57eed4533f132e7e58bacdd
* upstream: Check for user@host when parsing sftp target. Thisdtucker@openbsd.org2019-06-081-6/+11
| | | | | | | allows user@[1.2.3.4] to work without a path in addition to with one. bz#2999, ok djm@ OpenBSD-Commit-ID: d989217110932490ba8ce92127a9a6838878928b
* upstream: Replace calls to ssh_malloc_init() by a static init ofotto@openbsd.org2019-06-081-2/+1
| | | | | | | malloc_options. Prepares for changes in the way malloc is initialized. ok guenther@ dtucker@ OpenBSD-Commit-ID: 154f4e3e174f614b09f792d4d06575e08de58a6b
* upstream: Add a -J option as a shortcut for -o Proxyjump= to scp(1)tb@openbsd.org2019-01-221-7/+7
| | | | | | | | and sftp(1) to match ssh(1)'s interface. ok djm OpenBSD-Commit-ID: a75bc2d5f329caa7229a7e9fe346c4f41c2663fc
* upstream: Add "-h" flag to sftp chown/chgrp/chmod commands todjm@openbsd.org2019-01-171-8/+35
| | | | | | | | | request they do not follow symlinks. Requires recently-committed lsetstat@openssh.com extension on the server side. ok markus@ dtucker@ OpenBSD-Commit-ID: f93bb3f6f7eb2fb7ef1e59126e72714f1626d604
* refactor libcrypto initialisationDamien Miller2018-11-231-0/+2
| | | | | | | | | | Don't call OpenSSL_add_all_algorithms() unless OpenSSL actually supports it. Move all libcrypto initialisation to a single function, and call that from seed_rng() that is called early in each tool's main(). Prompted by patch from Rosen Penev
* upstream: use path_absolute() for pathname checks; from Manoj Ampalamdjm@openbsd.org2018-11-161-4/+4
| | | | OpenBSD-Commit-ID: 482ce71a5ea5c5f3bc4d00fd719481a6a584d925
* upstream: support a prefix of '@' to suppress echo of sftp batchdjm@openbsd.org2018-11-161-26/+31
| | | | | | commands; bz#2926; ok dtucker@ OpenBSD-Commit-ID: 9d635636bc84aeae796467e059f7634de990a79d
* upstream: Add FALLTHROUGH comments where appropriate. Patch fromdtucker@openbsd.org2018-09-091-1/+3
| | | | | | jjelen at redhat via bz#2687. OpenBSD-Commit-ID: c48eb457be697a19d6d2950c6d0879f3ccc851d3
* upstream: Since the previous commit, ssh regress test sftp-chroot wasbluhm@openbsd.org2018-05-111-4/+6
| | | | | | | | | failing. The sftp program terminated with the wrong exit code as sftp called fatal() instad of exit(0). So when the sigchld handler waits for the child, remember that it was found. Then don't expect that main() can wait again. OK dtucker@ OpenBSD-Commit-ID: bfafd940c0de5297940c71ddf362053db0232266
* upstream: notify user immediately when underlying ssh process dies;djm@openbsd.org2018-04-151-1/+20
| | | | | | patch from Thomas Kuthan in bz2719; ok dtucker@ OpenBSD-Commit-ID: 78fac88c2f08054d1fc5162c43c24162b131cf78
* upstream: lots of typos in comments/docs. Patch from Karsten Weissdjm@openbsd.org2018-04-101-2/+2
| | | | | | | after checking with codespell tool (https://github.com/lucasdemarchi/codespell) OpenBSD-Commit-ID: 373222f12d7ab606598a2d36840c60be93568528
* upstream commitdjm@openbsd.org@openbsd.org2017-11-031-11/+21
| | | | | | | | | | allow "cd" and "lcd" commands with no explicit path argument. lcd will change to the local user's home directory as usual. cd will change to the starting directory for session (because the protocol offers no way to obtain the remote user's home directory). bz#2760 ok dtucker@ OpenBSD-Commit-ID: 15333f5087cee8c1ed1330cac1bd0a3e6a767393
* upstream commitmillert@openbsd.org2017-10-231-27/+31
| | | | | | | | | | Add URI support to ssh, sftp and scp. For example ssh://user@host or sftp://user@host/path. The connection parameters described in draft-ietf-secsh-scp-sftp-ssh-uri-04 are not implemented since the ssh fingerprint format in the draft uses md5 with no way to specify the hash function type. OK djm@ Upstream-ID: 4ba3768b662d6722de59e6ecb00abf2d4bf9cacc
* portability for sftp globbed ls sort by mtimeDamien Miller2017-06-101-2/+8
| | | | | | Include replacement timespeccmp() for systems that lack it. Support time_t struct stat->st_mtime in addition to timespec stat->st_mtim, as well as unsorted fallback.
* upstream commitdjm@openbsd.org2017-06-101-3/+47
| | | | | | implement sorting for globbed ls; bz#2649 ok dtucker@ Upstream-ID: ed3110f351cc9703411bf847ba864041fb7216a8
* upstream commitdjm@openbsd.org2017-05-081-2/+2
| | | | | | remove -1 / -2 options; pointed out by jmc@ Upstream-ID: 65d2a816000741a95df1c7cfdb5fa8469fcc7daa
* upstream commitdjm@openbsd.org2017-02-171-16/+24
| | | | | | | | fix division by zero crash in "df" output when server returns zero total filesystem blocks/inodes. Spotted by Guido Vranken; ok dtucker@ Upstream-ID: 6fb6c2ae6b289aa07b6232dbc0be54682ef5419f
* Force Turkish locales back to C/POSIX; bz#2643Damien Miller2016-12-121-1/+1
| | | | | | | | | | Turkish locales are unique in their handling of the letters 'i' and 'I' (yes, they are different letters) and OpenSSH isn't remotely prepared to deal with that. For now, the best we can do is to force OpenSSH to use the C/POSIX locale and try to preserve the UTF-8 encoding if possible. ok dtucker@
* upstream commitmillert@openbsd.org2016-10-191-1/+16
| | | | | | | | | Install a signal handler for tty-generated signals and wait for the ssh child to suspend before suspending sftp. This lets ssh restore the terminal mode as needed when it is suspended at the password prompt. OK dtucker@ Upstream-ID: a31c1f42aa3e2985dcc91e46e6a17bd22e372d69
* upstream commitderaadt@openbsd.org2016-09-121-10/+9
| | | | | | | | Add MAXIMUM(), MINIMUM(), and ROUNDUP() to misc.h, then use those definitions rather than pulling <sys/param.h> and unknown namespace pollution. ok djm markus dtucker Upstream-ID: 712cafa816c9f012a61628b66b9fbd5687223fb8
* upstream commitdjm@openbsd.org2016-07-221-14/+15
| | | | | | | constify a few functions' arguments; patch from Jakub Jelen bz#2581 Upstream-ID: f2043f51454ea37830ff6ad60c8b32b4220f448d
* upstream commitschwarze@openbsd.org2016-06-061-20/+26
| | | | | | | | | | | | | | | | | | | | | | | 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
* upstream commitdjm@openbsd.org2016-04-081-4/+4
| | | | | | whitespace at EOL Upstream-ID: 5beffd4e001515da12851b974e2323ae4aa313b6
* upstream commitdtucker@openbsd.org2016-02-161-1/+2
| | | | | | | Add a function to enable security-related malloc_options. With and ok deraadt@, something similar has been in the snaps for a while. Upstream-ID: 43a95523b832b7f3b943d2908662191110c380ed
* upstream commitderaadt@openbsd.org2015-08-211-3/+3
| | | | | | | Do not cast result of malloc/calloc/realloc* if stdlib.h is in scope ok krw millert Upstream-ID: 5e50ded78cadf3841556649a16cc4b1cb6c58667
* upstream commitderaadt@openbsd.org2015-01-261-2/+4
| | | | | Reduce use of <sys/param.h> and transition to <limits.h> throughout. ok djm markus
* upstream commitdjm@openbsd.org2015-01-151-2/+3
| | | | | update sftp client and server to new buffer API. pretty much just mechanical changes; with & ok markus
* upstream commitmillert@openbsd.org2014-12-051-3/+3
| | | | | Prefer setvbuf() to setlinebuf() for portability; ok deraadt@
* upstream commitdjm@openbsd.org2014-10-131-6/+6
| | | | correct options in usage(); from mancha1 AT zoho.com
* upstream commitderaadt@openbsd.org2014-10-131-2/+2
| | | | djm how did you make a typo like that...
* upstream commitdjm@openbsd.org2014-10-131-1/+4
| | | | ~-expand lcd paths
* - djm@cvs.openbsd.org 2014/07/09 01:45:10Damien Miller2014-07-091-8/+16
| | | | | | [sftp.c] more useful error message when GLOB_NOSPACE occurs; bz#2254, patch from Orion Poplawski
* - logan@cvs.openbsd.org 2014/05/05 07:02:30Damien Miller2014-05-151-2/+2
| | | | | | | [sftp.c] Zap extra whitespace. OK from djm@ and dtucker@
* - dtucker@cvs.openbsd.org 2014/04/29 20:36:51Damien Miller2014-05-151-2/+2
| | | | | | | [sftp.c] Don't attempt to append a nul quote char to the filename. Should prevent fatal'ing with "el_insertstr failed" when there's a single quote char somewhere in the string. bz#2238, ok markus@
* - dtucker@cvs.openbsd.org 2014/04/29 19:58:50Damien Miller2014-05-151-2/+2
| | | | | [sftp.c] Move nulling of variable next to where it's freed. ok markus@
* - logan@cvs.openbsd.org 2014/04/22 10:07:12Damien Miller2014-05-151-3/+3
| | | | | | [sftp.c] Sort the sftp command list. OK from djm@
* - logan@cvs.openbsd.org 2014/04/21 14:36:16Damien Miller2014-05-151-15/+23
| | | | | | | [sftp-client.c sftp-client.h sftp.c] Implement sftp upload resume support. OK from djm@, with input from guenther@, mlarkin@ and okan@
* - deraadt@cvs.openbsd.org 2013/11/20 20:54:10Damien Miller2013-11-211-2/+2
| | | | | | [canohost.c clientloop.c match.c readconf.c sftp.c] unsigned casts for ctype macros where neccessary ok guenther millert markus
* - jmc@cvs.openbsd.org 2013/10/17 07:35:48Damien Miller2013-10-181-2/+2
| | | | | [sftp.1 sftp.c] tweak previous;
* - djm@cvs.openbsd.org 2013/10/17 00:30:13Damien Miller2013-10-171-25/+40
| | | | | | | | [PROTOCOL sftp-client.c sftp-client.h sftp-server.c sftp.1 sftp.c] fsync@openssh.com protocol extension for sftp-server client support to allow calling fsync() faster successful transfer patch mostly by imorgan AT nas.nasa.gov; bz#1798 "fine" markus@ "grumble OK" deraadt@ "doesn't sound bad to me" millert@
* - djm@cvs.openbsd.org 2013/08/31 00:13:54Damien Miller2013-09-141-1/+3
| | | | | [sftp.c] make ^w match ksh behaviour (delete previous word instead of entire line)
View Lorry Controller Status