Revision: 3186
Author: jaim...@gmail.com
Date: Tue Oct 9 03:31:13 2012
Log: Fixed a bug on ArtifactResolutionService introduced by a previous
commit on new SHA signatures support.
http://code.google.com/p/simplesamlphp/source/detail?r=3186
Modified:
/trunk/modules/saml/lib/Message.php
/trunk/www/saml2/idp/ArtifactResolutionService.php
=======================================
--- /trunk/modules/saml/lib/Message.php Mon Oct 1 07:17:09 2012
+++ /trunk/modules/saml/lib/Message.php Tue Oct 9 03:31:13 2012
@@ -11,13 +11,13 @@
class sspmod_saml_Message {
/**
- * Add signature key and and senders certificate to an element (Message
or Assertion).
+ * Add signature key and sender certificate to an element (Message or
Assertion).
*
* @param SimpleSAML_Configuration $srcMetadata The metadata of the
sender.
* @param SimpleSAML_Configuration $dstMetadata The metadata of the
recipient.
* @param SAML2_Message $element The element we should add the data to.
*/
- public static function addSign(SimpleSAML_Configuration $srcMetadata,
SimpleSAML_Configuration $dstMetadata = NULL, SAML2_SignedElement $element)
{
+ public static function addSign(SimpleSAML_Configuration $srcMetadata,
SimpleSAML_Configuration $dstMetadata, SAML2_SignedElement $element) {
$keyArray = SimpleSAML_Utilities::loadPrivateKey($srcMetadata,
TRUE);
$certArray = SimpleSAML_Utilities::loadPublicKey($srcMetadata,
FALSE);
=======================================
--- /trunk/www/saml2/idp/ArtifactResolutionService.php Wed Sep 7 01:25:24
2011
+++ /trunk/www/saml2/idp/ArtifactResolutionService.php Tue Oct 9 03:31:13
2012
@@ -34,6 +34,10 @@
if (!($request instanceof SAML2_ArtifactResolve)) {
throw new Exception('Message received on ArtifactResolutionService
wasn\'t a ArtifactResolve request.');
}
+
+$issuer = $request->getIssuer();
+$spMetadata = $metadata->getMetadataConfig($issuer, 'saml20-sp-remote');
+
$artifact = $request->getArtifact();
$responseData = $store->get('artifact', $artifact);
@@ -51,5 +55,5 @@
$artifactResponse->setIssuer($idpEntityId);
$artifactResponse->setInResponseTo($request->getId());
$artifactResponse->setAny($responseXML);
-sspmod_saml_Message::addSign($idpMetadata, NULL, $artifactResponse);
+sspmod_saml_Message::addSign($idpMetadata, $spMetadata, $artifactResponse);
$binding->send($artifactResponse);
--
You received this message because you are subscribed to the Google Groups
"simpleSAMLphp commits" group.
To post to this group, send email to simplesamlphp-commits@googlegroups.com.
To unsubscribe from this group, send email to
simplesamlphp-commits+unsubscr...@googlegroups.com.
For more options, visit this group at
http://groups.google.com/group/simplesamlphp-commits?hl=en.
