1
0
Fork 0
Commit Graph

545 Commits (11daebcb3a5525bfd9f494c37e5e6e7c8e4fb0d6)

Author SHA1 Message Date
Niels Keurentjes 582e4796a3 Merge branch 'master' of https://github.com/composer/composer into pull-4690 2016-02-05 11:24:30 +01:00
Niels Keurentjes 0dab63e050 Unified all Windows tests throughout the code. 2016-02-03 22:39:16 +01:00
Niels Keurentjes f2a2b18367 Added Platform utility and unit test for it. 2016-02-03 22:25:43 +01:00
Niels Keurentjes b71c67239d Made NTFS junction detection more reliable and added unit tests for the junction functions. 2016-02-02 23:44:01 +01:00
Niels Keurentjes 1b1462317c Merge branch 'master' of https://github.com/composer/composer into pull-4690 2016-02-02 22:51:22 +01:00
Jordi Boggiano 49d7d65933 Add verbosity input support to IOInterface 2016-01-29 10:14:12 +00:00
Niels Keurentjes 358cb3f4fc Fixed exception text and some warnings. 2016-01-28 01:06:05 +01:00
Niels Keurentjes 5489586436 Fully implemented junctioning on Windows for path repositories. 2016-01-28 00:56:02 +01:00
Niels Keurentjes e515eb84e9 Add NTFS junction support to Util\Filesystem. 2016-01-28 00:33:11 +01:00
Jordi Boggiano ae14e0f086 Add ssh2 protocol default ports, fixes #4835 2016-01-26 16:53:41 +00:00
Jordi Boggiano 618e7f98b2 Force base error reporting level to include everything 2016-01-26 15:05:57 +00:00
Jordi Boggiano 4e00635298 Fix error handling support, fixes #4833 2016-01-26 15:04:13 +00:00
Jordi Boggiano 1818b95149 CS fixes 2016-01-26 13:07:18 +00:00
Jordi Boggiano 5c944d45ac Merge pull request #4827 from curry684/issue-4203
Added more graceful warning suppression utility
2016-01-26 12:31:18 +00:00
Jordi Boggiano fff5074bbf Fix additionalOptions getting dropped when SAN and redirect handling are combined, refs #4782 2016-01-26 10:44:06 +00:00
Niels Keurentjes 76c1645a0e Merge remote-tracking branch 'upstream/master' into issue-4203 2016-01-25 23:38:13 +01:00
Niels Keurentjes 18cd4f966b Added silencer utility to more gracefully handle error suppression without hiding errors or worse. Fixes #4203, #4683 2016-01-25 23:37:54 +01:00
Jordi Boggiano 59975e3aaa Add missing keys class 2016-01-25 19:43:48 +00:00
Jordi Boggiano bdb97e7527 Reuse new TlsHelper for CA validation, refs #4798 2016-01-25 19:17:56 +00:00
Jordi Boggiano 1ea810d40b Merge remote-tracking branch 'cs278/san-support' 2016-01-25 18:53:45 +00:00
Jordi Boggiano 78ffe0fd08 Avoid checking CA files several times 2016-01-25 18:34:52 +00:00
Jordi Boggiano 901e6f1d0e Fix output and handling of RFS::copy() and extract redirect code into its own method, refs #4783 2016-01-25 17:55:29 +00:00
Jordi Boggiano a574d5ef76 Merge remote-tracking branch 'cs278/follow-redirects' 2016-01-25 17:26:05 +00:00
Chris Smith e2e07a32c3 Fixes to vuln detection 2016-01-24 20:54:43 +00:00
Chris Smith bc8b7b0f78 Remove left behind debug code 2016-01-24 19:41:14 +00:00
Chris Smith b32aad8439 Do not set TLS options on local URLs 2016-01-24 19:10:11 +00:00
Chris Smith 74aa73e841 The origin may not be the remote host 2016-01-24 19:09:35 +00:00
Chris Smith 304c268c3b Tidy up and general improvement of sAN handling code
* Move OpenSSL functions into a new TlsHelper class
* Add error when sAN certificate cannot be verified due to
  CVE-2013-6420
* Throw exception if PHP >= 5.6 manages to use fallback code
* Add support for wildcards in CN/sAN
* Add tests for cert name validation
* Check for backported security fix for CVE-2013-6420 using
  testcase from PHP tests.
* Whitelist some disto PHP versions that have the CVE-2013-6420
  fix backported.
2016-01-24 19:02:50 +00:00
Chris Smith 7e2a015e9b Provide support for subjectAltName on PHP < 5.6 2016-01-24 19:02:29 +00:00
Rob Bast d6be2a693b switch to array-replace-recursive 2016-01-22 14:27:08 +01:00
Rob Bast 2393222826 more appropriate name 2016-01-22 09:20:43 +01:00
Rob Bast 474541e9aa apply comments
- add capath to json schema
- simplify factory
- hash_file and sha256 for CA checking
- remove exception as scenario should not occur
- remove executable bit from CA file
- make CA file also group/world writable (we overwrite invalid content anyway)
    to avoid permission errors as much as possible
2016-01-22 09:14:37 +01:00
Chris Smith 33f823146b Account for ports in URL 2016-01-22 01:48:16 +00:00
Chris Smith 34f1fcbdcb Drop downgrade warning 2016-01-22 01:47:05 +00:00
Rob Bast c232566e52 add a hash to make sure CA file gets recreated if the content changes 2016-01-21 16:02:44 +01:00
Rob Bast cef97904d0 dont rewrite temp CA file if it already exists
and make it readable by everyone the first time we create it
2016-01-21 15:07:51 +01:00
Rob Bast 4482a1dca0 also wrong array 2016-01-20 21:53:49 +01:00
Rob Bast f79255df29 make sure passed options are merged into defaults before checking 2016-01-20 21:35:06 +01:00
Rob Bast 94947ee772 merge isset() calls 2016-01-20 21:29:55 +01:00
Rob Bast b95b0c2ab6 wrong array 2016-01-20 21:27:26 +01:00
Rob Bast 008cce8d85 add back sanity checks 2016-01-20 21:24:13 +01:00
Rob Bast c1488f65bf a quick stab at adding capath 2016-01-20 21:20:18 +01:00
Chris Smith dd3216e93d Refactor to use new helper methods for headers 2016-01-19 22:19:17 +00:00
Chris Smith 8a8ec6fccc Too many redirects is not an error in PHP, return the latest response 2016-01-19 22:06:38 +00:00
Chris Smith 33471e389f Pass redirect count using options
Removing the risk it might be preserved between requests.
2016-01-19 22:06:27 +00:00
Chris Smith e830a611ec Handle other path redirects 2016-01-19 22:06:27 +00:00
Chris Smith ffab235edd Remove code preventing protocol downgrades 2016-01-19 22:06:27 +00:00
Chris Smith ce1eda25f3 Follow redirects inside RFS only when required by PHP version 2016-01-19 22:06:27 +00:00
Chris Smith 73662c725a Don't let PHP follow redirects it doesn't validate certificates 2016-01-19 22:06:04 +00:00
Jordi Boggiano 546730dcf3 Show CA files being used in debug mode, refs #4792 2016-01-19 17:34:29 +00:00
Jordi Boggiano f9fadb187e Fix undefined var $auth issue 2016-01-19 12:04:23 +00:00
Jordi Boggiano a13b06725e Add support for if-modified-since on lazy repos and turning packagist into a lazy provider repo 2016-01-18 14:03:10 +00:00
Jordi Boggiano 33c123e8c2 Fix passing of options to remotefilesystem in composer repo 2016-01-18 12:28:03 +00:00
Rob Bast 22d8b5dff4 fix possible caBundle error 2016-01-18 08:59:12 +01:00
Jordi Boggiano 8375af268c Use fixed CN_match for github hosts, fixes #4782 2016-01-17 13:41:56 +00:00
Rob Bast 42f49b3b97 fix missing import 2016-01-16 20:47:49 +01:00
Jordi Boggiano d7c61c50ad Merge branch 'tls-config' 2016-01-16 16:55:19 +00:00
Jordi Boggiano fb848d2e07 Code cleanups 2016-01-16 16:50:28 +00:00
Jordi Boggiano 72fae0bf70 Declare CN_match/SNI_server_name only for php <5.6 2016-01-16 16:28:04 +00:00
Jordi Boggiano 449f68deae Remove dangerous CN_match fallback 2016-01-16 16:26:14 +00:00
Jordi Boggiano 03299ff075 Suggest https in docs where it makes sense, closes #4056 2016-01-10 20:34:53 +00:00
Jordi Boggiano fc4d94f160 Code clarity and updates from the getcomposer.org installer 2016-01-10 17:59:08 +00:00
Jordi Boggiano cb53bd04cb Remove a few instances of RemoteFilesystem that were not needed 2016-01-10 17:07:54 +00:00
Jordi Boggiano f8dff0867c Remove --disable-tls/--cafile flags and rely solely on config options plus some wording clarifications 2016-01-10 16:37:11 +00:00
Jordi Boggiano 5d015defb8 Merge remote-tracking branch 'origin/master' into tls-config 2016-01-10 16:10:22 +00:00
Jordi Boggiano 29312be4df Strict typing fixes 2015-12-16 17:48:12 +00:00
Jordi Boggiano fbab2bfa17 Move user agent definition to StreamContextFactory so it is available in all contexts 2015-11-23 15:12:33 +00:00
Jordi Boggiano f084b1e053 Remove duplicate handling of retry-auth-failure option, refs #3765 2015-11-21 21:51:58 +00:00
Jordi Boggiano 020c126c27 Fix CS 2015-11-21 21:51:43 +00:00
Jordi Boggiano a10bffec0e Merge remote-tracking branch 'GromNaN/gitlab' 2015-11-21 21:48:46 +00:00
Jordi Boggiano 966a982738 CS fixes 2015-11-21 19:28:10 +00:00
Jérôme Tamarelle 4255db9e31 Allows SSH urls for gitlab and detect the scheme
SSH urls uses HTTPS to request the API
2015-11-14 16:05:05 +01:00
Jérôme Tamarelle ac68a721f4 Merge remote-tracking branch 'composer/master' into gitlab
Conflicts:
	doc/04-schema.md
	src/Composer/Util/RemoteFilesystem.php
2015-11-14 14:13:39 +01:00
Jerome TAMARELLE 6ccc562c0f Add tests on GitLab class (copied from GitHubTest) 2015-11-13 18:50:50 +01:00
Jerome TAMARELLE db056b8383 Fix retry authentification on gitlab oauth 2015-11-13 18:36:29 +01:00
Jerome TAMARELLE 211d4632bb Fix compatibility with PHP 5.3 2015-11-13 18:06:17 +01:00
Jordi Boggiano 58a6d4b7d3 Add comment 2015-11-10 16:35:29 +00:00
David Fuhr 064e1a6d6d Fix handling of http 400 errors
Before 400 errors were silently dropped. This caused composer to store
the returned body (usually some html) in cache. This resulted in later
errors when composer tried to extract this error response as zip.

With this exceptions thrown it handles the error gracefully and falls
back to the next URL provided by the package configuration.
2015-11-10 16:30:01 +01:00
Shawn Tunney 54584e6b0f Have xcopy overwrite existing files 2015-11-04 10:46:27 -05:00
Rob c7ed232ef4 Merge pull request #4529 from jeroenseegers/warn-on-commit-reference
Generate a warning when a commit reference is used
2015-10-29 10:52:59 +01:00
Jordi Boggiano 8e99cec3e7 Fix ref to findShortestPath 2015-10-28 00:04:33 +00:00
Jordi Boggiano 125dc62fab Make trigger error visible 2015-10-27 16:11:07 +00:00
Jordi Boggiano 615638c7c3 Simplify bin-compat by removing the nosymlink option, refs #3704 2015-10-27 15:36:12 +00:00
Jordi Boggiano c9b51a5751 Merge remote-tracking branch 'kocsismate/feature-bin-compat' 2015-10-27 15:20:53 +00:00
Jeroen Seegers 279b5f0156 Drop irrelevant properties from composer_commit-ref.json 2015-10-27 14:20:45 +01:00
Jeroen Seegers f3dc31839f Refactor commit-ref validation
The require and require-dev arrays have been merged into one and no
longer user private methods/properties to collect warnings.
2015-10-27 13:59:29 +01:00
Jeroen Seegers 73e73c90fb Generate a warning when a commit reference is used
Closes #4485
2015-10-23 21:38:11 +02:00
Rob Bast b523fc0b7b ran fixers 2015-10-13 11:35:51 +02:00
Jordi Boggiano ce08582671 Fix CS 2015-09-28 10:53:24 +01:00
Jordi Boggiano ae23979dfa Add validation warning for prs-0/4 definitions without namespace prefix, refs #3202 2015-09-20 19:29:53 +01:00
Samuel ROZE ead68d3d49 Create the path repository and downloader 2015-08-18 14:40:48 +01:00
Jordi Boggiano 9859859f10 Add comment, fixes #4145 2015-08-17 15:57:00 +01:00
Kocsis Máté 87c16073ec Merge branch 'master' of https://github.com/composer/composer into feature-bin-compat 2015-07-22 15:54:20 +02:00
Jordi Boggiano 00c26791fa Merge pull request #4264 from alcohol/use-composer-spdx
remove spdx files, introduce external library
2015-07-20 18:29:14 +01:00
Jordi Boggiano bbf959ac34 Do not retry failures once degraded mode is already enabled 2015-07-20 17:44:03 +01:00
Jordi Boggiano ff84b32097 Add degraded mode to try and bypass ipv6/gzip issues, refs #4142, refs #4121 2015-07-20 17:33:53 +01:00
Rob Bast 2553f5f7d4 throw error when file is loaded 2015-07-20 12:10:30 +02:00
Rob Bast 616585e0cc spdxlicense extends spdxlicenses, add depr error 2015-07-16 13:21:18 +02:00
Rob Bast 5ae9e7fe22 remove spdx files, introduce external library 2015-07-16 11:42:12 +02:00
Jordi Boggiano e2b2f450dc Merge pull request #4144 from staabm/patch-2
Dropped unnecessary break statements
2015-07-03 21:49:05 +01:00