Skip to content
Snippets Groups Projects
Commit 50d39dd5 authored by Olav Morken's avatar Olav Morken
Browse files

SAMLParser: Extract all supported public keys. 

git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@2508 44740490-163a-0410-bde0-09ae8108e29a
parent a688801a
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
lib/SimpleSAML/Metadata/SAMLParser.php
+ 12
− 78
View file @ 50d39dd5
...@@ -466,24 +466,9 @@ class SimpleSAML_Metadata_SAMLParser { ...@@ -466,24 +466,9 @@ class SimpleSAML_Metadata_SAMLParser {
$ret['description'] = $spd['description']; $ret['description'] = $spd['description'];
} }
/* Add certificate data. Only the first valid certificate will be added. */ /* Add public keys. */
foreach($spd['keys'] as $key) { if (!empty($spd['keys'])) {
if($key['type'] !== 'X509Certificate') { $ret['keys'] = $spd['keys'];
continue;
}
if ($key['signing'] !== TRUE) {
continue;
}
$certData = base64_decode($key['X509Certificate']);
if($certData === FALSE) {
/* Empty/invalid certificate. */
continue;
}
$ret['certData'] = preg_replace('/\s+/', '', str_replace(array("\r", "\n"), '', $key['X509Certificate']));
break;
} }
/* Add extensions. */ /* Add extensions. */
...@@ -532,27 +517,9 @@ class SimpleSAML_Metadata_SAMLParser { ...@@ -532,27 +517,9 @@ class SimpleSAML_Metadata_SAMLParser {
/* Find the ArtifactResolutionService endpoint. */ /* Find the ArtifactResolutionService endpoint. */
$ret['ArtifactResolutionService'] = $idp['ArtifactResolutionService']; $ret['ArtifactResolutionService'] = $idp['ArtifactResolutionService'];
/* Add certificate to metadata. Only the first valid certificate will be added. */ /* Add public keys. */
$ret['certFingerprint'] = array(); if (!empty($idp['keys'])) {
foreach($idp['keys'] as $key) { $ret['keys'] = $idp['keys'];
if($key['type'] !== 'X509Certificate') {
continue;
}
if ($key['signing'] !== TRUE) {
continue;
}
$certData = base64_decode($key['X509Certificate']);
if($certData === FALSE) {
/* Empty/invalid certificate. */
continue;
}
/* Add the certificate data to the metadata. Only the first certificate will be added. */
$ret['certData'] = preg_replace('/\s+/', '', str_replace(array("\r", "\n"), '', $key['X509Certificate']));
$ret['certFingerprint'][] = sha1($certData);
break;
} }
/* Add extensions. */ /* Add extensions. */
...@@ -626,24 +593,9 @@ class SimpleSAML_Metadata_SAMLParser { ...@@ -626,24 +593,9 @@ class SimpleSAML_Metadata_SAMLParser {
$ret['description'] = $spd['description']; $ret['description'] = $spd['description'];
} }
/* Add certificate data. Only the first valid certificate will be added. */ /* Add public keys. */
foreach($spd['keys'] as $key) { if (!empty($spd['keys'])) {
if($key['type'] !== 'X509Certificate') { $ret['keys'] = $spd['keys'];
continue;
}
if ($key['signing'] !== TRUE) {
continue;
}
$certData = base64_decode($key['X509Certificate']);
if($certData === FALSE) {
/* Empty/invalid certificate. */
continue;
}
$ret['certData'] = preg_replace('/\s+/', '', str_replace(array("\r", "\n"), '', $key['X509Certificate']));
break;
} }
...@@ -706,27 +658,9 @@ class SimpleSAML_Metadata_SAMLParser { ...@@ -706,27 +658,9 @@ class SimpleSAML_Metadata_SAMLParser {
$ret['ArtifactResolutionService'] = $idp['ArtifactResolutionService']; $ret['ArtifactResolutionService'] = $idp['ArtifactResolutionService'];
/* Add certificate to metadata. Only the first valid certificate will be added. */ /* Add public keys. */
$ret['certFingerprint'] = array(); if (!empty($idp['keys'])) {
foreach($idp['keys'] as $key) { $ret['keys'] = $idp['keys'];
if($key['type'] !== 'X509Certificate') {
continue;
}
if ($key['signing'] !== TRUE) {
continue;
}
$certData = base64_decode($key['X509Certificate']);
if($certData === FALSE) {
/* Empty/invalid certificate. */
continue;
}
/* Add the certificate data to the metadata. Only the first certificate will be added. */
$ret['certData'] = preg_replace('/\s+/', '', str_replace(array("\r", "\n"), '', $key['X509Certificate']));
$ret['certFingerprint'][] = sha1($certData);
break;
} }
/* Add extensions. */ /* Add extensions. */
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment