Commit Graph

1584 Commits

Author SHA1 Message Date
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
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