danog/tgseclib
1
0
Fork 0
mirror of https://github.com/danog/tgseclib.git synced 2024-12-03 18:17:49 +01:00
Code Issues Projects Releases Wiki Activity
2,306 Commits 1 Branch 21 Tags 11 MiB
e74841477f
Commit Graph

230 Commits

Author SHA1 Message Date
David Anderson
e9b698fd65 Add callback to SFTP.php 
Currently, Net_SCP::put() has a callback parameter, allowing the consumer to monitor/log/report progress (or whatever they please).

This patch adds the same feature, working in the same way, to Net_SFTP::put()
 2014-12-27 13:55:00 +00:00
Clint Nelissen
628949fb73 Namespaced classes 2014-12-15 14:29:20 -08:00
Andreas Fischer
c4b103468c Merge pull request #549 from bantu/fix-547 
Change copyright years from roman numeral to decimal numbers.

* bantu/fix-547:
  Change copyright years from roman numeral to decimal numbers.

Conflicts:
	phpseclib/System/SSH_Agent.php
 2014-12-10 00:06:08 +01:00
Andreas Fischer
0efae5a91e Change copyright years from roman numeral to decimal numbers. 2014-12-10 00:04:08 +01:00
Clint Nelissen
99b9cc477d Moved global constants to class constants 2014-12-04 13:45:13 -08:00
Andreas Fischer
638e62d60a Remove LICENSE text from source code files. 2014-12-03 18:49:33 +01:00
Andreas Fischer
8af52e2954 Merge branch 'master' into php5 
* master:
  SFTP: Use hexdec() and bin2hex() for filesize calculation.
 2014-10-19 21:32:23 +02:00
Andreas Fischer
5c3058cc4b SFTP: Use hexdec() and bin2hex() for filesize calculation. 2014-10-19 21:07:12 +02:00
Andreas Fischer
45ce4b24ef Merge branch 'master' into php5 
* master:
  SFTP: Replace incorrect comment about filesize. There is no 4 GiB limit.

Conflicts:
	phpseclib/Net/SFTP.php
 2014-10-19 20:54:50 +02:00
Andreas Fischer
5b932495cc SFTP: Replace incorrect comment about filesize. There is no 4 GiB limit. 2014-10-15 17:27:48 +02:00
Andreas Fischer
e682e20df4 Merge branch 'master' into php5 
* master:
  Correct constant: NET_SFTP_BLOCK_DEVICE -> NET_SFTP_TYPE_BLOCK_DEVICE
 2014-10-09 23:51:33 +02:00
Andreas Fischer
ce3cf60b10 Correct constant: NET_SFTP_BLOCK_DEVICE -> NET_SFTP_TYPE_BLOCK_DEVICE 2014-10-09 23:24:30 +02:00
Andreas Fischer
645c16d0f5 Merge branch 'master' into php5 
* master:
  Fix Net_SFTP::filetype() block device recognition.
 2014-10-09 23:19:23 +02:00
Vladimir Volodko
6715c41e1f Fix Net_SFTP::filetype() block device recognition. 2014-10-09 12:46:58 +07:00
Andreas Fischer
a15079676c Merge branch 'master' into php5 
* master:
  SFTP: cs adjustment
  SFTP: optimize conditional calls to fclose in get() method
  SFTP: grammar
  SFTP: fix issue with uploading via a resource
  SFTP: make it so files can be downloaded into resources or upload   from resources
 2014-08-19 22:25:07 +02:00
terrafrost
74feca9cf2 SFTP: cs adjustment 2014-08-19 14:20:20 -05:00
terrafrost
cb66c561c2 SFTP: optimize conditional calls to fclose in get() method 2014-08-19 14:05:24 -05:00
terrafrost
29e0143308 SFTP: grammar 2014-08-16 15:49:38 -05:00
terrafrost
7ed53f2428 SFTP: fix issue with uploading via a resource 2014-08-16 13:56:34 -05: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
bb1c36893f Merge branch 'master' into php5 
* master:
  Do not check filename over and over again, remove '.' and '..' from the map instead.
 2014-07-24 17:32:38 +02:00
Andreas Fischer
880bc9d9e6 Merge pull request #420 from bantu/sftp-skip-current-dir-by-removal 
SFTP: Do not check filename over and over again, remove '.' and '..' from the map instead.

* bantu/sftp-skip-current-dir-by-removal:
  Do not check filename over and over again, remove '.' and '..' from the map instead.
 2014-07-24 17:32:38 +02:00
Andreas Fischer
8862b3c97a Merge branch 'master' into php5 
* master:
  Only fclose($fp) when $mode & NET_SFTP_LOCAL_FILE.
 2014-07-24 17:04:25 +02:00
Andreas Fischer
48a2613cde Merge pull request #421 from bantu/issue/418 
SFTP: Only fclose($fp) when $mode & NET_SFTP_LOCAL_FILE.

* bantu/issue/418:
  Only fclose($fp) when $mode & NET_SFTP_LOCAL_FILE.
 2014-07-24 17:04:24 +02:00
Andreas Fischer
47695777f8 Merge branch 'master' into php5 
* master:
  Net_SFTP::_list() only takes two parameters.
 2014-07-24 17:02:47 +02:00
Andreas Fischer
952d2166bf Net_SFTP::_list() only takes two parameters. 2014-07-24 11:09:37 +02:00
Andreas Fischer
695d1e9038 Only fclose($fp) when $mode & NET_SFTP_LOCAL_FILE. 2014-07-24 11:06:24 +02:00
Andreas Fischer
84a9a300d4 Do not check filename over and over again, remove '.' and '..' from the map instead. 2014-07-24 11:00:55 +02:00
Andreas Fischer
d29ad3afa9 Merge branch 'master' into php5 
* master:
  SFTP: stat cache fixes
  SFTP: return $sftp object in new unit test method
  SFTP: add unit test for stat cache fix
 2014-07-20 21:41:51 +02:00
terrafrost
a84861bb52 SFTP: stat cache fixes 2014-07-19 21:31:58 -05:00
Andreas Fischer
8e0b9b2d64 Merge branch 'master' into php5 
* master:
  SFTP: fix an issue with the stat cache
  README: update download link to latest version
 2014-07-12 12:08:36 +02:00
terrafrost
fe7fd97b59 SFTP: fix an issue with the stat cache 2014-07-11 12:14:26 -05:00
Andreas Fischer
510d5e1778 Merge branch 'master' into php5 
* master:
  SFTP: return $sftp object in unit tests
  SFTP: fix unit test
  SFTP: syntax error in unit test
  SFTP: add unit tests for symlinks
  SFTP: add readlink and symlink functions
 2014-06-23 16:37:56 +02:00
terrafrost
a65b820b54 SFTP: add readlink and symlink functions 2014-06-18 11:34:50 -05:00
Andreas Fischer
67aedc240b Change constructors from class name to __construct(). 
This has been produced as follows:
<?php
$replace = $files = [];
$it = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($argv[1]));
foreach ($it as $fileinfo) {
    if ($fileinfo->getExtension() === 'php') {
        $file = $fileinfo->getPathname();
        $content = file_get_contents($file);
        $files[$file] = $content;
        $tokens = token_get_all($content);
        foreach ($tokens as $key => $value) {
            if ($value[0] === T_CLASS) {
                $class = $tokens[$key + 2][1];
                $replace += array(
                    "$class::$class(" => "$class::__construct(",
                    "parent::$class(" => "parent::__construct(",
                    "function $class(" => "function __construct(",
                );
            }
        }
    }
}
foreach ($files as $file => $content) {
    file_put_contents(
        $file,
        str_replace(
            array_keys($replace),
            array_values($replace),
            $content
        )
    );
}
 2014-06-16 17:06:34 +02:00
Andreas Fischer
f40bc4d3b8 Merge branch 'master' into php5 
* master:
  SFTP: update one last comment
  SFTP: update unit test comments
  SFTP: add new line to end of unit test
  SFTP: assertEquals -> assertSame
  SFTP: reset sort options every time and update unit test
  SFTP: rm whitespace
  SFTP: define $sortOptions
  SFTP: add the ability for nlist() and rawlist() to be sorted
 2014-06-09 20:19:39 +02:00
terrafrost
0e2b2a416b SFTP: reset sort options every time and update unit test 2014-06-09 09:22:30 -05:00
terrafrost
8dff207ed3 SFTP: rm whitespace 2014-06-05 15:06:50 -05:00
terrafrost
8c0f710083 SFTP: define $sortOptions 2014-06-05 10:50:13 -05:00
terrafrost
b64573f4b5 SFTP: add the ability for nlist() and rawlist() to be sorted 2014-06-05 09:56:49 -05:00
Andreas Fischer
f2f5fcd70a Update users of Math_BigInteger. 2014-06-02 20:19:00 +02:00
Andreas Fischer
e6f87318f5 Adjust documentation to coding guidelines: No () around include. 2014-06-01 23:28:49 +02:00
terrafrost
c100264b65 SFTP: NULL -> null 2014-05-26 16:32:57 -05:00
terrafrost
a7fa4cc4ff SFTP: add more stat functions 
also don't use stat cache for SFTP/Stream.php
 2014-05-26 15:39:30 -05:00
terrafrost
4d9214970b SFTP: stat cache updates 2014-05-21 10:20:36 -05:00
terrafrost
36fa9e4e48 SFTP: use_cache -> use_stat_cache 2014-05-18 15:55:12 -05:00
terrafrost
e09a6968da SFTP: switch from using file existence cache to stat cache, like PHP 
also add a few new functions - is_link and filesize
 2014-05-18 15:34:10 -05:00
terrafrost
0a0398268a SFTP: add support for recursive nlist and rawlist 2014-05-13 17:10:32 -05:00
terrafrost
77641003fa SFTP: add file_exists, is_dir and is_file functions 
also expand caching layer
 2014-05-10 19:52:38 -05:00
Andreas Fischer
fb1296bbec Drop meaningless, outdated, inconsistent version tags in doc blocks. 
find phpseclib -type f -name "*.php" -exec sed -i '/@version/d' {} \;
 2014-03-11 15:58:33 +01:00
terrafrost
466f9354df SFTP: make get() return correctly sized strings 2013-12-27 11:08:33 -06:00
Andreas Fischer
0dd5a9ba9f Merge pull request #228 from bantu/cs-whitespace 
CS: Add useful whitespace CodeSniffer rules.

* bantu/cs-whitespace:
  CS: Add useful whitespace CodeSniffer rules.
 2013-12-26 11:38:17 +01:00
Andreas Fischer
8bb80b3df0 CS: Add useful whitespace CodeSniffer rules. 2013-12-26 00:33:08 +01:00
terrafrost
172f15f5df SFTP: add explanation for use of 4294967296 2013-12-24 23:44:21 -06:00
terrafrost
0f5b3ea416 Compatibility fixes 
- PHP4 doesn't allow method chaining
- $_SESSION isn't always defined
- on PHP5.1 and earlier using 0x100000000 instead of 4294967296 gives E_NOTICE
- array('Net_SSH2', 'func_name') doesn't work so we fix this by passing $this to it.
  to make that work on PHP4 pass by call-time reference. normally this would result
  in a fatal error on PHP5.4+ but doesn't seem to in this case. the following URL
  elaborates:

  http://stackoverflow.com/q/20732563/569976
 2013-12-22 18:14:49 -06:00
Andreas Fischer
f0f029b2c1 CS: Fix "PEAR.Commenting.ClassComment.WrongTagOrder" sniff. 2013-12-11 18:33:18 +01:00
Andreas Fischer
3db1fbb072 CS: Fix "PEAR.Commenting.FileComment.TagIndent" sniff. 2013-12-10 20:10:37 +01:00
Andreas Fischer
6d1fb9f7db CS: Fix "PEAR.Files.IncludingFile.UseIncludeOnce" sniff. 2013-12-06 01:03:34 +01:00
Andreas Fischer
bc6ff96292 Fix "PEAR.Files.IncludingFile.BracketsNotRequired" sniff. 2013-12-05 23:17:40 +01:00
Andreas Fischer
e09f1b730e CodeSniffer: Fix PEAR.Classes.ClassDeclaration.OpenBraceNewLine sniff. 2013-12-03 19:34:41 +01:00
Andreas Fischer
ca9c8b107b CodeSniffer: Fix Generic.PHP.LowerCaseConstant.Found sniff. 2013-12-03 18:54:43 +01:00
Andreas Fischer
399308f98a Merge pull request #180 from mpscholten/removed-vim-comments 
Removed vim comments

* mpscholten/removed-vim-comments:
  Removed vim comments
 2013-11-23 21:16:25 +01:00
Marc Philip Scholten
3bfd884813 Removed vim comments 
Reformated files
 2013-11-23 19:42:26 +01:00
phonzie
702ade7d12 SFTP: Removed dead code 
variable: $initialize = true, ironically - is initialized but never used.
Feel free to deny if this is reserved for future implementation(s).
 2013-11-20 15:02:04 -05:00
terrafrost
fcfc0e2c00 SFTP: don't do $dir[-1] check if $dir === '' 2013-11-20 09:33:47 -06:00
Julius Beckmann
44078e5f40 Making Net_SFTP::chdir capable of handling the empty string. 
Updated patch after hint from bantu.
 2013-11-20 15:08:50 +01:00
Julius Beckmann
9ea67f9edb Making Net_SFTP::chdir capable of handling the empty string. 
Fixing a ugly notice when using the empty string as parameter for chdir:
  Notice: Uninitialized string offset: -1 in Net/SFTP.php line 617
 2013-11-20 14:49:16 +01:00
terrafrost
c6a52cb1b1 SSH2: add preliminary support for custom SSH subsystems 2013-10-25 12:35:30 -05:00
terrafrost
71743ce243 SFTP: change max sftp packet size 
1 << 20 isn't as reliable as 1 << 15 and doesn't seem to result in significant speedup either
 2013-09-12 10:16:41 -05:00
terrafrost
eb61afd22f SFTP: make "queue size" settable by a constant 2013-09-12 09:10:36 -05:00
terrafrost
ebb1d53af5 SFTP: another comment typo 2013-08-29 16:38:05 -05:00
terrafrost
69bc362a83 SFTP: update comment typo 2013-08-29 11:09:47 -05:00
terrafrost
ffca003225 SFTP: CS adjustment 2013-08-07 09:22:52 -05:00
Andreas Fischer
25a60ff9a3 SFTP: Fix syntax error "unexpected T_SL, expecting ',' or ';'". 
Regression from d95f5946eb.
 2013-07-27 15:55:48 +02:00
terrafrost
d95f5946eb SFTP: use variable sizes for get() 2013-07-26 10:20:59 -05:00
terrafrost
84093715c2 Merge pull request #129 from johnsterling/string-shift-alt 
Optimization by replacing _string_shift()
 2013-07-14 02:17:39 -07:00
terrafrost
0f96fae818 SSH2: channel handling adjustments 
- keep track of server -> client window size and look out for NET_SSH2_MSG_CHANNEL_WINDOW_ADJUST packets as appropriate
- send client -> server window size packets based on channel of received packet - not of desired channel
- buffer incoming packets based on received packets channel - not on desired channel
 2013-07-14 04:09:16 -05:00
John Sterling
5e0d58f082 SFTP: Add optimization for put() with NET_SFTP_LOCAL_FILE 
Use substr() instead of _string_shift().
 2013-07-11 17:32:49 -04:00
terrafrost
3b56c695e2 SFTP: get() didn't return data 2013-06-25 16:37:20 -05:00
terrafrost
c0fa1ee0b9 SFTP: didn't define a constant 2013-06-12 14:16:47 -05:00
terrafrost
cbe156f0cb SFTP: Update how resumes work 2013-06-11 12:49:45 -05:00
terrafrost
a83ff6cad8 SFTP: add _close_handle() function and close handle on put failure 2013-06-10 13:21:58 -05:00
terrafrost
eabd0a8963 SFTP: add the same multi-factor auth support that Net_SSH2 enjoys 2013-05-14 17:32:31 -05:00
terrafrost
cb10016291 SFTP: attempt to utilize SFTP via CLI if subsystem is unavailable 2013-05-14 17:08:54 -05:00
terrafrost
af3f275f19 SFTP: $content isn't defined when file is being written to 2013-05-14 10:43:17 -05:00
terrafrost
40af708254 Merge pull request #106 from petrich/optimizations 
Optimizations
 2013-05-14 08:35:31 -07:00
terrafrost
2ab6497e41 Merge remote-tracking branch 'origin/largerfiles' 2013-05-13 22:38:11 -05:00
terrafrost
1e2d0ccd9f SSH2: window size is server -> client, not client -> server 2013-05-13 22:37:32 -05:00
Hans-Jürgen Petrich
b242259d17 optimizations 2013-05-13 12:41:52 +07:00
terrafrost
8aada4b30d SFTP: looks like some SFTP servers will fail unless write flag is also enabled 2013-05-09 16:35:47 -05:00
terrafrost
b4ebc5b931 SFTP: fix formatting of touch open call 2013-05-09 17:27:56 -04:00
terrafrost
d2d4e89ffc SFTP: typo 2013-05-09 13:23:54 -04:00
terrafrost
2c80ac8aca SFTP: Add support for files larger than 2GB 
0x7FFFFFFF is about 2GB. To support larger files floating point is used
 2013-05-09 00:02:04 -05:00
terrafrost
63ec6e2055 SFTP: remove $start = $offset line 
$start isn't used anywhere in the function
 2013-05-08 10:20:35 -05:00
terrafrost
46f3039217 SFTP: Fix broken mkdir 
Thanks Antek88!
 2013-04-26 18:36:00 -05:00
mdesign83
2b4e940885 SFTP: Adding missing status codes 2013-04-23 16:04:50 +02:00
terrafrost
725a2e0b39 SFTP: add a few comments 2013-03-24 20:28:55 -05:00
terrafrost
89cd8f09e7 SFTP: rename variable to correct case 2013-03-09 11:37:53 -06:00
terrafrost
b9787a81eb SFTP: make mode an alias of permissions for stat 2013-03-08 14:18:32 -06:00
terrafrost
0692d42980 SFTP: Use stat instead of lstat for size() 2013-03-08 11:20:39 -06:00