mirror of
https://github.com/netzbegruenung/user_saml.git
synced 2024-05-03 17:43:41 +02:00
Bump xmlseclibs to 3.0.3
For php 7.3 compatibility Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
This commit is contained in:
parent
a8123425c4
commit
6c500e158d
10
3rdparty/composer.lock
generated
vendored
10
3rdparty/composer.lock
generated
vendored
|
@ -101,16 +101,16 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "robrichards/xmlseclibs",
|
"name": "robrichards/xmlseclibs",
|
||||||
"version": "3.0.2",
|
"version": "3.0.3",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/robrichards/xmlseclibs.git",
|
"url": "https://github.com/robrichards/xmlseclibs.git",
|
||||||
"reference": "1f4de0c0d121922aafd8c62c2a9f5e528830cf38"
|
"reference": "406c68ac9124db033d079284b719958b829cb830"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/robrichards/xmlseclibs/zipball/1f4de0c0d121922aafd8c62c2a9f5e528830cf38",
|
"url": "https://api.github.com/repos/robrichards/xmlseclibs/zipball/406c68ac9124db033d079284b719958b829cb830",
|
||||||
"reference": "1f4de0c0d121922aafd8c62c2a9f5e528830cf38",
|
"reference": "406c68ac9124db033d079284b719958b829cb830",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
@ -135,7 +135,7 @@
|
||||||
"xml",
|
"xml",
|
||||||
"xmldsig"
|
"xmldsig"
|
||||||
],
|
],
|
||||||
"time": "2018-09-27T13:24:13+00:00"
|
"time": "2018-11-15T11:59:02+00:00"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"packages-dev": [],
|
"packages-dev": [],
|
||||||
|
|
2
3rdparty/vendor/composer/ClassLoader.php
vendored
2
3rdparty/vendor/composer/ClassLoader.php
vendored
|
@ -279,7 +279,7 @@ class ClassLoader
|
||||||
*/
|
*/
|
||||||
public function setApcuPrefix($apcuPrefix)
|
public function setApcuPrefix($apcuPrefix)
|
||||||
{
|
{
|
||||||
$this->apcuPrefix = function_exists('apcu_fetch') && ini_get('apc.enabled') ? $apcuPrefix : null;
|
$this->apcuPrefix = function_exists('apcu_fetch') && filter_var(ini_get('apc.enabled'), FILTER_VALIDATE_BOOLEAN) ? $apcuPrefix : null;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
69
3rdparty/vendor/composer/LICENSE
vendored
69
3rdparty/vendor/composer/LICENSE
vendored
|
@ -1,56 +1,21 @@
|
||||||
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
|
|
||||||
Upstream-Name: Composer
|
|
||||||
Upstream-Contact: Jordi Boggiano <j.boggiano@seld.be>
|
|
||||||
Source: https://github.com/composer/composer
|
|
||||||
|
|
||||||
Files: *
|
Copyright (c) Nils Adermann, Jordi Boggiano
|
||||||
Copyright: 2016, Nils Adermann <naderman@naderman.de>
|
|
||||||
2016, Jordi Boggiano <j.boggiano@seld.be>
|
|
||||||
License: Expat
|
|
||||||
|
|
||||||
Files: src/Composer/Util/TlsHelper.php
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
Copyright: 2016, Nils Adermann <naderman@naderman.de>
|
of this software and associated documentation files (the "Software"), to deal
|
||||||
2016, Jordi Boggiano <j.boggiano@seld.be>
|
in the Software without restriction, including without limitation the rights
|
||||||
2013, Evan Coury <me@evancoury.com>
|
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
License: Expat and BSD-2-Clause
|
copies of the Software, and to permit persons to whom the Software is furnished
|
||||||
|
to do so, subject to the following conditions:
|
||||||
|
|
||||||
License: BSD-2-Clause
|
The above copyright notice and this permission notice shall be included in all
|
||||||
Redistribution and use in source and binary forms, with or without modification,
|
copies or substantial portions of the Software.
|
||||||
are permitted provided that the following conditions are met:
|
|
||||||
.
|
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
* Redistributions of source code must retain the above copyright notice,
|
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
this list of conditions and the following disclaimer.
|
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
.
|
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
* Redistributions in binary form must reproduce the above copyright notice,
|
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
this list of conditions and the following disclaimer in the documentation
|
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||||
and/or other materials provided with the distribution.
|
THE SOFTWARE.
|
||||||
.
|
|
||||||
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
|
||||||
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
|
||||||
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
|
||||||
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
|
|
||||||
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
|
||||||
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
|
||||||
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
|
|
||||||
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
||||||
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
|
||||||
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
|
|
||||||
License: Expat
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
of this software and associated documentation files (the "Software"), to deal
|
|
||||||
in the Software without restriction, including without limitation the rights
|
|
||||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
copies of the Software, and to permit persons to whom the Software is furnished
|
|
||||||
to do so, subject to the following conditions:
|
|
||||||
.
|
|
||||||
The above copyright notice and this permission notice shall be included in all
|
|
||||||
copies or substantial portions of the Software.
|
|
||||||
.
|
|
||||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
||||||
THE SOFTWARE.
|
|
||||||
|
|
12
3rdparty/vendor/composer/installed.json
vendored
12
3rdparty/vendor/composer/installed.json
vendored
|
@ -98,24 +98,24 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "robrichards/xmlseclibs",
|
"name": "robrichards/xmlseclibs",
|
||||||
"version": "3.0.2",
|
"version": "3.0.3",
|
||||||
"version_normalized": "3.0.2.0",
|
"version_normalized": "3.0.3.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/robrichards/xmlseclibs.git",
|
"url": "https://github.com/robrichards/xmlseclibs.git",
|
||||||
"reference": "1f4de0c0d121922aafd8c62c2a9f5e528830cf38"
|
"reference": "406c68ac9124db033d079284b719958b829cb830"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/robrichards/xmlseclibs/zipball/1f4de0c0d121922aafd8c62c2a9f5e528830cf38",
|
"url": "https://api.github.com/repos/robrichards/xmlseclibs/zipball/406c68ac9124db033d079284b719958b829cb830",
|
||||||
"reference": "1f4de0c0d121922aafd8c62c2a9f5e528830cf38",
|
"reference": "406c68ac9124db033d079284b719958b829cb830",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
"ext-openssl": "*",
|
"ext-openssl": "*",
|
||||||
"php": ">= 5.4"
|
"php": ">= 5.4"
|
||||||
},
|
},
|
||||||
"time": "2018-09-27T13:24:13+00:00",
|
"time": "2018-11-15T11:59:02+00:00",
|
||||||
"type": "library",
|
"type": "library",
|
||||||
"installation-source": "dist",
|
"installation-source": "dist",
|
||||||
"autoload": {
|
"autoload": {
|
||||||
|
|
|
@ -1,5 +1,14 @@
|
||||||
xmlseclibs.php
|
xmlseclibs.php
|
||||||
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|
||||||
|
15, Nov 2018, 3.0.3
|
||||||
|
Bug Fixes:
|
||||||
|
- Fix casing of class name. (Willem Stuursma-Ruwen)
|
||||||
|
- Fix Xpath casing. (Tim van Dijen)
|
||||||
|
|
||||||
|
Improvements:
|
||||||
|
- Make PCRE2 compliant. (Stefan Winter)
|
||||||
|
- Add PHP 7.3 support. (Stefan Winter)
|
||||||
|
|
||||||
27, Sep 2018, 3.0.2
|
27, Sep 2018, 3.0.2
|
||||||
Security Improvements:
|
Security Improvements:
|
||||||
- OpenSSL is now a requirement rather than suggestion. (Slaven Bacelic)
|
- OpenSSL is now a requirement rather than suggestion. (Slaven Bacelic)
|
||||||
|
|
|
@ -7,7 +7,7 @@ class XPath
|
||||||
const ALPHANUMERIC = '\w\d';
|
const ALPHANUMERIC = '\w\d';
|
||||||
const NUMERIC = '\d';
|
const NUMERIC = '\d';
|
||||||
const LETTERS = '\w';
|
const LETTERS = '\w';
|
||||||
const EXTENDED_ALPHANUMERIC = '\w\d\s-_:\.';
|
const EXTENDED_ALPHANUMERIC = '\w\d\s\-_:\.';
|
||||||
|
|
||||||
const SINGLE_QUOTE = '\'';
|
const SINGLE_QUOTE = '\'';
|
||||||
const DOUBLE_QUOTE = '"';
|
const DOUBLE_QUOTE = '"';
|
||||||
|
|
|
@ -471,7 +471,7 @@ class XMLSecEnc
|
||||||
}
|
}
|
||||||
$id = substr($uri, 1);
|
$id = substr($uri, 1);
|
||||||
|
|
||||||
$query = '//xmlsecenc:EncryptedKey[@Id="'.XPath::filterAttrValue($id, XPAth::DOUBLE_QUOTE).'"]';
|
$query = '//xmlsecenc:EncryptedKey[@Id="'.XPath::filterAttrValue($id, XPath::DOUBLE_QUOTE).'"]';
|
||||||
$keyElement = $xpath->query($query)->item(0);
|
$keyElement = $xpath->query($query)->item(0);
|
||||||
if (!$keyElement) {
|
if (!$keyElement) {
|
||||||
throw new Exception("Unable to locate EncryptedKey with @Id='$id'.");
|
throw new Exception("Unable to locate EncryptedKey with @Id='$id'.");
|
||||||
|
|
|
@ -486,15 +486,15 @@ class XMLSecurityDSig
|
||||||
|
|
||||||
$xPath = new DOMXPath($refNode->ownerDocument);
|
$xPath = new DOMXPath($refNode->ownerDocument);
|
||||||
if ($this->idNS && is_array($this->idNS)) {
|
if ($this->idNS && is_array($this->idNS)) {
|
||||||
foreach ($this->idNS AS $nspf => $ns) {
|
foreach ($this->idNS as $nspf => $ns) {
|
||||||
$xPath->registerNamespace($nspf, $ns);
|
$xPath->registerNamespace($nspf, $ns);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
$iDlist = '@Id="'.XPath::filterAttrValue($identifier, XPath::DOUBLE_QUOTE).'"';
|
$iDlist = '@Id="'.XPath::filterAttrValue($identifier, XPath::DOUBLE_QUOTE).'"';
|
||||||
if (is_array($this->idKeys)) {
|
if (is_array($this->idKeys)) {
|
||||||
foreach ($this->idKeys AS $idKey) {
|
foreach ($this->idKeys as $idKey) {
|
||||||
$iDlist .= " or @".XPath::filterAttrName($idKey).'="'.
|
$iDlist .= " or @".XPath::filterAttrName($idKey).'="'.
|
||||||
XPATH::filterAttrValue($identifier, XPAth::DOUBLE_QUOTE).'"';
|
XPath::filterAttrValue($identifier, XPath::DOUBLE_QUOTE).'"';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
$query = '//*['.$iDlist.']';
|
$query = '//*['.$iDlist.']';
|
||||||
|
|
|
@ -37,7 +37,7 @@
|
||||||
* @author Robert Richards <rrichards@cdatazone.org>
|
* @author Robert Richards <rrichards@cdatazone.org>
|
||||||
* @copyright 2007-2018 Robert Richards <rrichards@cdatazone.org>
|
* @copyright 2007-2018 Robert Richards <rrichards@cdatazone.org>
|
||||||
* @license http://www.opensource.org/licenses/bsd-license.php BSD License
|
* @license http://www.opensource.org/licenses/bsd-license.php BSD License
|
||||||
* @version 3.0.2
|
* @version 3.0.3-dev
|
||||||
*/
|
*/
|
||||||
|
|
||||||
$xmlseclibs_srcdir = dirname(__FILE__) . '/src/';
|
$xmlseclibs_srcdir = dirname(__FILE__) . '/src/';
|
||||||
|
|
Loading…
Reference in a new issue