1
0
Fork 0
Commit Graph

757 Commits (ab945a6ec1899d5f5f5f844d39d5e921ddcebccd)

Author SHA1 Message Date
Gawain Lynch 8b42aed060
Create a local escapeArgument() for Symfony 4 compatibility. 2017-11-06 16:28:50 +01:00
Jordi Boggiano bfed974ae9 Merge branch '1.5' 2017-11-03 23:23:28 +01:00
Jordi Boggiano fc9f8c2007 Fix tests 2017-11-03 23:23:22 +01:00
Jordi Boggiano 26a50b3762 Merge branch '1.5' 2017-11-03 19:53:36 +01:00
Jordi Boggiano 11f1e03739 CS tweaks 2017-11-03 19:44:44 +01:00
Minh-Quan TRAN 007ca5ff6a workaround for gitlab installation with relative url
Signed-off-by: Minh-Quan TRAN <account@itscaro.me>
2017-11-03 19:42:54 +01:00
croensch bd6168ef85 fix pull 6740
wrongly copied the check, either must be in not-empty
2017-10-13 09:49:04 +02:00
croensch 6da92e98ac also support NO_PROXY
since WINDOWS can only have one case and that is usually upperase
2017-10-12 16:35:05 +02:00
Vladimir Reznichenko c8615358cb SCA with PHP Inspections (EA Extended) 2017-09-11 19:40:43 +02:00
Jordi Boggiano a53f2ce7c7 Merge branch '1.5' 2017-09-11 15:45:50 +02:00
Jordi Boggiano f71baa5e0c Try fixing 404s gitlab handling when unauthenticated, refs #6669 2017-09-11 14:41:33 +02:00
Christian Ramelow 39d8104897 Introduces a new method `copy()`.
Some packages, e. g. `tm/tooly-composer-script`, are using the composer classes to e. g. create symlinks or perform other file operations. While there's only a `copyThenRemove()` method this commit introduces a new `copy()` method. `copy()` behaves the same as the copy part of `copyThenRemove()` did with one exception: it returns `true` on success and `false` on failure. Copying a directory may lead to a `false`, while the whole directory or some of its files couldn't been copied. To ensure backwards compatibility `copyThenRemove()` calls `copy()` now. This commit also adds the necessary tests.
2017-08-31 20:19:43 +02:00
Jordi Boggiano 1a488bce01 Base64 encode debug output to avoid dumping binary and push it to the end of the line 2017-05-23 09:31:29 +02:00
Jordi Boggiano 221d80d1e1 Merge branch '1.4' 2017-05-21 17:16:46 +02:00
Jordi Boggiano 2eb69cd679 Always recommend using global config to store auth tokens 2017-05-21 16:45:14 +02:00
Matt Isenhower 4dc8748e68 Update GitLab personal access token URL and the token config command 2017-05-21 16:40:07 +02:00
Jordi Boggiano 0723654362 Merge branch '1.4' 2017-05-21 16:25:16 +02:00
Jordi Boggiano d0e780a8eb Allow php_uname to be disabled, fixes composer/getcomposer.org#112 2017-05-21 16:24:35 +02:00
Martin Hasoň 88ec172bd8 Fix CS 2017-05-19 15:14:47 +02:00
Jordi Boggiano bf82bfdb10 More debug output, refs #6342 2017-04-19 13:37:41 +02:00
Jordi Boggiano 1fe5064560 Better debuggability of content-length mismatch 2017-04-19 13:24:07 +02:00
Jordi Boggiano 0d5ff633b5 Merge branch '1.4' 2017-03-26 14:03:37 +02:00
Jordi Boggiano 72616a9635 Only check for safe mode on versions that have it, refs #6300 2017-03-26 14:03:27 +02:00
Jordi Boggiano 0efc66d968 Tweak message 2017-03-26 13:43:05 +02:00
Nicola Spanti (RyDroid) 5cd080dfac Add a specific message for stupid users that put useless spaces in license 2017-03-25 21:48:24 +01:00
Alejandro Celaya d20494ddf6 Removed duplicated "to" 2017-03-24 09:34:45 +01:00
Jordi Boggiano 122e422682 CS fixes 2017-03-08 15:16:44 +01:00
Jordi Boggiano c8cf24daad Minor tweaks and CS fixes to new bitbucket integration, refs #6094 2017-03-07 15:46:38 +01:00
Jordi Boggiano 44ea284ab9 Merge remote-tracking branch 'stefangr/implement_bitbucket_api_v2' 2017-03-07 14:43:16 +01:00
Jordi Boggiano daff57189f Add http_build_query 3rd param to make it more explicit 2017-03-07 14:34:07 +01:00
Jordi Boggiano 260b85882f Merge remote-tracking branch 'dzuelke/installmsgs' into 1.3 2017-03-07 10:01:02 +01:00
Jordi Boggiano 63447cf724 Avoid retrying forever if a gitlab token has insufficient rights, fixes #6189 2017-03-07 09:55:21 +01:00
Jordi Boggiano 08fc56b38a Avoid using null value as string, fixes #6134 2017-03-06 12:08:51 +01:00
Stefan Grootscholten 966d0bec10 One more non-camelCase variable. 2017-01-29 15:55:37 +01:00
David Zuelke 17d5f6d88a fix some install msg corner cases
mostly around updates; had to go back to a colon even for 'from cache'
2017-01-27 18:30:00 +01:00
Stefan Grootscholten 4377ba2bcb Implement changes after review by stof.
- Use camelCase variable names.
- Set 3rd argument of http_build_query
- Remove obsolete checks
2017-01-25 21:18:19 +01:00
David Zuelke 2d36324e99 streamline install progress messages 2017-01-24 20:51:37 +01:00
Stefan Grootscholten 3eeb6214eb Fix RemoteFilesystem::isPublicBitBucketDownload
The access token was added to requests to third party hosts the bitbucket api is redirecting to.
2017-01-22 14:35:37 +01:00
Stefan Grootscholten b3b05949bb Implement most desirable Authorization method.
As per https://developer.atlassian.com/bitbucket/api/2/reference/meta/authentication#make-requests
adding the OAuth access token in the Authorization header is desired above adding it to the URL.
2017-01-22 14:35:37 +01:00
Stefan Grootscholten a4af559ca8 Store access-token for re-use
Store the Bitbucket access-token (and the expiration time) so it can be re-used within the time it is valid.
The Bitbucket::requestToken and Bitbucket::getToken now only return the access-token and not all other parameters it receives from the Bitbucket API.
2017-01-22 14:35:37 +01:00
Jordi Boggiano 0bc75c3fb6 Bump memory limit to 1.5G 2016-12-31 16:29:31 +01:00
Plamen Garkov ab4322148f adding "fatal: unable to access" to authFalures 2016-12-31 16:29:12 +01:00
Stefan Grootscholten d80d266201 Fix dist download from bitbucket.
URL https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-2.1.1-linux-x86_64.tar.bz2
results in the following $pathParts:
array(5) {
  [0]=>
  string(0) ""
  [1]=>
  string(5) "ariya"
  [2]=>
  string(9) "phantomjs"
  [3]=>
  string(9) "downloads"
  [4]=>
  string(36) "phantomjs-2.1.1-linux-x86_64.tar.bz2"
}

A dist download URL is like:
https://bitbucket.org/user/repo/get/[git-hash].zip
array(5) {
  [0]=>
  string(0) ""
  [1]=>
  string(4) "user"
  [2]=>
  string(4) "repo"
  [3]=>
  string(3) "get"
  [4]=>
  string(14) "[git-hash].zip"
}
2016-12-24 21:10:12 +01:00
Jordi Boggiano 4d082f77b8 Simplify composer output to take less lines 2016-12-07 01:09:06 +01:00
Jordi Boggiano e9d04f2b2d Merge branch '1.2' 2016-12-06 17:04:39 +01:00
Dries Vints 58b27289d0 Do not add newlines for errors 2016-12-06 16:53:56 +01:00
Dries Vints 2ab7df5566 Do not add newlines to output 2016-12-06 16:53:46 +01:00
Jordi Boggiano f1eb787013 Merge pull request #5882 from johnstevenson/xdebug-handler-ini
Use random name for tmp ini and delete after use
2016-11-21 13:39:07 +01:00
Sergey Beresnev 2717e115c8 windows remote path treats as remote now 2016-11-21 15:41:15 +08:00
johnstevenson 379fb70ad9 Use random name for tmp ini and delete after use
Thanks to Patrick Rose for reporting this issue.
2016-11-20 10:59:05 +00:00
Thomas Flori 7896b1ffab cache only rendered composer information
As suggested we cache now only composer information and also the rendered version again. Perforce is using the same property cache as others and the `Util\Perforce::getComposerInformation()` is using the newly created methods.
2016-11-15 07:52:17 +01:00
Thomas Flori ec27777341 code improvements as suggested
Thanks for your input!
2016-11-12 11:10:13 +01:00
Thomas Flori 33d026bb06 fix code style to be PSR-2 conform
I tried to solve all PSR-2 style guide violations in files that I changed. One I could not solve: const can not concatenate in php 5.3.
2016-11-12 09:33:05 +01:00
Thomas Flori 597f834ae9 add getFileContent function
This function is very similar to a part from getComposerInformation - so we can use this function in getComposerInformation too. And because it is almost everywhere the same we can put it to abstract class.

By implementing getComposerInformation in abstract class we need to add the getChangeDate to interface too. Only Problem: perforce seems not to support a ChangeDate. For this we use 'now' to have at least something.
2016-11-11 09:06:03 +01:00
Jordi Boggiano 43903a3979 Merge branch '1.2' 2016-11-06 17:38:53 +01:00
Fabien Potencier 103624d4ed Remove usage of echo when executing Composer script 2016-11-05 22:10:39 -07:00
Jordi Boggiano 0f455be01c Add CI flag in UA header 2016-11-03 11:00:40 +01:00
Jordi Boggiano 183398fe5e Merge pull request #5717 from berlinger-rarents/fix/5584_anon_redirect_bitbucket
prevent (prompt for) bitbucket auth when it redirected
2016-10-10 14:11:24 +02:00
Jordi Boggiano c0e28a9043 Remove static/public method 2016-10-10 14:03:30 +02:00
Roel Arents 489a8f3d5a revert to simply making an exception (no acces_token) for bitbucket/user/repo/downloads URLs
[#5584]
2016-09-29 21:16:47 +02:00
berlinger-rarents 5123c5cf76 remove redundant truth check 2016-09-29 10:55:14 +02:00
berlinger-rarents 8845ea467a try bitbucket downloads first time without auth
also add tests for #5584
2016-09-28 19:08:24 +02:00
Rob Bast e60eff5f2e
apply patch 2016-09-27 14:45:33 +02:00
berlinger-rarents 64fc8ffe3d prevent (prompt for) auth for bitbucket public downloads
#5584
2016-09-27 11:41:16 +02:00
berlinger-rarents a4e3e1b584 prevent (prompt for) bitbucket auth when it redirected
#5584
2016-09-26 19:47:10 +02:00
Jordi Boggiano 285c4a1ac6 Merge branch '1.2' 2016-09-12 16:56:32 +02:00
Jordi Boggiano ff7daf0bd4 Fix handling of paths on windows when cwd is root of drive, fixes #5554 2016-09-12 16:56:04 +02:00
Jordi Boggiano cada55dde6 Merge pull request #5491 from moolex/support_gitlab_private_token
Support gitlab private-token for easier access via Gitlab API
2016-09-10 12:15:35 +02:00
Rob Bast 02455712cf check for additional possible output strings, fixes #5543 2016-07-26 11:46:51 +02:00
Jordi Boggiano 3455380413 Patch Httpoxy vulnerability 2016-07-19 00:57:41 +02:00
moyo 997a062ebd Support gitlab private-token (or personal-access-token) for easier access via gitlab API
Config example:

$HOME/.composer/auth.json

{
  "gitlab-token": {
    "gitlab.com": "YOUR-TOKEN-HERE"
  }
}

Gitlab API authentication doc: http://doc.gitlab.com/ce/api/README.html
2016-07-05 18:02:39 +08:00
Jordi Boggiano 87fbf4a6cd Clean ups, refs #5485 2016-07-02 17:49:46 +01:00
Jordi Boggiano 8ffe224c0d Merge remote-tracking branch 'stefangr/fix_minor_bitbucket_oauth_issues' 2016-07-02 17:43:07 +01:00
Jordi Boggiano 4998ee27b3 Re-use mirror code from the git driver, refs #5384 2016-07-02 17:20:51 +01:00
Jordi Boggiano 55e90093a4 Merge remote-tracking branch 'marvil07/faster-git-clones-using-cache' 2016-07-02 16:43:19 +01:00
Stefan Grootscholten 5a31c75289 Fix some of the remaining OAuth issues.
- Bitbucket will silently redirect to a login page when downloading a zip.
Added a check to see if the content-type is not text/html
- Make the path from Basic Authentication to OAuth as smooth as possible.
2016-07-02 15:10:33 +02:00
Jordi Boggiano efb24846cb Merge branch '1.1' 2016-06-21 11:01:40 +01:00
Jordi Boggiano f94d06ff0a Fix escaping 2016-06-21 11:01:35 +01:00
Jordi Boggiano 39c2c8c30a Add test for password escaping 2016-06-21 11:01:09 +01:00
Marco Villegas 75b88a13fe Use regex to capture git version. 2016-06-18 17:55:24 -05:00
Stefan Grootscholten 1241e3e83c Simplify the if statement. 2016-06-11 17:33:58 +02:00
Stefan Grootscholten 42f4d344a4 Fix the replacement of the credentials.
://username:password@domain
was replaced by ://://:***@domain
instead of ://username:***@domain or ://***:***@domain
2016-06-11 17:33:58 +02:00
Stefan Grootscholten ea11a95359 Provide fallback when using basic authentication.
When composer is configured to use bitbucket basic authentication (a bitbucket username and password), you get an error
when trying to install dependencies.
This commit prevent the install process to be aborted due to uncaught exceptions.
2016-06-11 17:33:58 +02:00
Stefan Grootscholten 7716ef059b Add the access token as query string parameter. 2016-06-11 17:33:58 +02:00
Stefan Grootscholten 6c8b0cc2c1 Change authentication for bitbucket to oauth. 2016-06-11 17:33:58 +02:00
Stefan Grootscholten 0e500d4c91 Make API URL available for external use. 2016-06-11 17:33:58 +02:00
Jordi Boggiano a8edaad381 Merge pull request #5335 from carlcraig/1.1
Update bitbucket oauth instructions
2016-06-11 17:00:13 +02:00
Jordi Boggiano 73d9a4717d Update list of ciphers /cc @cs278 2016-06-11 11:19:58 +01:00
Marco Villegas 5bb0433a51 Provide a way to retirve git version from the related util class. 2016-05-29 12:36:19 -05:00
Jordi Boggiano e2c3bc5e89 Merge branch '1.1' 2016-05-17 23:02:40 +01:00
Jordi Boggiano 3ac822d5e2 Fix access_token param being incorrectly added on github requests after a redirection, fixes #5099 2016-05-17 23:02:28 +01:00
Jordi Boggiano 32a8a60695 Merge branch '1.1' 2016-05-17 14:08:17 +01:00
Jordi Boggiano 143db7a9f5 Fix degraded mode usage on packagist, fixes #5350 2016-05-17 14:08:14 +01:00
ReenExe 53fc30fe56 clear code 2016-05-17 13:34:54 +03:00
Carl Craig e43912735b Update bitbucket oauth instructions 2016-05-14 13:07:25 +00:00
Jordi Boggiano 046c2d64a5 Fix ProcessExecutor url escaping 2016-05-09 10:31:03 +01:00
Jordi Boggiano 9cb6c2322a Fix more git URL escaping 2016-05-08 18:23:14 +01:00
Jordi Boggiano e3ae45fa12 Replace username as well if it looks like a github oauth token 2016-05-08 17:22:25 +01:00
Stefan Grootscholten 9b654048ed Fix regex for bitbucket https URLs.
If the bitbucket URL has the .git extension, the compiling of the authUrl and sshUrl result in invalid URLs.
2016-05-01 11:41:48 +02:00
Stefan Grootscholten 591f68288b Provide a fallback to ssh for https bitbucket URLs.
When running in non-interactive mode, there is no way to ask for credentials.
If there are no credentials available, no attempt is made to execute the command.

This commit provides a fallback to SSH for non authenticated, non-interactive install/updates of bitbucket https URLs.
2016-05-01 11:27:16 +02:00
Jordi Boggiano 36665d791d Merge branch '1.0' 2016-04-29 16:03:14 +01:00
Jordi Boggiano c66639fe03 Fix content-length check to look at the last header received, fixes #5268 2016-04-29 16:03:05 +01:00
Jordi Boggiano 38c49b32cb Less regex escaping and removed $..$ match, refs #5184 2016-04-22 20:48:56 +01:00
Jordi Boggiano d8c94c2640 Merge remote-tracking branch 'curry684/home-expansion' 2016-04-22 20:37:05 +01:00
Jordi Boggiano 95e0347917 Merge branch '1.0' 2016-04-21 12:40:42 +01:00
Jordi Boggiano ff46816e79 Add support for file:///c:/-style paths, refs #3338 2016-04-21 11:00:41 +01:00
Jordi Boggiano 2062070be9 Warn users with secure-http disabled once per hostname they access insecurely to avoid bad URLs going by undetected, fixes #5008 2016-04-19 22:29:04 +01:00
Jordi Boggiano 31dcc0bdea Merge branch '1.0' 2016-04-19 15:44:38 +01:00
Jordi Boggiano 1bf711fe1f Guard against mbstring func_overload, fixes #5218 2016-04-19 15:44:13 +01:00
David Zuelke d716c73333 fail download on content-length mismatch 2016-04-18 20:42:38 +01:00
Niels Keurentjes 4b5375f4c0 Need legacy patch for older hardcoded behaviour in handling HOME/USERPROFILE env variables. 2016-04-13 23:53:27 +02:00
Niels Keurentjes c9534d48c1 Made env variable parsing in path replacements generic across platforms and replaced old config.php implementation. 2016-04-13 02:02:50 +02:00
Niels Keurentjes f5422a441d Fixed Windows path separators and updated docs. 2016-04-12 23:51:28 +02:00
Niels Keurentjes 7e71b2bfbc Added support for expanding environment variables in paths, and tilde expansion on Windows. 2016-04-12 23:07:58 +02:00
Niels Keurentjes 23ad67b3be Implement support for tilde expansion, mainly for path repositories 2016-04-12 13:14:07 +02:00
Jordi Boggiano d20d856aa8 Merge remote-tracking branch 'nicolas-grekas/php7-static' 2016-04-11 19:18:22 +01:00
Nicolas Grekas fd2f51cea8 Speedup autoloading on PHP 5.6 & 7.0+ using static arrays 2016-04-11 19:38:24 +02:00
Jordi Boggiano 6a287b9240 Merge branch '1.0' 2016-04-11 17:38:51 +01:00
Jordi Boggiano 765a958c42 Merge pull request #5137 from dzuelke/rfs_conlen
Fail download on content-length mismatch
2016-04-11 17:03:58 +01:00
Jordi Boggiano b1723644e0 Use extracted ca-bundle package 2016-04-11 16:33:29 +01:00
Jordi Boggiano d8840df4ac Minor tweak 2016-04-11 15:13:51 +01:00
Jordi Boggiano 1f0b01e70d Merge remote-tracking branch 'watermanio/strict-types' into 1.0 2016-04-11 15:11:46 +01:00
Jordi Boggiano 3b0a1c6f70 Run cs fixer and update config to latest master 2016-04-11 15:06:57 +01:00
Jordi Boggiano da9b43dcc8 Merge remote-tracking branch 'curry684/code-quality' into 1.0 2016-04-11 14:39:37 +01:00
Jordi Boggiano e2056499cb Avoid open_basedir warnings on is_dir() calls when probing for CABundle 2016-04-11 08:45:25 +01:00
Niels Keurentjes eb77c0b7f5 phpDoc cleanup, removed unused imports, variables and parameters. 2016-04-07 23:12:23 +02:00
Niels Keurentjes e6f21137ad Undefined or default return points fixed. 2016-04-07 00:52:50 +02:00
Andy Waterman d4207ff49f Strict type checks of null and bool 2016-04-06 20:55:53 +01:00
Jordi Boggiano fc57cc8d7e Remove changes in StreamContextFactory, refs #5055 2016-04-01 01:00:48 +01:00
Jordi Boggiano 2c9326bacb Merge remote-tracking branch 'wenkepaul/master' 2016-04-01 00:59:11 +01:00
David Zuelke 5dd4d69a6d fail download on content-length mismatch 2016-04-01 01:36:05 +02:00
Niels Keurentjes 49524bc4ba Centralize secure-http checking 2016-03-28 22:01:32 +02:00
Jordi Boggiano 37a1e12672 Mark failed downloads as failed instead of 100% complete, fixes #5111 2016-03-27 17:14:51 +01:00
Paul Wenke 9059d70ba0 Corrected username / access token parameters for $this->io->setAuthentication when read from git config. Grant type is now only set when requesting an access token. Removed bitbucket-domains and bitbucket-protocols from config. Fixed bitbucket typo in JsonConfigSource. Removed unecessary comments. Changed visibility of Composer/Util/Bitbucket properties to private. Added https to bitbucket url. Removed unused $note variable. 2016-03-20 15:56:58 -04:00
Jordi Boggiano 0db8bbfda3 Add update channels support to self-update and diagnose, fixes #4960 2016-03-15 14:13:08 +00:00
Niels Keurentjes fafac386b7 Ensure stat cache is cleared for junctions when using outside modifications. 2016-03-14 12:27:41 +01:00
Paul.Wenke b4d9d0fd0d Added BitbucketTest class. Added is_array and is_object check to http content before calling http_build_query. 2016-03-13 21:33:13 -04:00
Paul.Wenke 9ddf8c4d55 Fixed OAuth credentials issue for subsequent clone requests. 2016-03-13 16:57:23 -04:00
Jordi Boggiano 4cc719cab3 Add support for SSL_CERT_DIR and openssl.capath, fixes #5017 2016-03-07 13:07:02 +00:00
Paul Wenke d2c5479b2d Updated documentation and fixed formatting in Bitbucket Util. 2016-03-06 22:20:22 -05:00
Paul Wenke d5332a1b5c Developed bitbucket-oauth functionality. 2016-03-06 22:05:00 -05:00
Jordi Boggiano e94066967c Add debugging info about proxy usage, refs #4332 2016-03-02 18:28:44 +00:00
Jordi Boggiano 7e1a23eef7 Add missing use statements 2016-03-01 14:09:44 +00:00
Jordi Boggiano 6f42b9c865 Disable git, svn, http protocols for VCS downloaders, fixes #4968 2016-03-01 13:20:35 +00:00
Jordi Boggiano 0ed5b541a9 Fix CS 2016-02-29 15:05:11 +00:00
Jordi Boggiano f2e2dd8f86 Merge pull request #4972 from curry684/code-quality
Code quality
2016-02-29 14:14:49 +00:00
Jordi Boggiano 070ee50693 Actually check for the dir existence before retrying, refs #4009 2016-02-28 14:08:43 +00:00
Jordi Boggiano c502601c4b Retry on RecursiveDirectoryIterator failure to open dir, refs #4009 2016-02-28 14:06:36 +00:00
Niels Keurentjes f794ee7870 Fixes for implicit variable declarations, return type mismatches and invalid method declarations. 2016-02-27 23:39:57 +01:00
Niels Keurentjes 478f923ec2 Improved junction detection on Windows NTFS, fixes #4955 2016-02-25 22:16:38 +01:00