summaryrefslogtreecommitdiffstats
path: root/clientloop.c (follow)
Commit message (Collapse)AuthorAgeFilesLines
* upstream: don't start the ObscureKeystrokeTiming mitigations ifdjm@openbsd.org2024-10-141-3/+4
| | | | | | | | | there has been traffic on a X11 forwarding channel recently. Should fix X11 forwarding performance problems when this setting is enabled. Patch from Antonio Larrosa via bz3655 OpenBSD-Commit-ID: 820284a92eb4592fcd3d181a62c1b86b08a4a7ab
* upstream: when sending ObscureKeystrokeTiming chaff packets, wedjm@openbsd.org2024-07-011-3/+4
| | | | | | | | | can't rely on channel_did_enqueue to tell that there is data to send. This flag indicates that the channels code enqueued a packet on _this_ ppoll() iteration, not that data was enqueued in _any_ ppoll() iteration in the timeslice. ok markus@ OpenBSD-Commit-ID: 009b74fd2769b36b5284a0188ade182f00564136
* upstream: remove prototypes with no matching function; ok djm@jsg@openbsd.org2024-05-221-2/+1
| | | | OpenBSD-Commit-ID: 6d9065dadea5f14a01bece0dbfe2fba1be31c693
* upstream: simplify exit message handling, which was more complicateddjm@openbsd.org2024-05-101-33/+16
| | | | | | than it needed to be because of unexpunged ssh1 remnants. ok markus@ OpenBSD-Commit-ID: 8b0cd2c0dee75fb053718f442aa89510b684610b
* upstream: correctly restore sigprocmask around ppoll() reporteddjm@openbsd.org2024-04-301-2/+2
| | | | | | by Tõivo Leedjärv; ok deraadt@ OpenBSD-Commit-ID: c0c0f89de5294a166578f071eade2501929c4686
* upstream: add explict check for server hostkey type againstdjm@openbsd.org2024-04-301-21/+2
| | | | | | | HostkeyAlgorithms. Allows HostkeyAlgorithms to disable implicit fallback from certificate keys to plain keys. ok markus@ OpenBSD-Commit-ID: 364087e4a395ff9b2f42bf3aefdb2090bb23643a
* upstream: fix proxy multiplexing mode, broken when keystroke timingdjm@openbsd.org2024-02-211-2/+2
| | | | | | obfuscation was added. GHPR#463 from montag451 OpenBSD-Commit-ID: 4e412d59b3f557d431f1d81c715a3bc0491cc677
* upstream: Plug mem leak of msg when processing a quit message.dtucker@openbsd.org2023-11-241-1/+2
| | | | | | Coverity CID#427852, ok djm@ OpenBSD-Commit-ID: bf85362addbe2134c3d8c4b80f16601fbff823b7
* upstream: when deciding whether to enable keystroke timingdjm@openbsd.org2023-11-151-2/+2
| | | | | | | | | obfuscation, only consider enabling it when a channel with a tty is open. Avoids turning on the obfucation when X11 forwarding only is in use, which slows it right down. Reported by Roger Marsh OpenBSD-Commit-ID: c292f738db410f729190f92de100c39ec931a4f1
* upstream: mask SIGINT/TERM/QUIT/HUP before checking quit_pendingdjm@openbsd.org2023-10-121-7/+18
| | | | | | | and use ppoll() to unmask them in the mainloop. Avoids race condition between signaling ssh to exit and polling. bz3531; ok dtucker OpenBSD-Commit-ID: 5c14e1aabcddedb95cdf972283d9c0d5083229e7
* upstream: add ChannelTimeout support to the client, mirroring thedjm@openbsd.org2023-10-121-4/+4
| | | | | | same option in the server. ok markus@ OpenBSD-Commit-ID: 55630b26f390ac063980cfe7ad8c54b03284ef02
* upstream: typo in commentdjm@openbsd.org2023-09-111-2/+2
| | | | OpenBSD-Commit-ID: 69285e0ce962a7c6b0ab5f17a293c60a0a360a18
* upstream: randomise keystroke obfuscation intervals and averagedjm@openbsd.org2023-09-101-6/+46
| | | | | | interval rate. ok dtucker@ OpenBSD-Commit-ID: 05f61d051ab418fcfc4857ff306e420037502382
* upstream: trigger keystroke timing obfucation only if the channelsdjm@openbsd.org2023-09-041-10/+14
| | | | | | | | | | | layer enqueud some data in the last poll() cycle; this avoids triggering the obfuscatior for non-channels data like ClientAlive probes and also fixes a related problem were the obfucations would be triggered on fully quiescent connections. Based on / tested by naddy@ OpenBSD-Commit-ID: d98f32dc62d7663ff4660e4556e184032a0db123
* upstream: avoid bogus "obfuscate_keystroke_timing: stopping ..."djm@openbsd.org2023-09-041-4/+6
| | | | | | | debug messages when keystroke timing obfuscation was never started; spotted by naddy@ OpenBSD-Commit-ID: 5c270d35f7d2974db5c1646e9c64188f9393be31
* upstream: explicit long long type in timing calculations (doesn'tdjm@openbsd.org2023-08-281-3/+3
| | | | | | matter, since the range is pre-clamped) OpenBSD-Commit-ID: f786ed902d04a5b8ecc581d068fea1a79aa772de
* upstream: Add keystroke timing obfuscation to the client.djm@openbsd.org2023-08-281-4/+129
| | | | | | | | | | | | This attempts to hide inter-keystroke timings by sending interactive traffic at fixed intervals (default: every 20ms) when there is only a small amount of data being sent. It also sends fake "chaff" keystrokes for a random interval after the last real keystroke. These are controlled by a new ssh_config ObscureKeystrokeTiming keyword/ feedback/ok markus@ OpenBSD-Commit-ID: 02231ddd4f442212820976068c34a36e3c1b15be
* upstream: Move up null check and simplify process_escapes.dtucker@openbsd.org2023-04-031-7/+5
| | | | | | | | | Based on Coverity CID 291863 which points out we check the channel pointer for NULLness after dereferencing it. Move this to the start of the function, and while there simplify initialization of efc a bit. ok djm@ OpenBSD-Commit-ID: de36e5ad6fde0fe263ca134e986b9095dc59380a
* upstream: remove redundant testdjm@openbsd.org2023-03-311-2/+2
| | | | OpenBSD-Commit-ID: 6a0b719f9b1ae9d42ad8c5b144c7962c93792f7c
* upstream: Delete obsolete /* ARGSUSED */ lint comments.guenther@openbsd.org2023-03-081-3/+1
| | | | | | ok miod@ millert@ OpenBSD-Commit-ID: 7be168a570264d59e96a7d2d22e927d45fee0e4c
* upstream: Check for non-NULL before stringdtucker@openbsd.org2023-03-041-2/+2
| | | | | | comparison. From jjelen at redhat.com via bz#2687. OpenBSD-Commit-ID: 0d9b2e0cac88a311b5766b1aef737082583c285f
* upstream: Use time_t for x11_refuse_time timeout. We needdtucker@openbsd.org2023-03-031-5/+5
| | | | | | | SSH_TIME_T_MAX for this, so move from misc.c to misc.h so it's available. Fixes a Coverity warning for 64bit time_t safety, ok djm@ OpenBSD-Commit-ID: c69c4c3152cdaab953706db4ccf4d5fd682f7d8d
* upstream: Add channel_force_close()djm@openbsd.org2023-01-061-11/+3
| | | | | | | | | | | | | | | This will forcibly close an open channel by simulating read/write errors, draining the IO buffers and calling the detach function. Previously the detach function was only ever called during channel garbage collection, but there was no way to signal the user of a channel (e.g. session.c) that its channel was being closed deliberately (vs. by the usual state-machine logic). So this adds an extra "force" argument to the channel cleanup callback to indicate this condition. ok markus dtucker OpenBSD-Commit-ID: 23052707a42bdc62fda2508636e624afd466324b
* upstream: replace manual poll/ppoll timeout math with ptimeout APIdjm@openbsd.org2023-01-061-26/+12
| | | | | | feedback markus / ok markus dtucker OpenBSD-Commit-ID: c5ec4f2d52684cdb788cd9cbc1bcf89464014be2
* upstream: Add void to client_repledge args to fix compiler warning. ok djm@dtucker@openbsd.org2022-11-301-3/+3
| | | | OpenBSD-Commit-ID: 7e964a641ce4a0a0a11f047953b29929d7a4b866
* upstream: tighten pledge(2) after session establishmentdjm@openbsd.org2022-11-301-7/+87
| | | | | | feedback, ok & testing in snaps deraadt@ OpenBSD-Commit-ID: aecf4d49d28586dfbcc74328d9333398fef9eb58
* upstream: New EnableEscapeCommandline ssh_config(5) optiondjm@openbsd.org2022-11-301-3/+11
| | | | | | | | | | This option (default "no") controls whether the ~C escape is available. Turning it off by default means we will soon be able to use a stricter default pledge(2) in the client. feedback deraadt@ dtucker@; tested in snaps for a while OpenBSD-Commit-ID: 7e277595d60acb8263118dcb66554472257b387a
* upstream: Handle dynamic remote port forwarding in escape commandline'sdtucker@openbsd.org2022-11-111-3/+10
| | | | | | -R processing. bz#3499, ok djm@ OpenBSD-Commit-ID: 194ee4cfe7ed0e2b8ad0727f493c798a50454208
* upstream: rename client_global_hostkeys_private_confirm() todjm@openbsd.org2022-11-091-4/+4
| | | | | | | client_global_hostkeys_prove_confirm(), as it handles the "hostkeys-prove00@openssh.com" message; no functional change OpenBSD-Commit-ID: 31e09bd3cca6eed26855b88fb8beed18e9bd026d
* upstream: Make SetEnv directives first-match-wins in bothdjm@openbsd.org2022-06-031-4/+5
| | | | | | | | | | | sshd_config and sshd_config; previously if the same name was reused then the last would win (which is the opposite to how the config is supposed to work). While there, make the ssh_config parsing more like sshd_config. bz3438, ok dtucker OpenBSD-Commit-ID: 797909c1e0262c0d00e09280459d7ab00f18273b
* upstream: Try to continue running local I/O for channels in statedjm@openbsd.org2022-04-201-4/+3
| | | | | | | | OPEN during SSH transport rekeying. The most visible benefit is that it should make ~-escapes work in the client (e.g. to exit) if the connection happened to have stalled during a rekey event. Based work by and ok dtucker@ OpenBSD-Commit-ID: a66e8f254e92edd4ce09c9f750883ec8f1ea5f45
* Put poll.h inside ifdef.Darren Tucker2022-02-101-0/+2
|
* upstream: add a ssh_packet_process_read() function that reads fromdjm@openbsd.org2022-01-251-28/+13
| | | | | | | | | | | | | | a fd directly into the transport input buffer. Use this in the client and server mainloops to avoid unnecessary copying. It also lets us use a more greedy read size without penalty. Yields a 2-3% performance gain on cipher-speed.sh (in a fairly unscientific test tbf) feedback dtucker@ ok markus@ OpenBSD-Commit-ID: df4112125bf79d8e38e79a77113e1b373078e632
* upstream: add a helper for writing an error message to thedjm@openbsd.org2022-01-251-22/+28
| | | | | | | stderr_buf and setting quit_pending; no functional change but saves a bunch of boilerplate OpenBSD-Commit-ID: 0747657cad6b9eabd514a6732adad537568e232d
* upstream: suppress "Connection to xxx closed" messages at LogLevel >=djm@openbsd.org2022-01-111-2/+2
| | | | | | error bz3378; ok dtucker@ OpenBSD-Commit-ID: d5bf457d5d2eb927b81d0663f45248a31028265c
* upstream: stricter UpdateHostkey signature verification logic ondjm@openbsd.org2022-01-061-14/+34
| | | | | | | | | the client- side. Require RSA/SHA2 signatures for RSA hostkeys except when RSA/SHA1 was explicitly negotiated during initial KEX; bz3375 ok markus@ OpenBSD-Commit-ID: 46e75e8dfa2c813781805b842580dcfbd888cf29
* upstream: convert ssh, sshd mainloops from select() to poll();djm@openbsd.org2022-01-061-81/+88
| | | | | | feedback & ok deraadt@ and markus@ has been in snaps for a few months OpenBSD-Commit-ID: a77e16a667d5b194dcdb3b76308b8bba7fa7239c
* upstream: spelling ok dtucker@jsg@openbsd.org2022-01-011-2/+2
| | | | OpenBSD-Commit-ID: bfc7ba74c22c928de2e257328b3f1274a3dfdf19
* upstream: ssh client side of bindingdjm@openbsd.org2021-12-191-1/+7
| | | | | | | | | | send session ID, hostkey, signature and a flag indicating whether the agent connection is being forwarded to ssh agent each time a connection is opened via a new "session-bind@openssh.com" agent extension. ok markus@ OpenBSD-Commit-ID: 2f154844fe13167d3ab063f830d7455fcaa99135
* upstream: less confusing debug message; bz#3365djm@openbsd.org2021-11-181-2/+2
| | | | OpenBSD-Commit-ID: 836268d3642c2cdc84d39b98d65837f5241e4a50
* upstream: wrap at 80 columnsdjm@openbsd.org2021-08-301-2/+3
| | | | OpenBSD-Commit-ID: 47ca2286d6b52a9747f34da16d742879e1a37bf0
* upstream: Add a ForkAfterAuthentication ssh_config(5) counterpartdjm@openbsd.org2021-07-231-5/+2
| | | | | | | to the ssh(1) -f flag. Last part of GHPR231 from Volker Diels-Grabsch. ok dtucker OpenBSD-Commit-ID: b18aeda12efdebe2093d55263c90fe4ea0bce0d3
* upstream: Add a StdinNull directive to ssh_config(5) that allowsdjm@openbsd.org2021-07-231-4/+1
| | | | | | | the config file to do the same thing as -n does on the ssh(1) commandline. Patch from Volker Diels-Grabsch via GHPR231; ok dtucker OpenBSD-Commit-ID: 66ddf3f15c76796d4dcd22ff464aed1edd62468e
* upstream: Explicitly check for and start time-based rekeying in thedjm@openbsd.org2021-07-161-1/+5
| | | | | | | | | | | | client and server mainloops. Previously the rekey timeout could expire but rekeying would not start until a packet was sent or received. This could cause us to spin in select() on the rekey timeout if the connection was quiet. ok markus@ OpenBSD-Commit-ID: 4356cf50d7900f3df0a8f2117d9e07c91b9ff987
* upstream: add a SessionType directive to ssh_config, allowing thedjm@openbsd.org2021-07-141-6/+3
| | | | | | | | | | configuration file to offer equivalent control to the -N (no session) and -s (subsystem) command-line flags. Part of GHPR#231 by Volker Diels-Grabsch with some minor tweaks; feedback and ok dtucker@ OpenBSD-Commit-ID: 726ee931dd4c5cc7f1d7a187b26f41257f9a2d12
* upstream: Fix a couple of whitespace things. Portable already hasdtucker@openbsd.org2021-07-081-1/+1
| | | | | | these so this removes two diffs between the two. OpenBSD-Commit-ID: 769f017ebafd8e741e337b3e9e89eb5ac73c9c56
* upstream: fix SEGV in UpdateHostkeys debug() message, triggereddjm@openbsd.org2021-05-261-2/+2
| | | | | | | when the update removed more host keys than remain present. Fix tested by reporter James Cook, via bugs@ OpenBSD-Commit-ID: 44f641f6ee02bb957f0c1d150495b60cf7b869d3
* upstream: restore blocking status on stdio fds before closedjm@openbsd.org2021-05-191-9/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | ssh(1) needs to set file descriptors to non-blocking mode to operate but it was not restoring the original state on exit. This could cause problems with fds shared with other programs via the shell, e.g. > $ cat > test.sh << _EOF > #!/bin/sh > { > ssh -Fnone -oLogLevel=verbose ::1 hostname > cat /usr/share/dict/words > } | sleep 10 > _EOF > $ ./test.sh > Authenticated to ::1 ([::1]:22). > Transferred: sent 2352, received 2928 bytes, in 0.1 seconds > Bytes per second: sent 44338.9, received 55197.4 > cat: stdout: Resource temporarily unavailable This restores the blocking status for fds 0,1,2 (stdio) before ssh(1) abandons/closes them. This was reported as bz3280 and GHPR246; ok dtucker@ OpenBSD-Commit-ID: 8cc67346f05aa85a598bddf2383fcfcc3aae61ce
* upstream: Don't pass NULL as a string in debugging as it does not workdtucker@openbsd.org2021-05-051-2/+2
| | | | | | on some platforms in -portable. ok djm@ OpenBSD-Commit-ID: 937c892c99aa3c9c272a8ed78fa7c2aba3a44fc9
* upstream: more debugging for UpdateHostKeys signature failuresdjm@openbsd.org2021-05-031-2/+5
| | | | OpenBSD-Commit-ID: 1ee95f03875e1725df15d5e4bea3e73493d57d36
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-01 21:10:29 +0100