Commit Graph

1584 Commits

Author SHA1 Message Date
Alexander Vlasov
797351cd63 Fix undefined properties deprecated in PHP 8.2 2022-12-23 10:08:51 -06:00
terrafrost
d02d77ad56 Merge branch '3.0' 2022-12-11 09:01:36 -06:00
terrafrost
1a201dd131 Merge branch '2.0' into 3.0 2022-12-11 08:59:36 -06:00
terrafrost
6611c0b566 Merge branch '1.0' into 2.0 2022-12-11 07:30:01 -06:00
terrafrost
1c56e00cf8 SSH2: if logging in with rsa-sha2-256/512 fails, try ssh-rsa 2022-12-11 07:29:44 -06:00
terrafrost
8907a4bd5b Merge branch '1.0' into 2.0 2022-11-28 08:43:32 -06:00
terrafrost
68c3eef88f SCP: do $var === false vs !$var 2022-11-28 08:42:55 -06:00
Jack Worman
fe4bdc0410 Property_typehint_in_ssh2 2022-10-07 08:39:21 -05:00
terrafrost
0a50932285 SFTP: CS adjustments 2022-10-04 21:32:14 -05:00
terrafrost
b2ca37b990 Merge branch '3.0' 2022-10-04 21:31:51 -05:00
terrafrost
a10a3b8e5b Merge branch '2.0' into 3.0 2022-10-04 21:02:49 -05:00
terrafrost
2ed74533f4 Merge branch '1.0' into 2.0 2022-10-04 18:11:49 -05:00
Phil Davis
24845ccbcc delete of non-existent folder returns true when it used to ret 2022-10-04 17:56:23 -05:00
Jack Worman
985b3c4f7c Throw \phpseclib3\Exception\ExceptionInterface exceptions 2022-09-26 07:41:32 -05:00
terrafrost
2b937b413a Merge branch '2.0' 2022-09-23 23:17:54 -05:00
terrafrost
4f53331c98 SSH2: rm if condition that can't ever be true in 3.0+ 2022-09-23 23:03:11 -05:00
terrafrost
535fa6c777 Merge branch '3.0' 2022-09-14 23:47:17 -05:00
terrafrost
65493ae3be Merge branch '2.0' into 3.0 2022-09-14 12:50:32 -05:00
terrafrost
73b149ea6d Merge branch '1.0' into 2.0 2022-09-13 23:59:59 -05:00
terrafrost
51cafda4a3 make PHP 8.1 32-bit changes compatable with raspberry pi's 2022-09-13 23:56:13 -05:00
Jeremy Albert
2ab212300e Avoid implicit conversion from float to int 2022-09-13 12:53:20 -05:00
terrafrost
10fe792938 Merge branch '3.0' 2022-09-05 12:51:44 -05:00
terrafrost
59e34b1cd3 SSH2: fix type hinting for keyboard_interactive_helper 2022-09-05 12:50:38 -05:00
Jack Worman
16ade5d634 Quality tool fixes 2022-08-18 08:25:29 -05:00
Jack Worman
a8f30f516a Throw exception instead of triggering error, and added base exception interface 2022-08-18 08:10:12 -05:00
Jack Worman
6958ba1627 php-cs-fixer @PHP81Migration rule set 2022-08-18 08:10:12 -05:00
Jack Worman
80f2d7f521 php-cs-fixer - php 7.4 rules 2022-08-18 08:10:08 -05:00
terrafrost
9e7efc914d fix bad merge 2022-08-16 19:38:23 -05:00
terrafrost
fd6e53719c Merge branch '3.0' 2022-08-16 19:32:51 -05:00
terrafrost
e78edac015 Merge branch '3.0-logging-enhancements' into 3.0 2022-08-16 19:19:40 -05:00
walkonthemarz
871f37087d Revert back the commit 85205bf6d5 2022-08-12 16:42:11 +08:00
Jack Worman
510a93a50a Php 7.3
- Update php requirement to >=7.3
- Add php-cs-fixer rule: @PHP73Migration
2022-07-22 21:45:53 -05:00
Jack Worman
e210166f43 Php 7.1 Upgrade 2022-07-08 08:37:58 -05:00
terrafrost
477b98d43d SSH2 / SFTP: unify logging and add a new mode - LOG_SIMPLE_REALTIME 2022-07-06 21:22:03 -05:00
Jack Worman
8a2b94fb24 3rd round of comments 2022-07-03 07:33:45 -05:00
terrafrost
250f1a5b51 more backporting 2022-07-02 21:49:45 -05:00
Jack Worman
86ef8ef262 2nd round of comments 2022-07-02 16:47:49 -05:00
Jack Worman
97902d4bd3 Upgrade to PHP 7.0 2022-07-02 16:26:15 -05:00
terrafrost
545b43cd70 Merge branch '3.0' 2022-06-16 17:57:28 -05:00
terrafrost
f24691dc55 Merge branch '2.0' into 3.0 2022-06-16 09:37:40 -05:00
terrafrost
a0c76f01d2 Merge branch '1.0' into 2.0 2022-06-16 08:32:59 -05:00
terrafrost
f189b9aae2 SFTP: try without path canonicalization if initial realpath() fails
also make it so chdir works even without path canonicalization
2022-06-16 08:31:39 -05:00
terrafrost
c4f6f602e5 SFTP: update for the master branch 2022-06-14 05:47:51 -05:00
terrafrost
a84f5ddc49 Merge branch '3.0' 2022-06-14 05:47:13 -05:00
terrafrost
623bb39f1c SFTP: update for 3.0 branch
in 1.0 / 2.0 _get_channel_packet could return false even when the
channel status was NET_SSH2_MSG_CHANNEL_DATA. in 3.0 it can't.
where 1.0 / 2.0 returned false 3.0 now throws exceptions
2022-06-14 05:43:31 -05:00
terrafrost
d85417c6ec Merge branch '2.0' into 3.0 2022-06-14 05:42:25 -05:00
terrafrost
413dcb6082 SFTP: update for 2.0 code 2022-06-14 05:32:38 -05:00
terrafrost
1d1d3a4403 Merge branch '1.0' into 2.0 2022-06-14 05:31:09 -05:00
terrafrost
85205bf6d5 SSH2: set channel closure flag elsewhere as well 2022-06-14 05:30:24 -05:00
terrafrost
dcf9656a42 Merge branch '3.0' 2022-06-14 03:58:42 -05:00
terrafrost
9c45309d0e SSH2: CS adjustment 2022-06-14 03:58:31 -05:00
terrafrost
0ca4393a2a Merge branch '3.0' 2022-06-14 00:03:20 -05:00
terrafrost
fbf6027a43 Merge branch '2.0' into 3.0 2022-06-14 00:03:13 -05:00
terrafrost
5ea851d68b Merge branch '1.0' into 2.0 2022-06-14 00:02:23 -05:00
terrafrost
62677de0bf SSH2: fix possibly undefined variable error 2022-06-14 00:02:10 -05:00
terrafrost
62c36daa67 Merge branch '3.0' 2022-05-13 15:04:33 -05:00
Filippo Tessarotto
8b13462ee8
SFTP::get can also return true 2022-05-11 11:53:42 +02:00
terrafrost
0446caf2f6 Merge branch '3.0' 2022-05-10 22:14:16 -05:00
terrafrost
43c59198b8 Merge branch '2.0' into 3.0 2022-05-10 22:14:10 -05:00
terrafrost
3286f095d2 Merge branch '1.0' into 2.0 2022-05-10 22:14:04 -05:00
Yan Hu
eb71a6da75 Detect if stream metadata has wrapper_type set for SFTP put() method 2022-05-10 22:13:52 -05:00
terrafrost
c11618f005 Merge branch '3.0' 2022-05-06 16:25:37 -05:00
terrafrost
15ad047415 replace git.io links 2022-05-06 16:25:22 -05:00
terrafrost
51f863f289 Merge branch '3.0' 2022-05-06 14:27:24 -05:00
terrafrost
715bb9ff97 SFTP: CS adjustment 2022-05-06 14:26:57 -05:00
terrafrost
571e16af38 Merge branch '2.0' into 3.0 2022-05-06 14:26:30 -05:00
terrafrost
10a011de1d Merge branch '1.0' into 2.0 2022-05-06 14:26:24 -05:00
terrafrost
1dfd1b9cd4 SFTP: try to delete dir even if it can't be opened 2022-05-06 14:19:42 -05:00
terrafrost
21993760ad Merge branch '3.0' 2022-05-04 07:09:00 -05:00
Jack Worman
8855351cbb Remove_@access 2022-05-04 01:35:56 -05:00
terrafrost
f21681bee8 Merge branch '3.0' 2022-05-04 01:19:12 -05:00
terrafrost
a965060d81 SSH2: make login method return false under rare situation 2022-05-04 01:18:33 -05:00
terrafrost
f57f5debe0 Merge branch '3.0' 2022-04-14 11:50:40 -05:00
terrafrost
e700ac7561 SFTP: fix enableDatePreservation bug w.r.t. mtime 2022-04-14 11:48:49 -05:00
terrafrost
3e073a59e0 Merge branch '3.0' 2022-03-15 18:56:04 -05:00
Jack Worman
0a69972571 Clean Up Tests 2022-03-15 18:49:38 -05:00
terrafrost
95aec3267d CS tweaks (Ssh -> SSH, Sftp -> SFTP) 2022-02-27 02:17:25 -06:00
terrafrost
6a6e80ba8f Merge branch '3.0' 2022-02-27 01:40:25 -06:00
Jack Worman
574953061a PSR4 for tests and added fall-through for switches
PSR4 for tests and added fall-through for switches
2022-02-27 01:26:31 -06:00
terrafrost
004aec954f Merge branch '3.0' 2022-02-19 18:08:40 -06:00
terrafrost
a0d06e5e81 CS adjustments 2022-02-19 17:19:08 -06:00
Jack Worman
ea9f6540f3 PSR12 fixes
PSR12 fixes
2022-02-19 17:06:13 -06:00
terrafrost
86c0007078 SFTP: backport fix from master 2022-02-14 17:42:49 -06:00
terrafrost
b3f14dee37 SSH2: move KEXDH_INIT / KEXDH_REPLY to MessageType 2022-02-04 08:56:52 -06:00
Jack Worman
b352bd602d Changed casing 2022-02-03 19:09:41 -06:00
Jack Worman
fa53c147a5 Aliases PacketType 2022-02-03 12:50:50 -06:00
Jack Worman
dcf3528c8d Renamed constants classes 2022-02-03 12:49:50 -06:00
Jack Worman
61f2bc1c06 Remove Dynamic Constants
Remove Dynamic Constants
2022-02-02 19:43:32 -06:00
terrafrost
56973d40db SSH2: stop using more dynamic properties in SymmetricKey 2022-02-01 21:17:10 -06:00
Jack Worman
9b1c218664 psalm ci
psalm-ci

psalm-ci

psalm-ci
2022-02-01 20:45:53 -06:00
Jack Worman
ef66d9f7dd php-cs-fixer ci
php-cs-fixer ci
2022-02-01 20:29:48 -06:00
terrafrost
3f2a5aa4cd SSH2: stop using dynamic properties in Hash 2022-01-30 01:52:31 -06:00
terrafrost
215fd61d12 SSHi2: stop using dynamic properties in SymmetricKey 2022-01-30 01:36:02 -06:00
Jack Worman
0a9fc99dc8 Un-qualifying global functions
Un-qualifying global functions
2022-01-30 01:19:16 -06:00
Jack Worman
e3b71763ae Fixed psalm level 6 errors in phpseclib/Net/ 2022-01-30 01:18:53 -06:00
terrafrost
3d70b5ece8 SSH2: rm debug code 2022-01-29 11:38:19 -06:00
terrafrost
de4220c461 SSH2: CS adjustments 2022-01-29 11:35:38 -06:00
terrafrost
e6afe3e25f Merge branch '2.0' into 3.0 2022-01-28 00:54:53 -06:00
terrafrost
ef45ea7289 Merge branch '0.0' into 2.0 2022-01-28 00:52:05 -06:00
uzulla
ba4414c2f3 Fix: avoid warn when cast float to int in PHP7.1.
I got some error.

```
 Implicit conversion from float 992216.1102294922 to int loses precision

---

```
2022-01-28 00:44:44 -06:00
terrafrost
a748bf5bef SSH2: one more tweak to RSA signature verificatio 2022-01-27 18:26:08 -06:00
terrafrost
decbde4f5d SSH2: rsa-sha2-256 and rsa-sha2-512 sigs weren't verifying 2022-01-27 05:51:06 -06:00
Jack Worman
7c000843ab Corrected many @return annotations in phpseclib/Net
Corrected many @return annotations in phpseclib/Net
2022-01-23 11:00:41 -06:00
terrafrost
602760c5d8 SSH2: CS change for 3.0 branch 2022-01-14 18:32:23 -06:00
terrafrost
d359543fe7 Merge branch '2.0' into 3.0 2022-01-14 18:31:48 -06:00
terrafrost
89482747a6 Merge branch '0.0' into 2.0 2022-01-14 18:31:37 -06:00
terrafrost
dac83d206e SSH2: fix pre-PHP 5.4 syntax error 2022-01-14 18:31:19 -06:00
terrafrost
ddfb217855 Merge branch '1.0' into 3.0 2022-01-08 19:51:35 -06:00
terrafrost
676b099789 Merge branch '1.0' into 2.0 2022-01-08 19:50:36 -06:00
PetrP
888867e7b6 SFTP: fix chgrp() for version < 4
$uid and $gid were flipped with dbfc762257
2022-01-08 19:50:22 -06:00
Michael Käfer
d71522d8aa Remove define() from SSH2 and use class constants instead (3.0 branch) 2021-12-14 16:34:41 +01:00
Michael Käfer
624f328c88 Remove define() from SSH2 and use class constants instead 2021-12-14 13:18:33 +01:00
terrafrost
072a56b2f9 SSH2: allow for stringable objects 2021-12-07 22:20:55 -06:00
terrafrost
20b9abf589 SSH2: show a more helpful error message when logging in with pubkey 2021-12-07 22:10:29 -06:00
terrafrost
6a935bb57b Merge branch '2.0' into 3.0 2021-12-07 21:59:47 -06:00
terrafrost
a74707e080 SSH2: make login() return false if no valid auth methods are found
this is an issue if you, for example, login with a PublicKey instead of a PrivateKey
2021-12-07 21:59:24 -06:00
terrafrost
e9fbf9ed8a Merge branch '1.0' into 2.0 2021-12-07 21:58:21 -06:00
terrafrost
649661cd5e SSH2: make login() return false if no valid auth methods are found 2021-12-07 21:57:55 -06:00
terrafrost
014b3a95a1 Merge branch '2.0' into 3.0 2021-11-11 19:51:26 -06:00
terrafrost
ecd08ffc52 Merge branch '1.0' into 2.0 2021-11-11 19:51:19 -06:00
terrafrost
40035dc59c SFTP: don't attempt to parse unsupported attributes 2021-11-11 19:50:52 -06:00
terrafrost
779e11e496 SSH2: use exceptions rather than user_error 2021-11-11 19:39:49 -06:00
terrafrost
15263f0c9c Merge branch '1.0' into 3.0 2021-11-11 19:38:52 -06:00
terrafrost
cee791820c Merge branch '1.0' into 2.0 2021-11-11 19:17:17 -06:00
terrafrost
fe4dc433cc SSH2: error out when no data is received from the server 2021-11-11 19:06:18 -06:00
terrafrost
17e79d9341 Merge branch '2.0' into 3.0 2021-11-08 06:44:55 -06:00
terrafrost
f92a58c83c SFTP: getSupportedVersions() call didn't work 2021-11-08 06:44:36 -06:00
terrafrost
a0405d4816 Merge branch '2.0' into 3.0 2021-11-03 22:28:16 -05:00
terrafrost
9fb26d478a Merge branch '1.0' into 2.0 2021-11-03 22:16:57 -05:00
terrafrost
29c8591cb2 SSH2: add "smart multi factor" login mode (enabled by default) 2021-11-03 22:16:14 -05:00
terrafrost
878526d7c9 SSH2: CS adjustments 2021-10-30 18:16:23 -05:00
terrafrost
13b9663ac6 Merge branch '1.0' into 3.0 2021-10-30 18:15:28 -05:00
terrafrost
895cf85dff Merge branch '0.0' into 2.0 2021-10-30 18:04:25 -05:00
vgogolin
1a942620b3 Backward compatibility with old PHP versions
Fix for PHP Parse error:  syntax error, unexpected '[' in /vendor/phpseclib/phpseclib/phpseclib/Net/SSH2.php on line 3558
2021-10-30 18:04:19 -05:00
terrafrost
7a739d75fe Merge branch '2.0' into 3.0 2021-10-26 20:48:46 -05:00
terrafrost
2de84fba24 Merge branch '1.0' into 2.0 2021-10-26 20:14:31 -05:00
terrafrost
da6c1b06bf SSH2: add support for zlib and zlib@openssh.com compression 2021-10-26 20:04:53 -05:00
Christopher Davis
24150b26f6 Don't Use Array Unpackage for Status Code -> Error
the `status_codes` property is an array with integer keys and string
values, but the `$error` value in `SFTP::logError` was trying to be unpacked
from an array.

Seems to come from cee3f3cd4a, but even at
that commit the `status_codes` data structure was still an array.

This bug is only present in 3.X, 2.X release didn't unpack here:
a684f12065/phpseclib/Net/SFTP.php (L829)
2021-10-13 19:58:27 -05:00
terrafrost
a2c30f9d33 Merge branch '2.0' into 3.0 2021-10-11 09:15:37 -05:00
terrafrost
eacb9f8614 Merge branch '1.0' into 2.0 2021-10-11 09:02:22 -05:00
terrafrost
74f1c9ed7b SSH2: CS adjustments 2021-10-11 08:58:43 -05:00
terrafrost
9a61525f44 SSH2: rm unnecessary code 2021-10-11 08:53:21 -05:00
terrafrost
0fe328936c SSH2: implement a different fix for #1613 2021-10-11 08:47:51 -05:00
terrafrost
2564032e6f Merge branch '2.0' into 3.0 2021-10-09 13:32:07 -05:00
terrafrost
2f3ca7123d SSH2: fix channel constant 2021-10-09 13:31:14 -05:00
terrafrost
b3e39538b8 Merge branch '2.0' into 3.0 2021-10-09 13:27:40 -05:00
terrafrost
7b2097c6bd Merge branch '1.0' into 2.0 2021-10-09 13:24:22 -05:00
terrafrost
1fab947f01 SSH2: fixes for noisy channels 2021-10-09 13:21:09 -05:00
terrafrost
644af71b6c SSH2: readd public for 3.0 branch 2021-10-09 13:00:30 -05:00
terrafrost
025b8beb8f Merge branch '2.0' into 3.0 2021-10-09 13:00:03 -05:00
terrafrost
fe6e2b9bfe Merge branch '1.0' into 2.0 2021-10-09 12:59:56 -05:00
terrafrost
b29f134c24 SSH2: CS adjustments 2021-10-09 12:59:48 -05:00
terrafrost
f25f8c0db8 Merge branch '1.0' into 2.0 2021-10-09 08:26:29 -05:00
terrafrost
8d4831ad1f SFTP: CS adjustments 2021-10-09 08:26:11 -05:00
terrafrost
cd80f98788 Merge branch '2.0' into 3.0 2021-10-09 07:51:17 -05:00
terrafrost
7c14eedbfd Merge branch '1.0' into 2.0 2021-10-09 07:50:36 -05:00
terrafrost
e4d2416bdc SSH2: SSH-2.0-CoreFTP is 15 bytes long - not 13 2021-10-09 07:50:10 -05:00
terrafrost
a09eb04296
Merge pull request #1695 from terrafrost/sftpv456
add SFTP v4/5/6 support to phpseclib v1
2021-09-28 20:39:18 -05:00
terrafrost
defd5d23b1 fix bad merge 2021-09-18 10:35:21 -05:00
terrafrost
0dbbeb39ce Merge branch 'sftpv455-2.0' into sftpv456-3.0 2021-09-16 16:24:11 -05:00
terrafrost
367fede9c0 rm double _precheck from rename() 2021-09-15 20:23:31 -05:00
terrafrost
658cacce9f Merge branch 'sftpv456' into sftpv456-2.0 2021-09-15 20:22:35 -05:00
terrafrost
f6ae13a092 fixes for setting atime and mtime 2021-09-15 08:33:31 -05:00
terrafrost
d48bdde5c6 update comment 2021-09-14 20:34:30 -05:00
terrafrost
a64103a386 attr wasn't defined 2021-09-14 20:33:11 -05:00
terrafrost
4769de45f0 comment is no longer valid 2021-09-14 09:11:53 -05:00
terrafrost
bb17b35d3e preferentially use SFTPv3, since that's waaaay more tested than any other version 2021-09-14 09:05:41 -05:00
terrafrost
9ae2b0030d SFTP: update get(), put() and touch() 2021-09-13 09:08:48 -05:00
terrafrost
5fcba4627f update rename 2021-09-11 21:24:43 -05:00
terrafrost
6303fbac9e fix OpenSSH detection 2021-09-09 05:39:20 -05:00
terrafrost
ced7dab1d5 update symlink 2021-09-08 09:34:16 -05:00
terrafrost
41b5f7cfe9 tweak version management stuff 2021-08-29 13:11:26 -05:00
terrafrost
42b4ab065b typo 2021-08-29 13:04:32 -05:00
terrafrost
4102bbaccc add precheck in a few more places 2021-08-29 13:02:09 -05:00
terrafrost
19e7737ead fix _precheck 2021-08-29 13:00:21 -05:00
terrafrost
c9e4944370 pwd didn't work if called first 2021-08-27 21:57:38 -05:00
terrafrost
a25d3a75d3 fix pre-php-5.4 syntax error 2021-08-27 12:40:38 -05:00
terrafrost
69dba39bc9 update chown / chgrp if stmt 2021-08-26 20:18:27 -05:00
terrafrost
dbfc762257 update chown and chgrp to wor with sftpv4+ 2021-08-26 18:26:57 -05:00
terrafrost
1f1e2794c7 add attribute reading for sftpv6 2021-08-26 09:23:33 -05:00
terrafrost
1b90375231 Merge branch '2.0' into 3.0 2021-08-24 20:24:50 -05:00
terrafrost
f02f0005b4 Merge branch '1.0' into 2.0 2021-08-24 20:22:54 -05:00
terrafrost
fc40727cfb SFTP: add disableArbitraryLengthPackets() 2021-08-24 20:22:29 -05:00
terrafrost
9db03e1536 Merge branch '2.0' into 3.0 2021-08-24 20:20:20 -05:00
terrafrost
ea4b75f165 Merge branch '0.0' into 2.0 2021-08-24 20:19:18 -05:00
Nick Lassonde
20500123e5 add option to allow arbitrary length packets, for servers like OpenText which sends extremely long directory listings 2021-08-24 20:18:52 -05:00
terrafrost
f56158e73f add attribute reading for sftpv5 2021-08-01 23:16:31 -05:00
terrafrost
092bad12c5 add attribute reading for sftpv4 2021-07-31 15:38:21 -05:00
terrafrost
4cb6bcb75e add setPreferredVersion() and other changes 2021-07-31 13:00:52 -05:00
terrafrost
a19c6ab7e6 Merge branch '1.0' into 3.0 2021-07-28 21:00:24 -05:00
terrafrost
c08afba575 Merge branch '1.0' into 2.0 2021-07-28 20:34:13 -05:00
terrafrost
0ec9d2bdf1 SFTP: CS adjustments 2021-07-28 20:33:52 -05:00
terrafrost
b0fe99b792 Merge branch '1.0' into 2.0 2021-07-28 20:01:26 -05:00
Nick Lassonde
dab514faff timeout in _get_channel_packet during _init_sftp_connection should be a failure 2021-07-28 20:01:19 -05:00
terrafrost
8186db7533 SFTP: get_channel_packet throws exceptions in 3.0 2021-07-05 08:35:39 -05:00
terrafrost
926d3545a2 Merge branch '2.0' into 3.0 2021-07-05 08:34:36 -05:00
terrafrost
6b0f0b4896 Merge branch '1.0' into 2.0 2021-07-05 08:34:18 -05:00
terrafrost
a02526e5e0 SFTP: return false if get_channel_packet returns false 2021-07-05 08:33:42 -05:00
terrafrost
bf88ba4382 incremental commit 2021-06-25 11:29:03 -05:00
terrafrost
fceb5b47da SFTP: CS adjustments 2021-06-19 11:30:03 -05:00