danog/phpseclib
1
0
Fork 0
mirror of https://github.com/danog/phpseclib.git synced 2024-12-11 16:49:42 +01:00
Code Issues Projects Releases Wiki Activity
4,462 Commits 6 Branches 31 Tags 19 MiB
8568af7f9b
Commit Graph

156 Commits

Author SHA1 Message Date
Sokolovskyy Roman
966ee7f170 Long array() to short [] syntax 2017-11-27 09:30:14 +01:00
terrafrost
8d16642469 Merge branch 'ssh2-fix-multi-channel-2.0' into ssh2-fix-multi-channel-master 2017-09-06 00:28:25 -05:00
terrafrost
74d3a51183 Merge branch 'ssh2-fix-multi-channel-1.0' into ssh2-fix-multi-channel-2.0 2017-09-06 00:27:52 -05:00
terrafrost
ed3846a7a2 Tests/SSH2: add unit test for #1167 2017-09-06 00:27:07 -05:00
terrafrost
2d226b057c Merge branch '2.0' 2017-05-28 09:11:06 -05:00
terrafrost
5e2afe3a73 Merge branch '1.0' into 2.0 2017-05-28 09:10:58 -05:00
terrafrost
9bccc01b97 Tests/SSH2: add unit test for #1009 2017-05-28 08:58:00 -05:00
terrafrost
3c1985a619 Merge branch '2.0' 2016-07-10 12:56:12 -05:00
terrafrost
97f0b37bd5 Merge branch '1.0' into 2.0 2016-07-10 12:55:56 -05:00
terrafrost
8530cbca1a Tests/SFTP: demo "Expected SSH_FXP_STATUS or ..." error 2016-06-29 00:18:35 -05:00
terrafrost
43d68c6619 Merge branch '2.0' 2016-05-06 12:23:35 -05:00
terrafrost
700338beed Merge branch '1.0' into 2.0 2016-05-06 11:58:07 -05:00
terrafrost
e762b0dc29 SFTP: add is_writable, is_writeable and is_readable 2016-05-05 16:41:15 -05:00
terrafrost
398a795e1f Revert "undo merging of master to 2.0 branch" 
This reverts commit 8fb4c3363d.
 2016-04-30 16:23:35 -05:00
terrafrost
8fb4c3363d undo merging of master to 2.0 branch 2016-04-28 15:34:10 -05:00
terrafrost
b4cf10fc94 Revert "Merge branch '2.0'" 
This reverts commit be5f4ef6b19c82f6c898708cc8e1828b05e3d4e8, reversing
changes made to 638fe6971c.
 2016-04-10 11:30:59 -05:00
terrafrost
4b69dcb1ca Revert "Merge remote-tracking branch 'bantu/bootstrap'" 
This reverts commit ef04c870e9, reversing
changes made to cd57bf31ae.
 2016-04-10 11:25:31 -05:00
terrafrost
94fdbba2aa Merge branch '2.0' 2015-12-23 23:42:23 -06:00
terrafrost
001ad99d73 Merge branch '1.0' into 2.0 2015-12-23 23:32:20 -06:00
terrafrost
1be0ac9f7f SFTP/Stream: fix issue with filenames with hash in them 2015-12-23 13:13:06 -06:00
terrafrost
d17aeffc04 Merge branch 'authenticated-1.0' into authenticated-2.0 2015-12-16 09:20:27 -06:00
terrafrost
57063f3604 SSH2: add isAuthenticated() method 2015-12-15 23:19:05 -06:00
Andreas Fischer
a88047f242 Merge branch '2.0' 
* 2.0:
  Add test case for GitHub Issue 850: Realpath in SFTP chmod().
  Fixed a bug in SFTP::chmod not using realpath on the filepath
 2015-10-19 00:19:08 +02:00
Andreas Fischer
1cf70d27e8 Merge branch '1.0' into 2.0 
* 1.0:
  Add test case for GitHub Issue 850: Realpath in SFTP chmod().
  Fixed a bug in SFTP::chmod not using realpath on the filepath
 2015-10-19 00:19:07 +02:00
Andreas Fischer
579e51c58f Add test case for GitHub Issue 850: Realpath in SFTP chmod(). 2015-10-19 00:07:55 +02:00
Andreas Fischer
0ba1a04c05 Merge branch '2.0' 
* 2.0:
  SFTP: don't start in local file middle when uploading to middle of the remote file
  Tests/SFTP: updates to newly added unit test
  SFTP: backport DavidAnderson684's changes to 1.0 branch
  add unit test demo'ing issue # 830
 2015-09-30 17:28:03 +02:00
terrafrost
0f49fb86bf Merge branch 'sftp-endless-loop' into sftp-endless-loop-v2 
Conflicts:
	phpseclib/Net/SFTP.php
	tests/Functional/Net/SFTPUserStoryTest.php
 2015-09-29 21:51:20 -05:00
terrafrost
6688f650f1 SFTP: don't start in local file middle when uploading to middle of 
the remote file
 2015-09-29 21:39:35 -05:00
terrafrost
26ddf02fee Merge branch 'sftp-endless-loop' into sftp-endless-loop-v2 
Conflicts:
	phpseclib/Net/SFTP.php
 2015-09-28 09:20:38 -05:00
terrafrost
759e04f08e Tests/SFTP: updates to newly added unit test 2015-09-27 10:57:41 -05:00
terrafrost
23db2f7be3 add unit test demo'ing issue # 830 2015-09-27 10:54:08 -05:00
Andreas Fischer
3342eb6d09 Merge branch '2.0' 
* 2.0:
  Fixed another case
  Minor tweaks
  Fixed error
  More fixes
  PHPDoc fixes
 2015-09-14 01:27:11 +02:00
Andreas Fischer
4387b64426 Merge branch '1.0' into 2.0 
* 1.0:
  Fixed another case
  Minor tweaks
  Fixed error
  More fixes
  PHPDoc fixes

Conflicts:
	phpseclib/Crypt/Random.php
	phpseclib/Math/BigInteger.php
	phpseclib/Net/SSH2.php
	tests/Functional/Net/SFTPUserStoryTest.php
 2015-09-14 01:27:04 +02:00
Graham Campbell
eec8c9cb5d More fixes 2015-09-06 12:39:14 +01:00
Dmitry Balabka
70dd67c4d9 Connection reuse refactoring to rid of globals 2015-09-01 21:50:30 +03:00
terrafrost
4d086bee86 Merge branch 'ssh-custom-socket-1.0' into ssh-custom-socket-2.0 
Conflicts:
	phpseclib/Net/SSH2.php
 2015-07-17 12:43:50 -05:00
terrafrost
33a97391bc SSH2: make it so you can connect using open sockets 2015-07-17 12:30:44 -05:00
Andreas Fischer
d9e9504fba Merge branch 'PSR2-1.0' into PSR2-2.0 
* PSR2-1.0:
  Fix indentation phpcbf did not fix.
  Remove PSR2.Methods.FunctionCallSignature.SpaceAfterOpenBracket exception.
  Use phpcbf to fix PHP code to ruleset.
  Ignore coding guidelines in ANSI switch block.
  Base code sniffer ruleset on PSR2 rather than PEAR.
  Update PHP Code Sniffer to 2.3.3

Conflicts:
	build/code-sniffer-ruleset-tests.xml
	build/code-sniffer-ruleset.xml
	composer.lock
	phpseclib/Crypt/DES.php
	phpseclib/Crypt/Hash.php
	phpseclib/Crypt/RSA.php
	phpseclib/File/X509.php
	phpseclib/Math/BigInteger.php
	phpseclib/Net/SFTP.php
	phpseclib/Net/SSH1.php
	phpseclib/Net/SSH2.php
	tests/Functional/Net/SFTPUserStoryTest.php
	tests/Unit/Crypt/TwofishTest.php
 2015-07-17 13:41:59 +02:00
Andreas Fischer
2013a31ecd Use phpcbf to fix PHP code to ruleset. 2015-07-17 12:57:41 +02:00
Andreas Fischer
4b5cc0c286 Merge branch '1.0' into 2.0 
* 1.0:
  SFTP: stat cache updates
 2015-07-17 12:45:42 +02:00
terrafrost
862b63e9e5 SFTP: stat cache updates 2015-07-17 12:34:56 +02:00
Andreas Fischer
83cac3385b Merge branch '1.0' into 2.0 
* 1.0:
  SFTP: update how recursive delete's update stat cache
  Tests/SFTP: add unit test
 2015-07-06 23:38:10 +02:00
Andreas Fischer
643103449c Merge pull request #731 from terrafrost/sftp-recur-delete-stat-cache-1.0 
SFTP: delete stat cache for recursive deletes / 1.0 branch

* terrafrost/sftp-recur-delete-stat-cache-1.0:
  SFTP: update how recursive delete's update stat cache
  Tests/SFTP: add unit test
 2015-07-06 23:37:55 +02:00
terrafrost
52aeb2ea3f Tests/SFTP: add unit test 2015-07-04 12:57:50 -05:00
Andreas Fischer
727677d4e1 Merge pull request #713 from bantu/SFTPStreamTest 
[1.0] Various fixes to fopen mode handling in SFTP Stream

* bantu/SFTPStreamTest:
  Explicitly set size to 0 when creating or truncating.
  mode[0] of 'c' is not supposed to truncate.
  Need to create the file when it does not exist and mode[0] is not 'r'.
  Add SFTPStreamTest::testFopenFcloseCreatesFile()
 2015-07-04 14:28:06 +02:00
Andreas Fischer
ba46db1758 Merge pull request #713 from bantu/SFTPStreamTest 
Various fixes to fopen mode handling in SFTP Stream

* bantu/SFTPStreamTest:
  Explicitly set size to 0 when creating or truncating.
  mode[0] of 'c' is not supposed to truncate.
  Need to create the file when it does not exist and mode[0] is not 'r'.
  Add SFTPStreamTest::testFopenFcloseCreatesFile()

Conflicts:
	tests/Functional/Net/SFTPLargeFileTest.php
 2015-07-04 01:18:19 +02:00
Andreas Fischer
e1dd7e9d69 Merge branch '1.0' into 2.0 
* 1.0:
  Tests/SFTP: $lstat->$stat
  Tests/SFTP: just check to see that stat / lstat return an array
  SFTP: update conditions under which cache for lstat / . is used
  Tests/SFTP: add test for stat's on .
 2015-06-27 21:59:45 +02:00
terrafrost
fb3bd8adff Tests/SFTP: $lstat->$stat 2015-06-27 07:56:47 -05:00
terrafrost
df65acb999 Tests/SFTP: just check to see that stat / lstat return an array 2015-06-27 07:43:35 -05:00
terrafrost
26818ebb40 Tests/SFTP: add test for stat's on . 2015-06-26 22:25:22 -05:00
Andreas Fischer
01f547ba17 Add SFTPStreamTest::testFopenFcloseCreatesFile() 2015-06-25 14:05:18 +02:00
terrafrost
4d82df3fc7 Merge branch 'stat-cache-fix-1.0' into stat-cache-fix-2.0 
Conflicts:
	tests/Functional/Net/SFTPUserStoryTest.php
 2015-06-20 19:59:48 -05:00
terrafrost
6bc3513914 SFTP: stat cache updates 2015-06-20 19:33:19 -05:00
terrafrost
36ef1c4084 Merge remote-tracking branch 'audrey/sftp-put-callback' into 2.0 2015-04-16 07:45:39 -05:00
terrafrost
1d772c3a6f Merge remote-tracking branch 'audrey/sftp-put-callback-for-1.0' into 1.0 2015-04-16 07:45:24 -05:00
terrafrost
d00e20a140 Merge remote-tracking branch 'graham/1.0-phpdoc' into 2.0-phpdoc 
Conflicts:
	phpseclib/Crypt/Base.php
	phpseclib/Net/SCP.php
	tests/Unit/File/ASN1Test.php
 2015-04-16 00:42:53 -05:00
terrafrost
9f626c67b6 Merge remote-tracking branch 'graham/1.0-phpdoc' into 1.0-phpdoc 2015-04-16 00:31:54 -05:00
andrey012
16430d4d2e support for callback function for SFTP::put function - in order to pipe data directly to remote server without putting it into file or keeping in memory. This can be useful particularly for dumping big databases directly to remote server. 2015-04-15 03:29:01 +03:00
Andrey Grinenko
e58427221d support for callback function for SFTP::put function - in order to pipe data directly to remote server without putting it into file or keeping in memory. This can be useful particularly for dumping big databases directly to remote server. 2015-04-09 02:59:00 +03:00
terrafrost
e510dc878b Merge branch '1.0' of https://github.com/phpseclib/phpseclib into openssl-support 
Conflicts:
	phpseclib/Net/SSH2.php
 2015-04-02 05:40:14 -05:00
terrafrost
023fef8d8b Merge branch '2.0' of https://github.com/phpseclib/phpseclib into openssl-support-2.0 
Conflicts:
	phpseclib/Net/SSH2.php
 2015-04-02 05:37:04 -05:00
terrafrost
ebcb3130b7 Merge branch 'openssl-support' into 2.0 
Conflicts:
	phpseclib/Crypt/AES.php
	phpseclib/Crypt/Base.php
	phpseclib/Crypt/Blowfish.php
	phpseclib/Crypt/DES.php
	phpseclib/Crypt/RC2.php
	phpseclib/Crypt/RC4.php
	phpseclib/Crypt/Rijndael.php
	phpseclib/Crypt/TripleDES.php
	phpseclib/Crypt/Twofish.php
	phpseclib/Net/SSH2.php
	tests/Functional/Net/SFTPLargeFileTest.php
	tests/Unit/Crypt/AES/InternalTest.php
	tests/Unit/Crypt/AES/McryptTest.php
	tests/Unit/Crypt/AES/TestCase.php
 2015-04-02 05:32:31 -05:00
Graham Campbell
e50cbacd4e Fixed some phpdocs 2015-03-29 17:07:17 +01:00
terrafrost
a8e702b34f Merge branch 'agentforwarding-1.0' into agentforwarding-2.0 
Conflicts:
	phpseclib/Net/SSH2.php
	phpseclib/System/SSH/Agent.php
 2015-03-29 10:32:30 -05:00
terrafrost
bb01002233 Merge remote-tracking branch 'agentforwarding/feature/ssh_agent_forwarding' into agentforwarding-1.0 2015-03-28 21:03:17 -05:00
montdidier
25b328c440 removed stopSSHForwarding 2015-02-05 13:19:57 +08:00
terrafrost
1dd1c65bfd Merge branch 'master' into openssl-support 2015-01-29 23:00:59 -06:00
Andreas Fischer
257d44331e Merge branch 'master' into php5 
* master:
  .scrutinizer.yml: Use large timeout to prevent coverage receiver from timing out.
  Reenable SSH Functional Tests on Travis CI (PHP 5.3.3 and below).
 2015-01-28 23:03:31 +01:00
Andreas Fischer
f908040d20 Reenable SSH Functional Tests on Travis CI (PHP 5.3.3 and below). 2015-01-28 13:37:21 +01:00
montdidier
8571d0c6d7 determining what failure to expect 2015-01-13 09:52:01 +08:00
montdidier
dd0b3e6bd5 addresses low hanging fruit comments from terrafrost and bantu 2015-01-12 17:13:33 +08:00
montdidier
aca4ba3286 SSH agent forwarding implementation 2014-12-30 10:44:31 +08:00
Clint Nelissen
fe742e18d7 Namespaced Crypt Package 2014-12-16 16:16:54 -08:00
Clint Nelissen
c1f647c77d Rebased 2014-12-15 14:33:25 -08:00
Clint Nelissen
794fcb7ee8 Updated unit tests 2014-12-15 14:29:34 -08:00
Clint Nelissen
628949fb73 Namespaced classes 2014-12-15 14:29:20 -08:00
Clint Nelissen
fddf20f89c Namespaced classes 2014-12-15 09:25:46 -08:00
terrafrost
7e2d0147b6 Tests: don't set CRYPT_MODE_CIPHER to CRYPT_MODE_MCRYPT 2014-12-13 14:17:10 -06:00
Andreas Fischer
30ef0e164f Merge branch 'master' into php5 
* master:
  Properly skip SFTPLargeFileTest when environment variables not defined.
 2014-12-12 22:22:23 +01:00
Andreas Fischer
f1865af505 Properly skip SFTPLargeFileTest when environment variables not defined. 2014-12-12 19:38:04 +01:00
Andreas Fischer
e0f8892521 Make SFTPLargeFileTest compatible with php5 branch. 2014-12-12 17:46:43 +01:00
Andreas Fischer
ca4bcc180e SFTP: Add test for put() from local file. 2014-12-12 17:09:55 +01:00
Andreas Fischer
6d42873b87 Merge pull request #552 from bantu/ssh2-agent-login-test 
SSH2 Agent Login Test

* bantu/ssh2-agent-login-test:
  Setup SSH key and agent for travis user.
  Add a functional test case for SSH2 login using Agent.
 2014-12-12 12:48:21 +01:00
Andreas Fischer
ce2c7c7591 Allow SCP test to run on 5.2 by not depending on GMP, but also allowing bcmath. 2014-12-12 11:59:51 +01:00
Andreas Fischer
9672b31af0 Add a functional test case for SSH2 login using Agent. 2014-12-10 00:27:53 +01:00
Andreas Fischer
0efae5a91e Change copyright years from roman numeral to decimal numbers. 2014-12-10 00:04:08 +01:00
Andreas Fischer
51ea6255c8 SCP: Allow for null byte in tests as long as #146 is under investigation. 2014-12-09 13:21:59 +01:00
Andreas Fischer
494e0d68eb Some SCP tests. 2014-12-09 13:21:59 +01:00
Andreas Fischer
6182a64394 SFTP: Add truncate() to size() test for files larger than 4 GiB. 2014-10-19 20:52:40 +02:00
terrafrost
e48ee12940 SFTP: make it so files can be downloaded into resources or upload 
from resources
 2014-08-16 12:49:55 -05:00
Andreas Fischer
d614274ed2 Add a few SSH2 preLogin tests. 2014-07-21 23:58:17 +02:00
Andreas Fischer
7dd01c6103 Put some assertions into testStatcacheFix(). 2014-07-19 00:28:39 +02:00
terrafrost
41ae2fb130 SFTP: return $sftp object in new unit test method 2014-07-17 11:35:58 -05:00
terrafrost
6202d2c3ed SFTP: add unit test for stat cache fix 2014-07-17 11:22:59 -05:00
terrafrost
03c315d546 SFTP: return $sftp object in unit tests 2014-06-19 23:57:32 -05:00
terrafrost
05baf7b73b SFTP: fix unit test 2014-06-19 13:57:42 -05:00
terrafrost
366410e2e1 SFTP: syntax error in unit test 2014-06-19 10:42:20 -05:00
terrafrost
f95bf8b10b SFTP: add unit tests for symlinks 2014-06-19 09:00:23 -05:00
terrafrost
2e06a14a8a SSH2: rm redundant part of SSH2 unit test 2014-06-16 23:58:00 -05:00
terrafrost
bbce7c4762 SSH2: add unit test for getServerPublicHostKey 2014-06-16 18:54:26 -05:00