Commit Graph

1584 Commits

Author SHA1 Message Date
terrafrost
80bc33b741 Merge branch '2.0' into 3.0 2023-12-28 07:54:49 -06:00
terrafrost
542a044cf5 Merge branch '1.0' into 2.0 2023-12-28 07:52:46 -06:00
terrafrost
c8e3ab9317 SSH2: implement terrapin attack countermeasures 2023-12-28 07:44:51 -06:00
terrafrost
05414ffee8 Merge branch '3.0' 2023-12-18 22:55:29 -06:00
terrafrost
d2cd758ecb Merge branch '2.0' into 3.0 2023-12-18 22:55:17 -06:00
terrafrost
90de8f1255 Merge branch '1.0' into 2.0 2023-12-18 22:54:31 -06:00
terrafrost
23f117e32b SSH2: only capture login info once 2023-12-18 22:54:09 -06:00
terrafrost
bae3b79ae0 Merge branch '3.0' 2023-12-08 21:38:55 -06:00
terrafrost
0548866d42 Merge branch '2.0' into 3.0 2023-12-08 21:38:40 -06:00
terrafrost
5a903ae520 Merge branch '1.0' into 2.0 2023-12-08 18:58:54 -06:00
terrafrost
404f86fb61 SFTP: ping() didn't work for SFTP connections 2023-12-08 18:58:32 -06:00
terrafrost
ea50144e42 Merge branch '3.0' 2023-12-02 16:42:19 -06:00
terrafrost
9c0a004d01 SSH2: CS adjustment 2023-12-02 16:42:09 -06:00
terrafrost
e600b49c54 Merge branch '3.0' 2023-11-23 05:35:29 -06:00
Kevin Pfeifer
ad968b2f69 fix syntax error 2023-11-23 10:05:17 +01:00
terrafrost
11bde49f67 Merge branch '3.0' 2023-11-22 18:09:07 -06:00
terrafrost
8ecd156ce1 SSH2: reset more internal variables when connection is reset 2023-11-22 18:08:38 -06:00
terrafrost
c6f25ccde3 Merge branch '3.0' 2023-11-22 12:45:05 -06:00
terrafrost
be05f4ef1f Merge branch '2.0' into 3.0 2023-11-22 12:44:52 -06:00
terrafrost
f1e58543b0 Merge branch '1.0' into 2.0 2023-11-22 12:39:23 -06:00
terrafrost
e84886fde2 SSH2: another attempt at #1960 2023-11-22 12:38:34 -06:00
terrafrost
d88db1afea Merge branch '3.0' 2023-11-22 08:21:55 -06:00
terrafrost
7b893c5cb4 Merge branch '2.0' into 3.0 2023-11-22 08:18:49 -06:00
terrafrost
70c7ffe42c Merge branch '1.0' into 2.0 2023-11-22 08:14:20 -06:00
terrafrost
49c9439878 SSH2: use phpseclib's preferred order for auth algorithms 2023-11-22 08:13:46 -06:00
terrafrost
77b00c3169 CS adjustment 2023-11-22 05:12:24 -06:00
terrafrost
cf1be6a3d3 Merge branch '3.0' 2023-11-22 04:51:42 -06:00
terrafrost
7cc1814f9d Merge branch '2.0' into 3.0 2023-11-22 04:44:23 -06:00
terrafrost
848992230f Merge branch '1.0' into 2.0 2023-11-21 23:03:12 -06:00
terrafrost
356ab5f76a SSH2: add support for RFC8308 2023-11-21 23:02:42 -06:00
terrafrost
6f4559f2f3 Merge branch '3.0' 2023-11-04 16:15:50 -05:00
terrafrost
3ecde6bf6a SSH2: don't use AES GCM for TurboFTP Server 2023-11-04 16:13:09 -05:00
MarkLittlewood
eb04913463 access $disconnect_reasons using self instead of static 2023-10-18 15:25:41 +01:00
terrafrost
c160a020db Merge branch '3.0' 2023-08-28 08:51:17 -05:00
terrafrost
aeac69b846 Merge branch '2.0' into 3.0 2023-08-28 08:51:10 -05:00
terrafrost
bc62673fdd Merge branch '1.0' into 2.0 2023-08-28 08:51:02 -05:00
terrafrost
320c43a4a0 SFTP: fix issue with get() downloading to files / streams
the code that's being removed has its origins in 65193d9a25. in that commit the packet length is set outside of the while loop. this would continue to be the case until https://github.com/phpseclib/phpseclib/pull/945.
2023-08-28 08:47:30 -05:00
terrafrost
278f8e5f5a Merge branch '1.0' into 2.0 2023-08-24 20:21:13 -05:00
terrafrost
0f23be3188 SFTP: fix SFTPv2 errors when logging errors 2023-08-24 20:20:47 -05:00
terrafrost
6ee1f8c45b Merge branch '3.0' 2023-07-05 07:30:46 -05:00
terrafrost
4013d260e0 Merge branch '2.0' into 3.0 2023-07-05 07:30:39 -05:00
terrafrost
d8eec980b7 Merge branch '1.0' into 2.0 2023-07-05 07:30:33 -05:00
Kevin Reniers
38a2a84da1 Add EOF test to SSH2::isConnected
This adds an additional test to SSH2::isConnected to make it more intuitive. Aside from testing against the internal state, it will also assert that there is an internal socket and that that socket has not reached EOF.
2023-07-05 07:29:54 -05:00
terrafrost
a31fd00e5a Merge branch '3.0' 2023-07-02 12:33:20 -05:00
terrafrost
5a7569cd13 SSH2: attempt at fixing stream_select(): unable to select [4] 2023-07-02 12:32:01 -05:00
terrafrost
2d33d7b0dc Merge branch '3.0' 2023-07-02 11:56:58 -05:00
terrafrost
3334a3243c Merge branch '2.0' into 3.0 2023-07-02 11:55:51 -05:00
terrafrost
09f19cb92a Merge branch '1.0' into 2.0 2023-07-02 11:55:40 -05:00
terrafrost
de09e8e817 SFTP: RESUME_START didn't work as described 2023-07-02 11:48:07 -05:00
terrafrost
65693db644 Merge branch '3.0' 2023-07-02 11:29:03 -05:00
terrafrost
9341e090c5 Merge branch '2.0' into 3.0 2023-07-02 11:18:17 -05:00
terrafrost
6aa6a5241f SFTP: CS adjustments 2023-07-02 10:46:34 -05:00
terrafrost
411d09cb7a Merge branch '1.0' into 2.0 2023-07-02 10:45:46 -05:00
terrafrost
df3dab7d3f SFTP: make it so SFTP::RESUME also sets offset of local file 2023-07-02 10:45:25 -05:00
terrafrost
cbbadea6d1 Merge branch '1.0' into 2.0 2023-06-13 03:02:45 -05:00
terrafrost
16c67f4399 SSH2: fix more E_DEPRECATE_NOTICEs 2023-06-13 03:01:43 -05:00
terrafrost
68d8f5b4fe Merge branch '1.0' into 2.0 2023-06-12 17:15:30 -05:00
terrafrost
b6c01f9318 SSH2: backport some E_DEPRECATED fixes from 3.0 2023-06-12 17:14:58 -05:00
terrafrost
6833fc79a6 Merge branch '3.0' 2023-06-04 16:39:59 -05:00
terrafrost
4f113bc96c SFTP: CS adjustment 2023-06-04 16:39:44 -05:00
terrafrost
dff24146af CS adjustment 2023-06-04 16:33:58 -05:00
terrafrost
ff26e22563 CS adjustments 2023-06-04 11:26:34 -05:00
terrafrost
501c96c48c Merge branch '3.0' 2023-06-04 10:51:36 -05:00
terrafrost
b8f8f0b7db SFTP: add optional $recursive parameter to filesize() 2023-06-04 10:50:26 -05:00
terrafrost
1b1c073d1e Merge branch '3.0' 2023-05-18 08:24:02 -05:00
thomascorthals
c71c217fd5 SFTP typehint fixes 2023-05-15 11:15:49 +02:00
terrafrost
8d0c1a10c7
Merge pull request #1905 from terrafrost/master-openchannel
(master branch) SSH/SFTP: create new openChannel() method to eliminate dupe code
2023-05-10 04:39:06 -05:00
terrafrost
b25206e92b
Merge pull request #1904 from terrafrost/3.0-openchannel
(3.0 branch) SSH/SFTP: create new openChannel() method to eliminate dupe code
2023-05-10 04:38:51 -05:00
terrafrost
e6f86e1770 Merge branch '3.0-openchannel' into master-openchannel 2023-05-07 11:35:24 -05:00
terrafrost
3dd7779939 SSH2: rm redundant isAuthenticated() call 2023-05-07 11:24:33 -05:00
terrafrost
89d8e6ecbb SFTP: rm redundant code 2023-05-07 11:07:38 -05:00
terrafrost
f664ccb521 SSH2: make exceptions more useful for read() / write() 2023-05-07 11:07:07 -05:00
terrafrost
928b5870b2 Merge branch '3.0' 2023-04-21 15:39:47 -05:00
terrafrost
79b6f96870 SSH2: CS adjustment 2023-04-21 15:39:01 -05:00
Andrew Brown
d4263e854d update exception message
`fputs()` can return `int|false`.  if it fails and `$sent` is `false`, then our exception message looks a little confusing:

> Only  of XXX bytes were sent

This change updates the message to be more descriptive if the `fputs()` fails.
2023-04-18 15:16:18 -05:00
terrafrost
52c85c9935 Merge branch '3.0-openchannel' into master-openchannel 2023-04-15 08:31:37 -05:00
terrafrost
184a984e97 SSH2: updates to openchannel refactoring 2023-04-14 18:01:20 -05:00
terrafrost
34feefef3d Merge branch '3.0' 2023-04-12 20:58:10 -05:00
terrafrost
8b67d0ac32 Merge branch '2.0' into 3.0 2023-04-12 20:56:23 -05:00
terrafrost
d5d0fca7cf Merge branch '1.0' into 2.0 2023-04-12 20:49:21 -05:00
terrafrost
53f967c36e SFTP: fix NET_SFTP_ATTR_EXTENDED 2023-04-12 20:49:07 -05:00
terrafrost
7d4fa71e9c Merge branch '3.0' 2023-04-10 01:28:25 -05:00
terrafrost
55578577c5 Merge branch '3.0-openchannel' into master-openchannel 2023-03-30 20:52:26 -05:00
terrafrost
5fb084b04c SSH2: if the server doesn't support multiple channels error out 2023-03-29 04:05:41 -05:00
Vincent Langlet
39bc067417 Fix phpdoc 2023-03-28 09:54:46 +02:00
terrafrost
cecabb1fea SSH/SFTP: create new openChannel() method to eliminate dupe code 2023-03-27 17:46:46 -05:00
terrafrost
b799abd1a0 SSH/SFTP: make message numbers / packet types static as well 2023-03-23 13:04:07 -05:00
terrafrost
9705cbbc26 SSH/SFTP: make define_array static 2023-03-23 12:23:43 -05:00
Robert
53fe071bd2 Merge branch '3.0' 2023-03-16 11:01:21 -05:00
Robert
7ec36fb5d5 Exposed publically open shell method as well as methods to query interactive channel open statuses.
Removed in_request_pty_exec and in_subsystem flags, and removed uses of MASK_SHELL in bitmap, replacing with open channel status queries.
Adding channel argument to read, write, and reset allowing callers to select among multiple open interactive channels.
Adding interactive channel identifier interface as sanctioned path for users to obtain channels ids instead of using channel constants.
Deprecating get_interactive_channel helper and documenting its "legacy" behavior in read, write, and reset doc blocks.
Removing disconnect on timeout in channel close for lack of clarity around timeout origin.
Check for open channel prior to closing in stopSubsystem and reset.
2023-03-16 10:18:03 -05:00
terrafrost
7ce104b12c Merge branch '1.0' into 2.0 2023-03-05 04:18:37 -06:00
terrafrost
34d00869e5 SSH2: backport getTimeout() 2023-03-05 04:07:26 -06:00
terrafrost
79dead6a5e CS adjustments 2023-03-05 00:09:02 -06:00
terrafrost
71b9b64203 CS adjustments 2023-03-04 20:47:49 -06:00
Robert
d012d6cd03 Adding getter for timeout to SSH2 2023-02-28 12:52:01 -06:00
terrafrost
1b1e729632 backport enhancements from the 2.0 branch 2023-02-11 22:20:03 -06:00
terrafrost
ad7a7d5c8f fix PHP <5.4 compatability 2023-02-10 12:34:11 -06:00
terrafrost
00f5057e1b Merge branch '3.0' 2023-01-06 14:57:48 -06:00
Kevin van Hulst
3ad3693d31 fix "Creating default object from empty value" error 2023-01-06 14:57:05 -06:00
terrafrost
aa68ee7e69 Merge branch '1.0' into 2.0 2022-12-23 10:16:52 -06:00