@@ -264,7 +264,7 @@ |
||
264 | 264 | if ($this->encryptedNameId === null) { |
265 | 265 | $this->nameId->toXML($root); |
266 | 266 | } else { |
267 | - $eid = $root->ownerDocument->createElementNS(Constants::NS_SAML, 'saml:' . 'EncryptedID'); |
|
267 | + $eid = $root->ownerDocument->createElementNS(Constants::NS_SAML, 'saml:'.'EncryptedID'); |
|
268 | 268 | $root->appendChild($eid); |
269 | 269 | $eid->appendChild($root->ownerDocument->importNode($this->encryptedNameId, true)); |
270 | 270 | } |
@@ -72,7 +72,7 @@ |
||
72 | 72 | if (strpos($keyword, "+") !== false) { |
73 | 73 | throw new \Exception('Keywords may not contain a "+" character.'); |
74 | 74 | } |
75 | - $value .= str_replace(' ', '+', $keyword) . ' '; |
|
75 | + $value .= str_replace(' ', '+', $keyword).' '; |
|
76 | 76 | } |
77 | 77 | $value = rtrim($value); |
78 | 78 | $e->appendChild($doc->createTextNode($value)); |
@@ -70,7 +70,7 @@ |
||
70 | 70 | SignedElement $signedElement, |
71 | 71 | CertificateProvider $configuration |
72 | 72 | ) { |
73 | - $this->certificates = array_map(function ($certificate) { |
|
73 | + $this->certificates = array_map(function($certificate) { |
|
74 | 74 | return X509::createFromCertificateData($certificate); |
75 | 75 | }, $this->certificates); |
76 | 76 |
@@ -44,7 +44,7 @@ discard block |
||
44 | 44 | case Constants::BINDING_PAOS: |
45 | 45 | return new SOAP(); |
46 | 46 | default: |
47 | - throw new \Exception('Unsupported binding: ' . var_export($urn, true)); |
|
47 | + throw new \Exception('Unsupported binding: '.var_export($urn, true)); |
|
48 | 48 | } |
49 | 49 | } |
50 | 50 | |
@@ -90,15 +90,15 @@ discard block |
||
90 | 90 | |
91 | 91 | $logger = Utils::getContainer()->getLogger(); |
92 | 92 | $logger->warning('Unable to find the SAML 2 binding used for this request.'); |
93 | - $logger->warning('Request method: ' . var_export($_SERVER['REQUEST_METHOD'], true)); |
|
93 | + $logger->warning('Request method: '.var_export($_SERVER['REQUEST_METHOD'], true)); |
|
94 | 94 | if (!empty($_GET)) { |
95 | - $logger->warning("GET parameters: '" . implode("', '", array_map('addslashes', array_keys($_GET))) . "'"); |
|
95 | + $logger->warning("GET parameters: '".implode("', '", array_map('addslashes', array_keys($_GET)))."'"); |
|
96 | 96 | } |
97 | 97 | if (!empty($_POST)) { |
98 | - $logger->warning("POST parameters: '" . implode("', '", array_map('addslashes', array_keys($_POST))) . "'"); |
|
98 | + $logger->warning("POST parameters: '".implode("', '", array_map('addslashes', array_keys($_POST)))."'"); |
|
99 | 99 | } |
100 | 100 | if (isset($_SERVER['CONTENT_TYPE'])) { |
101 | - $logger->warning('Content-Type: ' . var_export($_SERVER['CONTENT_TYPE'], true)); |
|
101 | + $logger->warning('Content-Type: '.var_export($_SERVER['CONTENT_TYPE'], true)); |
|
102 | 102 | } |
103 | 103 | |
104 | 104 | throw new \Exception('Unable to find the current binding.'); |
@@ -277,7 +277,7 @@ discard block |
||
277 | 277 | |
278 | 278 | if ($xml->getAttribute('Version') !== '2.0') { |
279 | 279 | /* Currently a very strict check. */ |
280 | - throw new \Exception('Unsupported version: ' . $xml->getAttribute('Version')); |
|
280 | + throw new \Exception('Unsupported version: '.$xml->getAttribute('Version')); |
|
281 | 281 | } |
282 | 282 | |
283 | 283 | $this->issueInstant = Utils::xsDateTimeToTimestamp($xml->getAttribute('IssueInstant')); |
@@ -379,7 +379,7 @@ discard block |
||
379 | 379 | continue; |
380 | 380 | } |
381 | 381 | if ($node->namespaceURI !== Constants::NS_SAML) { |
382 | - throw new \Exception('Unknown namespace of condition: ' . var_export($node->namespaceURI, true)); |
|
382 | + throw new \Exception('Unknown namespace of condition: '.var_export($node->namespaceURI, true)); |
|
383 | 383 | } |
384 | 384 | switch ($node->localName) { |
385 | 385 | case 'AudienceRestriction': |
@@ -402,7 +402,7 @@ discard block |
||
402 | 402 | /* Currently ignored. */ |
403 | 403 | break; |
404 | 404 | default: |
405 | - throw new \Exception('Unknown condition: ' . var_export($node->localName, true)); |
|
405 | + throw new \Exception('Unknown condition: '.var_export($node->localName, true)); |
|
406 | 406 | } |
407 | 407 | } |
408 | 408 | } |
@@ -589,7 +589,7 @@ discard block |
||
589 | 589 | } |
590 | 590 | |
591 | 591 | if ($type === 'xs:integer') { |
592 | - $this->attributes[$attributeName][] = (int)$value->textContent; |
|
592 | + $this->attributes[$attributeName][] = (int) $value->textContent; |
|
593 | 593 | } else { |
594 | 594 | $this->attributes[$attributeName][] = trim($value->textContent); |
595 | 595 | } |
@@ -1367,7 +1367,7 @@ discard block |
||
1367 | 1367 | $document = $parentElement->ownerDocument; |
1368 | 1368 | } |
1369 | 1369 | |
1370 | - $root = $document->createElementNS(Constants::NS_SAML, 'saml:' . 'Assertion'); |
|
1370 | + $root = $document->createElementNS(Constants::NS_SAML, 'saml:'.'Assertion'); |
|
1371 | 1371 | $parentElement->appendChild($root); |
1372 | 1372 | |
1373 | 1373 | /* Ugly hack to add another namespace declaration to the root element. */ |
@@ -1423,7 +1423,7 @@ discard block |
||
1423 | 1423 | if ($this->encryptedNameId === null) { |
1424 | 1424 | $this->nameId->toXML($subject); |
1425 | 1425 | } else { |
1426 | - $eid = $subject->ownerDocument->createElementNS(Constants::NS_SAML, 'saml:' . 'EncryptedID'); |
|
1426 | + $eid = $subject->ownerDocument->createElementNS(Constants::NS_SAML, 'saml:'.'EncryptedID'); |
|
1427 | 1427 | $subject->appendChild($eid); |
1428 | 1428 | $eid->appendChild($subject->ownerDocument->importNode($this->encryptedNameId, true)); |
1429 | 1429 | } |
@@ -1575,7 +1575,7 @@ discard block |
||
1575 | 1575 | if (is_array($this->attributesValueTypes) && array_key_exists($name, $this->attributesValueTypes)) { |
1576 | 1576 | $valueTypes = $this->attributesValueTypes[$name]; |
1577 | 1577 | if (is_array($valueTypes) && count($valueTypes) != count($values)) { |
1578 | - throw new \Exception('Array of value types and array of values have different size for attribute '. var_export($name, true)); |
|
1578 | + throw new \Exception('Array of value types and array of values have different size for attribute '.var_export($name, true)); |
|
1579 | 1579 | } |
1580 | 1580 | } else { |
1581 | 1581 | // if no type(s), default behaviour |
@@ -246,7 +246,7 @@ discard block |
||
246 | 246 | } |
247 | 247 | |
248 | 248 | foreach ($namespaces as $prefix => $uri) { |
249 | - $newElement->setAttributeNS($uri, $prefix . ':__ns_workaround__', 'tmp'); |
|
249 | + $newElement->setAttributeNS($uri, $prefix.':__ns_workaround__', 'tmp'); |
|
250 | 250 | $newElement->removeAttributeNS($uri, '__ns_workaround__'); |
251 | 251 | } |
252 | 252 | |
@@ -279,7 +279,7 @@ discard block |
||
279 | 279 | case 'true': |
280 | 280 | return true; |
281 | 281 | default: |
282 | - throw new \Exception('Invalid value of boolean attribute ' . var_export($attributeName, true) . ': ' . var_export($value, true)); |
|
282 | + throw new \Exception('Invalid value of boolean attribute '.var_export($attributeName, true).': '.var_export($value, true)); |
|
283 | 283 | } |
284 | 284 | } |
285 | 285 | |
@@ -423,7 +423,7 @@ discard block |
||
423 | 423 | $symKeyInfoAlgo = $symmetricKeyInfo->getAlgorithm(); |
424 | 424 | |
425 | 425 | if (in_array($symKeyInfoAlgo, $blacklist, true)) { |
426 | - throw new \Exception('Algorithm disabled: ' . var_export($symKeyInfoAlgo, true)); |
|
426 | + throw new \Exception('Algorithm disabled: '.var_export($symKeyInfoAlgo, true)); |
|
427 | 427 | } |
428 | 428 | |
429 | 429 | if ($symKeyInfoAlgo === XMLSecurityKey::RSA_OAEP_MGF1P && $inputKeyAlgo === XMLSecurityKey::RSA_1_5) { |
@@ -439,9 +439,9 @@ discard block |
||
439 | 439 | /* Make sure that the input key format is the same as the one used to encrypt the key. */ |
440 | 440 | if ($inputKeyAlgo !== $symKeyInfoAlgo) { |
441 | 441 | throw new \Exception( |
442 | - 'Algorithm mismatch between input key and key used to encrypt ' . |
|
443 | - ' the symmetric key for the message. Key was: ' . |
|
444 | - var_export($inputKeyAlgo, true) . '; message was: ' . |
|
442 | + 'Algorithm mismatch between input key and key used to encrypt '. |
|
443 | + ' the symmetric key for the message. Key was: '. |
|
444 | + var_export($inputKeyAlgo, true).'; message was: '. |
|
445 | 445 | var_export($symKeyInfoAlgo, true) |
446 | 446 | ); |
447 | 447 | } |
@@ -455,20 +455,20 @@ discard block |
||
455 | 455 | /* To protect against "key oracle" attacks, we need to be able to create a |
456 | 456 | * symmetric key, and for that we need to know the key size. |
457 | 457 | */ |
458 | - throw new \Exception('Unknown key size for encryption algorithm: ' . var_export($symmetricKey->type, true)); |
|
458 | + throw new \Exception('Unknown key size for encryption algorithm: '.var_export($symmetricKey->type, true)); |
|
459 | 459 | } |
460 | 460 | |
461 | 461 | try { |
462 | 462 | $key = $encKey->decryptKey($symmetricKeyInfo); |
463 | 463 | if (strlen($key) != $keySize) { |
464 | 464 | throw new \Exception( |
465 | - 'Unexpected key size (' . strlen($key) * 8 . 'bits) for encryption algorithm: ' . |
|
465 | + 'Unexpected key size ('.strlen($key)*8.'bits) for encryption algorithm: '. |
|
466 | 466 | var_export($symmetricKey->type, true) |
467 | 467 | ); |
468 | 468 | } |
469 | 469 | } catch (\Exception $e) { |
470 | 470 | /* We failed to decrypt this key. Log it, and substitute a "random" key. */ |
471 | - Utils::getContainer()->getLogger()->error('Failed to decrypt symmetric key: ' . $e->getMessage()); |
|
471 | + Utils::getContainer()->getLogger()->error('Failed to decrypt symmetric key: '.$e->getMessage()); |
|
472 | 472 | /* Create a replacement key, so that it looks like we fail in the same way as if the key was correctly padded. */ |
473 | 473 | |
474 | 474 | /* We base the symmetric key on the encrypted key and private key, so that we always behave the |
@@ -477,7 +477,7 @@ discard block |
||
477 | 477 | $encryptedKey = $encKey->getCipherValue(); |
478 | 478 | $pkey = openssl_pkey_get_details($symmetricKeyInfo->key); |
479 | 479 | $pkey = sha1(serialize($pkey), true); |
480 | - $key = sha1($encryptedKey . $pkey, true); |
|
480 | + $key = sha1($encryptedKey.$pkey, true); |
|
481 | 481 | |
482 | 482 | /* Make sure that the key has the correct length. */ |
483 | 483 | if (strlen($key) > $keySize) { |
@@ -492,8 +492,8 @@ discard block |
||
492 | 492 | /* Make sure that the input key has the correct format. */ |
493 | 493 | if ($inputKeyAlgo !== $symKeyAlgo) { |
494 | 494 | throw new \Exception( |
495 | - 'Algorithm mismatch between input key and key in message. ' . |
|
496 | - 'Key was: ' . var_export($inputKeyAlgo, true) . '; message was: ' . |
|
495 | + 'Algorithm mismatch between input key and key in message. '. |
|
496 | + 'Key was: '.var_export($inputKeyAlgo, true).'; message was: '. |
|
497 | 497 | var_export($symKeyAlgo, true) |
498 | 498 | ); |
499 | 499 | } |
@@ -502,7 +502,7 @@ discard block |
||
502 | 502 | |
503 | 503 | $algorithm = $symmetricKey->getAlgorithm(); |
504 | 504 | if (in_array($algorithm, $blacklist, true)) { |
505 | - throw new \Exception('Algorithm disabled: ' . var_export($algorithm, true)); |
|
505 | + throw new \Exception('Algorithm disabled: '.var_export($algorithm, true)); |
|
506 | 506 | } |
507 | 507 | |
508 | 508 | /** @var string $decrypted */ |
@@ -514,8 +514,8 @@ discard block |
||
514 | 514 | * namespaces needed to parse the XML. |
515 | 515 | */ |
516 | 516 | $xml = '<root xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" '. |
517 | - 'xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">' . |
|
518 | - $decrypted . |
|
517 | + 'xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">'. |
|
518 | + $decrypted. |
|
519 | 519 | '</root>'; |
520 | 520 | |
521 | 521 | try { |
@@ -554,7 +554,7 @@ discard block |
||
554 | 554 | * Something went wrong during decryption, but for security |
555 | 555 | * reasons we cannot tell the user what failed. |
556 | 556 | */ |
557 | - Utils::getContainer()->getLogger()->error('Decryption failed: ' . $e->getMessage()); |
|
557 | + Utils::getContainer()->getLogger()->error('Decryption failed: '.$e->getMessage()); |
|
558 | 558 | throw new \Exception('Failed to decrypt XML element.', 0, $e); |
559 | 559 | } |
560 | 560 | } |
@@ -716,7 +716,7 @@ discard block |
||
716 | 716 | $regex = '/^(\\d\\d\\d\\d)-(\\d\\d)-(\\d\\d)T(\\d\\d):(\\d\\d):(\\d\\d)(?:\\.\\d{1,9})?Z$/D'; |
717 | 717 | if (preg_match($regex, $time, $matches) == 0) { |
718 | 718 | throw new \Exception( |
719 | - 'Invalid SAML2 timestamp passed to xsDateTimeToTimestamp: ' . $time |
|
719 | + 'Invalid SAML2 timestamp passed to xsDateTimeToTimestamp: '.$time |
|
720 | 720 | ); |
721 | 721 | } |
722 | 722 |
@@ -16,7 +16,7 @@ discard block |
||
16 | 16 | */ |
17 | 17 | public function emergency($message, array $context = []) |
18 | 18 | { |
19 | - \SimpleSAML\Logger::emergency($message . ($context ? " " . var_export($context, true) : "")); |
|
19 | + \SimpleSAML\Logger::emergency($message.($context ? " ".var_export($context, true) : "")); |
|
20 | 20 | } |
21 | 21 | |
22 | 22 | /** |
@@ -31,7 +31,7 @@ discard block |
||
31 | 31 | */ |
32 | 32 | public function alert($message, array $context = []) |
33 | 33 | { |
34 | - \SimpleSAML\Logger::alert($message . ($context ? " " . var_export($context, true) : "")); |
|
34 | + \SimpleSAML\Logger::alert($message.($context ? " ".var_export($context, true) : "")); |
|
35 | 35 | } |
36 | 36 | |
37 | 37 | /** |
@@ -45,7 +45,7 @@ discard block |
||
45 | 45 | */ |
46 | 46 | public function critical($message, array $context = []) |
47 | 47 | { |
48 | - \SimpleSAML\Logger::critical($message . ($context ? " " . var_export($context, true) : "")); |
|
48 | + \SimpleSAML\Logger::critical($message.($context ? " ".var_export($context, true) : "")); |
|
49 | 49 | } |
50 | 50 | |
51 | 51 | /** |
@@ -58,7 +58,7 @@ discard block |
||
58 | 58 | */ |
59 | 59 | public function error($message, array $context = []) |
60 | 60 | { |
61 | - \SimpleSAML\Logger::error($message . ($context ? " " . var_export($context, true) : "")); |
|
61 | + \SimpleSAML\Logger::error($message.($context ? " ".var_export($context, true) : "")); |
|
62 | 62 | } |
63 | 63 | |
64 | 64 | /** |
@@ -73,7 +73,7 @@ discard block |
||
73 | 73 | */ |
74 | 74 | public function warning($message, array $context = []) |
75 | 75 | { |
76 | - \SimpleSAML\Logger::warning($message . ($context ? " " . var_export($context, true) : "")); |
|
76 | + \SimpleSAML\Logger::warning($message.($context ? " ".var_export($context, true) : "")); |
|
77 | 77 | } |
78 | 78 | |
79 | 79 | /** |
@@ -85,7 +85,7 @@ discard block |
||
85 | 85 | */ |
86 | 86 | public function notice($message, array $context = []) |
87 | 87 | { |
88 | - \SimpleSAML\Logger::notice($message . ($context ? " " . var_export($context, true) : "")); |
|
88 | + \SimpleSAML\Logger::notice($message.($context ? " ".var_export($context, true) : "")); |
|
89 | 89 | } |
90 | 90 | |
91 | 91 | /** |
@@ -99,7 +99,7 @@ discard block |
||
99 | 99 | */ |
100 | 100 | public function info($message, array $context = []) |
101 | 101 | { |
102 | - \SimpleSAML\Logger::info($message . ($context ? " " . var_export($context, true) : "")); |
|
102 | + \SimpleSAML\Logger::info($message.($context ? " ".var_export($context, true) : "")); |
|
103 | 103 | } |
104 | 104 | |
105 | 105 | /** |
@@ -111,7 +111,7 @@ discard block |
||
111 | 111 | */ |
112 | 112 | public function debug($message, array $context = []) |
113 | 113 | { |
114 | - \SimpleSAML\Logger::debug($message . ($context ? " " . var_export($context, true) : "")); |
|
114 | + \SimpleSAML\Logger::debug($message.($context ? " ".var_export($context, true) : "")); |
|
115 | 115 | } |
116 | 116 | |
117 | 117 | /** |
@@ -159,7 +159,7 @@ |
||
159 | 159 | $type = null; |
160 | 160 | } |
161 | 161 | |
162 | - $attributeValue = Utils::addString($attribute, Constants::NS_SAML, 'saml:AttributeValue', (string)$value); |
|
162 | + $attributeValue = Utils::addString($attribute, Constants::NS_SAML, 'saml:AttributeValue', (string) $value); |
|
163 | 163 | if ($type !== null) { |
164 | 164 | $attributeValue->setAttributeNS(Constants::NS_XSI, 'xsi:type', $type); |
165 | 165 | } |
@@ -67,13 +67,13 @@ |
||
67 | 67 | |
68 | 68 | // ported from |
69 | 69 | // https://github.com/simplesamlphp/simplesamlphp/blob/3d735912342767d391297cc5e13272a76730aca0/lib/SimpleSAML/Configuration.php#L1119 |
70 | - if ($configuration->hasValue($prefix . 'certificate')) { |
|
70 | + if ($configuration->hasValue($prefix.'certificate')) { |
|
71 | 71 | $extracted['certificateData'] = $configuration->getString($prefix.'certificate'); |
72 | 72 | } |
73 | 73 | |
74 | 74 | // ported from |
75 | 75 | // https://github.com/simplesamlphp/simplesamlphp/blob/3d735912342767d391297cc5e13272a76730aca0/modules/saml/lib/Message.php#L161 |
76 | - if ($configuration->hasValue($prefix . 'certFingerprint')) { |
|
76 | + if ($configuration->hasValue($prefix.'certFingerprint')) { |
|
77 | 77 | $extracted['certificateFingerprint'] = $configuration->getArrayizeString('certFingerprint'); |
78 | 78 | } |
79 | 79 |