summaryrefslogtreecommitdiff
path: root/scp.c
Commit message (Collapse)AuthorAgeFilesLines
* upstream: Explicitly ignore return from waitpid here too.dtucker@openbsd.org2023-03-311-3/+3
| | | | OpenBSD-Commit-ID: eef2403df083c61028969fc679ee370373eacacb
* upstream: Explictly ignore return codesdtucker@openbsd.org2023-03-311-3/+3
| | | | | | where we don't check them. OpenBSD-Commit-ID: 1ffb03038ba1b6b72667be50cf5e5e396b5f2740
* upstream: scp: when copying local->remote, check that source filedjm@openbsd.org2023-03-271-1/+7
| | | | | | | exists before opening SFTP connection to the server. Based on GHPR#370 ok dtucker, markus OpenBSD-Commit-ID: b4dd68e15bfe22ce4fac9960a1066a2b721e54fb
* upstream: Check return values of dup2. Spotted by Coverity, ok djm@dtucker@openbsd.org2023-03-031-3/+5
| | | | OpenBSD-Commit-ID: 19fb1b53072826d00c67df677731d2f6c1dd602b
* remove buffer len workaround for NetBSD 4.xDamien Miller2023-01-111-1/+1
| | | | | Switching to from pipes to a socketpair for communicating with the ssh process avoids the (kernel bug?) problem.
* add back use of pipes in scp.c under USE_PIPESDamien Miller2023-01-111-1/+29
| | | | | This matches sftp.c which prefers socketpair but uses pipes on some older platforms.
* upstream: Switch scp from using pipes to a socketpair formillert@openbsd.org2023-01-111-37/+25
| | | | | | | | | communication with it's ssh sub-processes. We no longer need to reserve two descriptors to ensure that we don't end up using fd 0-2 unexpectedly, that is handled by sanitise_stdfd() in main(). Based on an original diff from djm@. OK deraadt@ djm@ OpenBSD-Commit-ID: b80c372faac462471e955ddeab9480d668a2e48d
* unbreak scp on NetBSD 4.xDamien Miller2023-01-061-1/+1
| | | | | | | | | | | e555d5cad5 effectively increased the default copy buffer size for SFTP transfers. This caused NetBSD 4.x to hang during the "copy local file to remote file in place" scp.sh regression test. This puts back the original 32KB copy buffer size until we can properly figure out why. lots of debugging assistance from dtucker@
* upstream: add -X to usage();jmc@openbsd.org2023-01-031-3/+3
| | | | OpenBSD-Commit-ID: 1bdc3df7de11d766587b0428318336dbffe4a9d0
* upstream: add a -X option to both scp(1) and sftp(1) to allowdjm@openbsd.org2023-01-031-4/+38
| | | | | | | | | | | | | | control over some SFTP protocol knobs: the copy buffer length and the number of inflight requests, both of which are used during upload/download. Previously these could be controlled in sftp(1) using the -b/-R options. This makes them available in both SFTP protocol clients using the same option character sequence. ok dtucker@ OpenBSD-Commit-ID: 27502bffc589776f5da1f31df8cb51abe9a15f1c
* upstream: when scp(1) is using the SFTP protocol for transport (thedjm@openbsd.org2022-10-251-4/+35
| | | | | | | | | | | | | default), better match scp/rcp's handling of globs that don't match the globbed characters but do match literally (e.g. trying to transfer "foo.[1]"). Previously scp(1) in SFTP mode would not match these pathnames but legacy scp/rcp mode would. Reported by Michael Yagliyan in bz3488; ok dtucker@ OpenBSD-Commit-ID: d8a3773f53015ba811fddba7473769a2fd343e11
* Remove seed_rng calls from scp, sftp, sftp-server.Darren Tucker2022-07-271-2/+0
| | | | | These binaries don't use OpenSSL's random functions. The next step will be to stop linking them against libcrypto. ok djm@
* upstream: arrange for scp, when in sftp mode, to not ftruncate(3) filesdjm@openbsd.org2022-05-131-5/+5
| | | | | | | | | | | | early previous behavious of unconditionally truncating the destination file would cause "scp ~/foo localhost:" and "scp localhost:foo ~/" to delete all the contents of their destination. spotted by solene@ sthen@, also bz3431; ok dtucker@ OpenBSD-Commit-ID: ca39fdd39e0ec1466b9666f15cbcfddea6aaa179
* upstream: don't leak argument list; bz3404, reported by Baludjm@openbsd.org2022-03-201-2/+2
| | | | | | Gajjala ok dtucker@ OpenBSD-Commit-ID: fddc32d74e5dd5cff1a49ddd6297b0867eae56a6
* upstream: and we go back to testing sftp-scp after the 8.9deraadt@openbsd.org2022-02-241-2/+2
| | | | | | release... OpenBSD-Commit-ID: a80440168258adca543a4607b871327a279c569c
* upstream: revert for imminent OpenSSH release, which wil ship withdjm@openbsd.org2022-02-101-2/+2
| | | | | | | | | | | | | scp in RCP mode. > revision 1.106 > date: 2021/10/15 14:46:46; author: deraadt; state: Exp; lines: +13 -9; commitid: w5n9B2RE38tFfggl; > openbsd 7.0 release shipped with the (hopefully last) scp that uses RCP > protocol for copying. Let's get back to testing the SFTP protocol. This will be put back once the OpenSSH release is done. OpenBSD-Commit-ID: 0c725481a78210aceecff1537322c0b2df03e768
* upstream: better match legacy scp behaviour: show un-expanded pathsdjm@openbsd.org2022-02-021-9/+8
| | | | | | in error messages. Spotted by and ok tb@ OpenBSD-Commit-ID: 866c8ffac5bd7d38ecbfc3357c8adfa58af637b7
* upstream: when transferring multiple files in SFTP mode, create thedjm@openbsd.org2022-01-181-15/+40
| | | | | | | destination directory if it doesn't already exist to match olde-scp(1) behaviour. noticed by deraadt@ ok markus@ OpenBSD-Commit-ID: cf44dfa231d4112f697c24ff39d7ecf2e6311407
* upstream: fix some corner-case bugs in scp sftp-mode handling ofdjm@openbsd.org2022-01-081-5/+10
| | | | | | ~-prefixed paths; spotted by jsg; feedback jsg & deraadt, ok jsg & markus OpenBSD-Commit-ID: d1697dbaaa9f0f5649d69be897eab25c7d37c222
* upstream: For open/openat, if the flags parameter does not containderaadt@openbsd.org2021-10-281-2/+2
| | | | | | | | | | | | | | | O_CREAT, the 3rd (variadic) mode_t parameter is irrelevant. Many developers in the past have passed mode_t (0, 044, 0644, or such), which might lead future people to copy this broken idiom, and perhaps even believe this parameter has some meaning or implication or application. Delete them all. This comes out of a conversation where tb@ noticed that a strange (but intentional) pledge behaviour is to always knock-out high-bits from mode_t on a number of system calls as a safety factor, and his bewilderment that this appeared to be happening against valid modes (at least visually), but no sorry, they are all irrelevant junk. They could all be 0xdeafbeef. ok millert OpenBSD-Commit-ID: 503d11633497115688c0c6952686524f01f53121
* upstream: switch scp(1) back to sftp protocol.deraadt@openbsd.org2021-10-221-2/+2
| | | | | | | openbsd 7.0 release shipped with the (hopefully last) scp that uses RCP protocol for copying. Let's get back to testing the SFTP protocol. OpenBSD-Commit-ID: 9eaa35d95fd547b78b0a043b3f518e135f151f30
* upstream: fix missing -s in SYNOPSYS and usage() as well as adjm@openbsd.org2021-09-211-2/+2
| | | | | | capitalisation mistake; spotted by jmc@ OpenBSD-Commit-ID: 0ed8ee085c7503c60578941d8b45f3a61d4c9710
* upstream: Switch scp back to use the old protocol by default, ahead ofdjm@openbsd.org2021-09-201-2/+2
| | | | | | | | release. We'll wait a little longer for people to pick up sftp-server(8) that supports the extension that scp needs for ~user paths to continue working in SFTP protocol mode. Discussed with deraadt@ OpenBSD-Commit-ID: f281f603a705fba317ff076e7b11bcf2df941871
* upstream: better error message for ~user failures when thedjm@openbsd.org2021-09-191-2/+3
| | | | | | sftp-server lacks the expand-path extension; ok deraadt@ OpenBSD-Commit-ID: 9c1d965d389411f7e86f0a445158bf09b8f9e4bc
* upstream: make some more scp-in-SFTP mode better match Unix idiomsdjm@openbsd.org2021-09-191-9/+8
| | | | | | suggested by deraadt@ OpenBSD-Commit-ID: 0f2439404ed4cf0b0be8bf49a1ee734836e1ac87
* upstream: allow log_stderr==2 to prefix log messages with argv[0]djm@openbsd.org2021-09-191-7/+5
| | | | | | | | use this to make scp's SFTP mode error messages more scp-like prompted by and ok deraadt@ OpenBSD-Commit-ID: 0e821dbde423fc2280e47414bdc22aaa5b4e0733
* upstream: when using SFTP protocol, continue transferring files after adjm@openbsd.org2021-09-111-6/+10
| | | | | | transfer error occurs. This matches original scp/rcp behaviour. ok dtucker@ OpenBSD-Commit-ID: dfe4558d71dd09707e9b5d6e7d2e53b793da69fa
* upstream: Use the SFTP protocol by default. The original scp/rcpdjm@openbsd.org2021-09-091-3/+3
| | | | | | | | | | | protocol remains available via the -O flag. Note that ~user/ prefixed paths in SFTP mode require a protocol extension that was first shipped in OpenSSH 8.7. ok deraadt, after baking in snaps for a while without incident OpenBSD-Commit-ID: 23588976e28c281ff5988da0848cb821fec9213c
* upstream: scp: tweak man page and error message for -3 by defaultnaddy@openbsd.org2021-08-121-2/+2
| | | | | | | | | Now that the -3 option is enabled by default, flip the documentation and error message logic from "requires -3" to "blocked by -R". ok djm@ OpenBSD-Commit-ID: a872592118444fb3acda5267b2a8c3d4c4252020
* upstream: scp: do not spawn ssh with two -s flags fornaddy@openbsd.org2021-08-121-14/+13
| | | | | | | | | | | | remote-to-remote copies Do not add another "-s" to the argument vector every time an SFTP connection is initiated. Instead, introduce a subsystem flag to do_cmd() and add "-s" when the flag is set. ok djm@ OpenBSD-Commit-ID: 25df69759f323661d31b2e1e790faa22e27966c1
* upstream: Prepare for a future where scp(1) uses the SFTP protocol bydjm@openbsd.org2021-08-101-13/+10
| | | | | | | | | | default. Replace recently added -M option to select the protocol with -O (olde) and -s (SFTP) flags, and label the -s flag with a clear warning that it will be removed in the near future (so no, don't use it in scripts!). prompted by/feedback from deraadt@ OpenBSD-Commit-ID: 92ad72cc6f0023c9be9e316d8b30eb6d8d749cfc
* upstream: make scp -3 the default for remote-to-remote copies. Itdjm@openbsd.org2021-08-101-4/+7
| | | | | | | | | | | | | provides a much better and more intuitive user experience and doesn't require exposing credentials to the source host. thanks naddy@ for catching the missing argument in usage() "Yes please!" - markus@ "makes a lot of sense" - deraadt@ "the right thing to do" - dtucker@ OpenBSD-Commit-ID: d0d2af5f0965c5192ba5b2fa461c9f9b130e5dd9
* upstream: make scp in SFTP mode try to use relative paths as muchdjm@openbsd.org2021-08-101-71/+26
| | | | | | | | | | as possible. Previosuly, it would try to make relative and ~/-rooted paths absolute before requesting transfers. prompted by and much discussion deraadt@ ok markus@ OpenBSD-Commit-ID: 46639d382ea99546a4914b545fa7b00fa1be5566
* upstream: SFTP protocol extension to allow the server to expanddjm@openbsd.org2021-08-101-6/+11
| | | | | | | | | | ~-prefixed paths, in particular ~user ones. Allows scp in sftp mode to accept these paths, like scp in rcp mode does. prompted by and much discussion deraadt@ ok markus@ OpenBSD-Commit-ID: 7d794def9e4de348e1e777f6030fc9bafdfff392
* upstream: when scp is in SFTP mode, try to deal better with ~djm@openbsd.org2021-08-101-10/+34
| | | | | | | | | | prefixed paths. ~user paths aren't supported, but ~/ paths will be accepted and prefixed with the SFTP server starting directory (more to come) prompted by and discussed with deraadt@ ok markus@ OpenBSD-Commit-ID: 263a071f14555c045fd03132a8fb6cbd983df00d
* upstream: on fatal errors, make scp wait for ssh connection beforedjm@openbsd.org2021-08-101-1/+19
| | | | | | | | | | | exiting avoids LogLevel=verbose (or greater) messages from ssh appearing after scp has returned exited and control has returned to the shell; ok markus@ (this was originally committed as r1.223 along with unrelated stuff that I rolled back in r1.224) OpenBSD-Commit-ID: 1261fd667ad918484889ed3d7aec074f3956a74b
* upstream: rever r1.223 - I accidentally committed unrelated changesdjm@openbsd.org2021-08-101-64/+25
| | | | OpenBSD-Commit-ID: fb73f3865b2647a27dd94db73d6589506a9625f9
* upstream: on fatal errors, make scp wait for ssh connection beforedjm@openbsd.org2021-08-101-25/+64
| | | | | | | | exiting avoids LogLevel=verbose (or greater) messages from ssh appearing after scp has returned exited and control has returned to the shell; ok markus@ OpenBSD-Commit-ID: ef9dab5ef5ae54a6a4c3b15d380568e94263456c
* upstream: Fix prototype mismatch for do_cmd. ok djm@dtucker@openbsd.org2021-08-071-2/+2
| | | | OpenBSD-Commit-ID: 1c1598bb5237a7ae0be99152f185e0071163714d
* upstream: make scp(1) in SFTP mode follow symlinks likedjm@openbsd.org2021-08-071-4/+4
| | | | | | traditional scp(1) ok markus@ OpenBSD-Commit-ID: 97255e55be37e8e26605e4ba1e69f9781765d231
* upstream: make scp(1) in SFTP mode output better match originaldjm@openbsd.org2021-08-071-3/+4
| | | | | | | scp(1) by suppressing "Retrieving [path]" lines that were emitted to support the interactive sftp(1) client. ok markus@ OpenBSD-Commit-ID: 06be293df5f156a18f366079be2f33fa68001acc
* upstream: use sftp_client crossloading to implement scp -3djm@openbsd.org2021-08-071-40/+189
| | | | | | feedback/ok markus@ OpenBSD-Commit-ID: 7db4c0086cfc12afc9cfb71d4c2fd3c7e9416ee9
* upstream: prepare for scp -3 implemented via sftpdjm@openbsd.org2021-08-071-19/+6
| | | | OpenBSD-Commit-ID: 194aac0dd87cb175334b71c2a30623a5ad55bb44
* upstream: Allow for different (but POSIX compliant) behaviour ofdtucker@openbsd.org2021-08-041-3/+4
| | | | | | | | | | | | | | | basename(3) and prevent a use-after-free in that case in the new sftp-compat code. POSIX allows basename(3) to either return a pointer to static storage or modify the passed string and return a pointer to that. OpenBSD does the former and works as is, but on other platforms "filename" points into "tmp" which was just freed. This makes the freeing of tmp consistent with the other variable in the loop. Pinpointed by the -portable Valgrind regress test. ok djm@ deraadt@ OpenBSD-Commit-ID: 750f3c19bd4440e4210e30dd5d7367386e833374
* use openbsd-compat glob.h is requiredDamien Miller2021-08-041-1/+5
|
* upstream: support for using the SFTP protocol for file transfers indjm@openbsd.org2021-08-031-23/+281
| | | | | | | | | | | | | scp, via a new "-M sftp" option. Marked as experimental for now. Some corner-cases exist, in particular there is no attempt to provide bug-compatibility with scp's weird "double shell" quoting rules. Mostly by Jakub Jelen in GHPR#194 with some tweaks by me. ok markus@ Thanks jmc@ for improving the scp.1 bits. OpenBSD-Commit-ID: 6ce4c9157ff17b650ace571c9f7793d92874051c
* upstream: allow spaces to appear in usernames for local to remote,djm@openbsd.org2021-07-051-5/+10
| | | | | | and scp -3 remote to remote copies. with & ok dtucker bz#1164 OpenBSD-Commit-ID: e9b550f3a85ffbb079b6720833da31317901d6dd
* upstream: highly polished whitespace, mostly fixing spaces-for-tabdjm@openbsd.org2021-04-031-4/+3
| | | | | | and bad indentation on continuation lines. Prompted by GHPR#185 OpenBSD-Commit-ID: e5c81f0cbdcc6144df1ce468ec1bac366d8ad6e9
* upstream: use the new variant log macros instead of prependingdjm@openbsd.org2020-10-181-3/+3
| | | | | | __func__ and appending ssh_err(r) manually; ok markus@ OpenBSD-Commit-ID: 1f14b80bcfa85414b2a1a6ff714fb5362687ace8
* 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
View Lorry Controller Status