Skip to content

Commit 220fe7c

Browse files
LukasReschkeLukasReschke
authored
Merge pull request nextcloud#50 from nextcloud/stable10-update
Stable10 update
2 parents ed2e232 + cab55e0 commit 220fe7c

22 files changed

+770
-248
lines changed

‎3rdparty/composer.lock‎

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎3rdparty/vendor/composer/autoload_real.php‎

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,26 @@ public static function getLoader()
2323
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
2424
spl_autoload_unregister(array('ComposerAutoloaderInitcc75f134f7630c1ee3a8e4d7c86f3bcc', 'loadClassLoader'));
2525

26-
$map = require __DIR__ . '/autoload_namespaces.php';
27-
foreach ($map as $namespace => $path) {
28-
$loader->set($namespace, $path);
29-
}
30-
31-
$map = require __DIR__ . '/autoload_psr4.php';
32-
foreach ($map as $namespace => $path) {
33-
$loader->setPsr4($namespace, $path);
34-
}
35-
36-
$classMap = require __DIR__ . '/autoload_classmap.php';
37-
if ($classMap) {
38-
$loader->addClassMap($classMap);
26+
$useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION');
27+
if ($useStaticLoader) {
28+
require_once __DIR__ . '/autoload_static.php';
29+
30+
call_user_func(\Composer\Autoload\ComposerStaticInitcc75f134f7630c1ee3a8e4d7c86f3bcc::getInitializer($loader));
31+
} else {
32+
$map = require __DIR__ . '/autoload_namespaces.php';
33+
foreach ($map as $namespace => $path) {
34+
$loader->set($namespace, $path);
35+
}
36+
37+
$map = require __DIR__ . '/autoload_psr4.php';
38+
foreach ($map as $namespace => $path) {
39+
$loader->setPsr4($namespace, $path);
40+
}
41+
42+
$classMap = require __DIR__ . '/autoload_classmap.php';
43+
if ($classMap) {
44+
$loader->addClassMap($classMap);
45+
}
3946
}
4047

4148
$loader->register(true);

‎3rdparty/vendor/composer/autoload_static.php‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
<?php
2+
3+
// autoload_static.php @generated by Composer
4+
5+
namespace Composer\Autoload;
6+
7+
class ComposerStaticInitcc75f134f7630c1ee3a8e4d7c86f3bcc
8+
{
9+
public static $classMap = array (
10+
'OneLogin_Saml2_Auth' => __DIR__ . '/..' . '/onelogin/php-saml/lib/Saml2/Auth.php',
11+
'OneLogin_Saml2_AuthnRequest' => __DIR__ . '/..' . '/onelogin/php-saml/lib/Saml2/AuthnRequest.php',
12+
'OneLogin_Saml2_Constants' => __DIR__ . '/..' . '/onelogin/php-saml/lib/Saml2/Constants.php',
13+
'OneLogin_Saml2_Error' => __DIR__ . '/..' . '/onelogin/php-saml/lib/Saml2/Error.php',
14+
'OneLogin_Saml2_LogoutRequest' => __DIR__ . '/..' . '/onelogin/php-saml/lib/Saml2/LogoutRequest.php',
15+
'OneLogin_Saml2_LogoutResponse' => __DIR__ . '/..' . '/onelogin/php-saml/lib/Saml2/LogoutResponse.php',
16+
'OneLogin_Saml2_Metadata' => __DIR__ . '/..' . '/onelogin/php-saml/lib/Saml2/Metadata.php',
17+
'OneLogin_Saml2_Response' => __DIR__ . '/..' . '/onelogin/php-saml/lib/Saml2/Response.php',
18+
'OneLogin_Saml2_Settings' => __DIR__ . '/..' . '/onelogin/php-saml/lib/Saml2/Settings.php',
19+
'OneLogin_Saml2_Utils' => __DIR__ . '/..' . '/onelogin/php-saml/lib/Saml2/Utils.php',
20+
'OneLogin_Saml_AuthRequest' => __DIR__ . '/..' . '/onelogin/php-saml/lib/Saml/AuthRequest.php',
21+
'OneLogin_Saml_Metadata' => __DIR__ . '/..' . '/onelogin/php-saml/lib/Saml/Metadata.php',
22+
'OneLogin_Saml_Response' => __DIR__ . '/..' . '/onelogin/php-saml/lib/Saml/Response.php',
23+
'OneLogin_Saml_Settings' => __DIR__ . '/..' . '/onelogin/php-saml/lib/Saml/Settings.php',
24+
'OneLogin_Saml_XmlSec' => __DIR__ . '/..' . '/onelogin/php-saml/lib/Saml/XmlSec.php',
25+
'XMLSecEnc' => __DIR__ . '/..' . '/onelogin/php-saml/extlib/xmlseclibs/xmlseclibs.php',
26+
'XMLSecurityDSig' => __DIR__ . '/..' . '/onelogin/php-saml/extlib/xmlseclibs/xmlseclibs.php',
27+
'XMLSecurityKey' => __DIR__ . '/..' . '/onelogin/php-saml/extlib/xmlseclibs/xmlseclibs.php',
28+
);
29+
30+
public static function getInitializer(ClassLoader $loader)
31+
{
32+
return \Closure::bind(function () use ($loader) {
33+
$loader->classMap = ComposerStaticInitcc75f134f7630c1ee3a8e4d7c86f3bcc::$classMap;
34+
35+
}, null, ClassLoader::class);
36+
}
37+
}

‎3rdparty/vendor/composer/installed.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
[
22
{
33
"name": "onelogin/php-saml",
4-
"version": "2.9.0",
5-
"version_normalized": "2.9.0.0",
4+
"version": "2.10.1",
5+
"version_normalized": "2.10.1.0",
66
"source": {
77
"type": "git",
88
"url": "https://github.com/onelogin/php-saml.git",
9-
"reference": "64aff7d58e68d98eaa9220e1041da2bc9214ab51"
9+
"reference": "1017afe7fe6da1def37cc92af37434fbba893d03"
1010
},
1111
"dist": {
1212
"type": "zip",
13-
"url": "https://api.github.com/repos/onelogin/php-saml/zipball/64aff7d58e68d98eaa9220e1041da2bc9214ab51",
14-
"reference": "64aff7d58e68d98eaa9220e1041da2bc9214ab51",
13+
"url": "https://api.github.com/repos/onelogin/php-saml/zipball/1017afe7fe6da1def37cc92af37434fbba893d03",
14+
"reference": "1017afe7fe6da1def37cc92af37434fbba893d03",
1515
"shasum": ""
1616
},
1717
"require": {
@@ -33,7 +33,7 @@
3333
"ext-mcrypt": "Install mcrypt and php5-mcrypt libs in order to support encryption",
3434
"lib-openssl": "Install openssl lib in order to handle with x509 certs (require to support sign and encryption)"
3535
},
36-
"time": "2016-06-27 09:24:27",
36+
"time": "2016-10-26 11:31:56",
3737
"type": "library",
3838
"installation-source": "dist",
3939
"autoload": {

‎3rdparty/vendor/onelogin/php-saml/.travis.yml‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,18 @@ php:
1010
env:
1111
- TRAVIS=true
1212

13+
matrix:
14+
fast_finish: true
15+
1316
before_install:
14-
- curl -s https://getcomposer.org/installer | php
15-
- php composer.phar install --prefer-source --no-interaction
17+
- composer self-update || true
18+
- composer install --prefer-source --no-interaction
1619

1720
before_script:
1821
- phpenv config-rm xdebug.ini
1922

2023
script:
21-
- phpunit --bootstrap tests/bootstrap.php --configuration tests/phpunit.xml
24+
- vendor/bin/phpunit --bootstrap tests/bootstrap.php --configuration tests/phpunit.xml
2225
- php vendor/bin/phpcpd --exclude tests --exclude vendor .
2326
- php vendor/bin/phploc . --exclude vendor
2427
- php vendor/bin/phploc lib/.

‎3rdparty/vendor/onelogin/php-saml/CHANGELOG‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,35 @@
11
CHANGELOG
22
=========
3+
v.2.10.1
4+
* Fix error message on SignMetadata process
5+
* Fix issue on Assertion Signature validation when the assertion contains no namespace and it was encrypted
6+
7+
v.2.10.0
8+
* Several security improvements:
9+
* Conditions element required and unique.
10+
* AuthnStatement element required and unique.
11+
* SPNameQualifier must math the SP EntityID
12+
* Reject saml:Attribute element with same “Name” attribute
13+
* Reject empty nameID
14+
* Require Issuer element. (Must match IdP EntityID).
15+
* Destination value can't be blank (if present must match ACS URL).
16+
* Check that the EncryptedAssertion element only contains 1 Assertion element.
17+
* Improve Signature validation process
18+
* AttributeConsumingService support
19+
* Support lowercase Urlencoding (ADFS compatibility).
20+
* [#154](https://github.com/onelogin/php-saml/pull/154) getSelfHost no longer returns a port number
21+
* [#156](https://github.com/onelogin/php-saml/pull/156) Use correct host on response destination fallback check
22+
* [#158](https://github.com/onelogin/php-saml/pull/158) NEW Control usage of X-Forwarded-* headers
23+
* Fix issue with buildRequestSignature. Added RelayState to the SignQuery only if is not null.
24+
* Add Signature Wrapping prevention Test
25+
* Improve _decryptAssertion in order to take care of Assertions with problems with namespaces
26+
* Improve documentation
27+
28+
v.2.9.1
29+
.......
30+
* [134](https://github.com/onelogin/php-saml/pull/134) PHP7 production settings compiles out assert(), throw an exception explicitly
31+
* [132](https://github.com/onelogin/php-saml/pull/132) Add note for "wantAssertionsEncrypted"
32+
* Update copyright on LICENSE
333

434
v.2.9.0
535
-------

‎3rdparty/vendor/onelogin/php-saml/LICENSE‎

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,23 @@
1-
Copyright (c) 2010-2014 OneLogin, LLC
1+
Copyright (c) 2010-2016 OneLogin, Inc.
22

3-
Permission is hereby granted, free of charge, to any person obtaining a copy
4-
of this software and associated documentation files (the "Software"), to deal
5-
in the Software without restriction, including without limitation the rights
6-
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
7-
copies of the Software, and to permit persons to whom the Software is
8-
furnished to do so, subject to the following conditions:
3+
Permission is hereby granted, free of charge, to any person
4+
obtaining a copy of this software and associated documentation
5+
files (the "Software"), to deal in the Software without
6+
restriction, including without limitation the rights to use,
7+
copy, modify, merge, publish, distribute, sublicense, and/or sell
8+
copies of the Software, and to permit persons to whom the
9+
Software is furnished to do so, subject to the following
10+
conditions:
911

10-
The above copyright notice and this permission notice shall be included in
11-
all copies or substantial portions of the Software.
12+
The above copyright notice and this permission notice shall be
13+
included in all copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
16+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
17+
OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
18+
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
19+
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
20+
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
21+
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
22+
OTHER DEALINGS IN THE SOFTWARE.
1223

13-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
14-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
15-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
16-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
17-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
18-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
19-
THE SOFTWARE.

0 commit comments

Comments
 (0)