From a577a2bf8f994498111531db1760f59e92f0c5e3 Mon Sep 17 00:00:00 2001
From: Olav Morken <olav.morken@uninett.no>
Date: Mon, 20 Oct 2008 08:28:42 +0000
Subject: [PATCH] SAML2/AuthnResponse: use SimpleSAML_Utilities::loadPublicKey
git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@926 44740490-163a-0410-bde0-09ae8108e29a
---
lib/SimpleSAML/XML/SAML20/AuthnResponse.php | 23 ++++++---------------
1 file changed, 6 insertions(+), 17 deletions(-)
diff --git a/lib/SimpleSAML/XML/SAML20/AuthnResponse.php b/lib/SimpleSAML/XML/SAML20/AuthnResponse.php
index 59a967e61..49959855d 100644
--- a/lib/SimpleSAML/XML/SAML20/AuthnResponse.php
+++ b/lib/SimpleSAML/XML/SAML20/AuthnResponse.php
@@ -246,26 +246,15 @@ class SimpleSAML_XML_SAML20_AuthnResponse extends SimpleSAML_XML_AuthnResponse {
/* Get the metadata of the issuer. */
$md = $this->metadata->getMetaData($this->issuer, 'saml20-idp-remote');
- $publickey = FALSE;
- if (isset($md['certificate'])) {
- $publickey = @file_get_contents($this->configuration->getPathValue('certdir') . $md['certificate']);
- if (!$publickey) {
- throw new Exception("Saml20-idp-remote id: " . $this-issuer . " 'certificate' set to ': " . $md['certificate'] . "', but no certificate found");
- }
- }
+ /* Load public key / certificate / certificate fingerprints. */
+ $publickey = SimpleSAML_Utilities::loadPublicKey($md);
+
/* Validate the signature. */
$this->validator = new SimpleSAML_XML_Validator($node, 'ID', $publickey);
-
- if (!$publickey) {
- if(array_key_exists('certFingerprint', $md)) {
-
- /* Get fingerprint for the certificate of the issuer. */
- $issuerFingerprint = $md['certFingerprint'];
-
- /* Validate the fingerprint. */
- $this->validator->validateFingerprint($issuerFingerprint);
- } elseif(array_key_exists('caFile', $md)) {
+ if (!$publickey) {
+ /* No validation of the certificate performed by the validator if $publickey isn't set. */
+ if(array_key_exists('caFile', $md)) {
/* Validation against a CA file. */
$this->validator->validateCA($this->configuration->getPathValue('certdir') . $md['caFile']);
--
GitLab