projects
/
shibboleth
/
cpp-opensaml.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
980a4a1
)
Refactor signature engines.
author
Scott Cantor
<cantor.2@osu.edu>
Tue, 12 Jun 2007 01:38:22 +0000
(
01:38
+0000)
committer
Scott Cantor
<cantor.2@osu.edu>
Tue, 12 Jun 2007 01:38:22 +0000
(
01:38
+0000)
saml/binding/impl/SimpleSigningRule.cpp
patch
|
blob
|
history
saml/binding/impl/XMLSigningRule.cpp
patch
|
blob
|
history
samltest/security/AbstractPKIXTrustEngineTest.h
patch
|
blob
|
history
samltest/security/ExplicitKeyTrustEngineTest.h
patch
|
blob
|
history
diff --git
a/saml/binding/impl/SimpleSigningRule.cpp
b/saml/binding/impl/SimpleSigningRule.cpp
index
2c5a805
..
5d52df9
100644
(file)
--- a/
saml/binding/impl/SimpleSigningRule.cpp
+++ b/
saml/binding/impl/SimpleSigningRule.cpp
@@
-31,6
+31,7
@@
#include <log4cpp/Category.hh>
#include <xercesc/util/Base64.hpp>
#include <xmltooling/io/HTTPRequest.h>
#include <log4cpp/Category.hh>
#include <xercesc/util/Base64.hpp>
#include <xmltooling/io/HTTPRequest.h>
+#include <xmltooling/security/SignatureTrustEngine.h>
using namespace opensaml::saml2md;
using namespace opensaml;
using namespace opensaml::saml2md;
using namespace opensaml;
@@
-96,8
+97,10
@@
void SimpleSigningRule::evaluate(const XMLObject& message, const GenericRequest*
log.debug("ignoring message, no issuer metadata supplied");
return;
}
log.debug("ignoring message, no issuer metadata supplied");
return;
}
- else if (!policy.getTrustEngine()) {
- log.debug("ignoring message, no TrustEngine supplied");
+
+ const SignatureTrustEngine* sigtrust;
+ if (!(sigtrust=dynamic_cast<const SignatureTrustEngine*>(policy.getTrustEngine()))) {
+ log.debug("ignoring message, no SignatureTrustEngine supplied");
return;
}
return;
}
@@
-193,7
+196,7
@@
void SimpleSigningRule::evaluate(const XMLObject& message, const GenericRequest*
MetadataCredentialCriteria cc(*(policy.getIssuerMetadata()));
cc.setXMLAlgorithm(alg.get());
MetadataCredentialCriteria cc(*(policy.getIssuerMetadata()));
cc.setXMLAlgorithm(alg.get());
- if (!
policy.getTrustEngine()
->validate(alg.get(), signature, keyInfo, input.c_str(), input.length(), *(policy.getMetadataProvider()), &cc)) {
+ if (!
sigtrust
->validate(alg.get(), signature, keyInfo, input.c_str(), input.length(), *(policy.getMetadataProvider()), &cc)) {
log.error("unable to verify message signature with supplied trust engine");
if (m_errorsFatal)
throw SignatureException("Message was signed, but signature could not be verified.");
log.error("unable to verify message signature with supplied trust engine");
if (m_errorsFatal)
throw SignatureException("Message was signed, but signature could not be verified.");
diff --git
a/saml/binding/impl/XMLSigningRule.cpp
b/saml/binding/impl/XMLSigningRule.cpp
index
989cb05
..
3cb3daf
100644
(file)
--- a/
saml/binding/impl/XMLSigningRule.cpp
+++ b/
saml/binding/impl/XMLSigningRule.cpp
@@
-30,6
+30,7
@@
#include "signature/SignatureProfileValidator.h"
#include <log4cpp/Category.hh>
#include "signature/SignatureProfileValidator.h"
#include <log4cpp/Category.hh>
+#include <xmltooling/security/SignatureTrustEngine.h>
using namespace opensaml::saml2md;
using namespace opensaml;
using namespace opensaml::saml2md;
using namespace opensaml;
@@
-76,8
+77,10
@@
void XMLSigningRule::evaluate(const XMLObject& message, const GenericRequest* re
log.debug("ignoring message, no issuer metadata supplied");
return;
}
log.debug("ignoring message, no issuer metadata supplied");
return;
}
- else if (!policy.getTrustEngine()) {
- log.debug("ignoring message, no TrustEngine supplied");
+
+ const SignatureTrustEngine* sigtrust;
+ if (!(sigtrust=dynamic_cast<const SignatureTrustEngine*>(policy.getTrustEngine()))) {
+ log.debug("ignoring message, no SignatureTrustEngine supplied");
return;
}
return;
}
@@
-100,7
+103,7
@@
void XMLSigningRule::evaluate(const XMLObject& message, const GenericRequest* re
// Set up criteria object.
MetadataCredentialCriteria cc(*(policy.getIssuerMetadata()));
// Set up criteria object.
MetadataCredentialCriteria cc(*(policy.getIssuerMetadata()));
- if (!
policy.getTrustEngine()
->validate(*(signable->getSignature()), *(policy.getMetadataProvider()), &cc)) {
+ if (!
sigtrust
->validate(*(signable->getSignature()), *(policy.getMetadataProvider()), &cc)) {
log.error("unable to verify message signature with supplied trust engine");
if (m_errorsFatal)
throw SignatureException("Message was signed, but signature could not be verified.");
log.error("unable to verify message signature with supplied trust engine");
if (m_errorsFatal)
throw SignatureException("Message was signed, but signature could not be verified.");
diff --git
a/samltest/security/AbstractPKIXTrustEngineTest.h
b/samltest/security/AbstractPKIXTrustEngineTest.h
index
7188a1d
..
f627a71
100644
(file)
--- a/
samltest/security/AbstractPKIXTrustEngineTest.h
+++ b/
samltest/security/AbstractPKIXTrustEngineTest.h
@@
-141,7
+141,7
@@
public:
MetadataCredentialCriteria cc(*role);
cc.setPeerName("https://idp.example.org");
MetadataCredentialCriteria cc(*role);
cc.setPeerName("https://idp.example.org");
- TSM_ASSERT("Signature failed to validate.",
trustEngine
->validate(*sig, *metadataProvider, &cc));
+ TSM_ASSERT("Signature failed to validate.",
dynamic_cast<SignatureTrustEngine*>(trustEngine.get())
->validate(*sig, *metadataProvider, &cc));
descriptor = metadataProvider->getEntityDescriptor("https://idp2.example.org");
TSM_ASSERT("Retrieved entity descriptor was null", descriptor!=NULL);
descriptor = metadataProvider->getEntityDescriptor("https://idp2.example.org");
TSM_ASSERT("Retrieved entity descriptor was null", descriptor!=NULL);
@@
-151,6
+151,6
@@
public:
MetadataCredentialCriteria cc2(*role);
cc2.setPeerName("https://idp2.example.org");
MetadataCredentialCriteria cc2(*role);
cc2.setPeerName("https://idp2.example.org");
- TSM_ASSERT("Signature validated.", !
trustEngine
->validate(*sig, *metadataProvider, &cc2));
+ TSM_ASSERT("Signature validated.", !
dynamic_cast<SignatureTrustEngine*>(trustEngine.get())
->validate(*sig, *metadataProvider, &cc2));
}
};
}
};
diff --git
a/samltest/security/ExplicitKeyTrustEngineTest.h
b/samltest/security/ExplicitKeyTrustEngineTest.h
index
5753c45
..
0af1958
100644
(file)
--- a/
samltest/security/ExplicitKeyTrustEngineTest.h
+++ b/
samltest/security/ExplicitKeyTrustEngineTest.h
@@
-20,7
+20,7
@@
#include <saml/saml2/metadata/Metadata.h>
#include <saml/saml2/metadata/MetadataCredentialCriteria.h>
#include <saml/saml2/metadata/MetadataProvider.h>
#include <saml/saml2/metadata/Metadata.h>
#include <saml/saml2/metadata/MetadataCredentialCriteria.h>
#include <saml/saml2/metadata/MetadataProvider.h>
-#include <xmltooling/security/TrustEngine.h>
+#include <xmltooling/security/
Signature
TrustEngine.h>
using namespace opensaml::saml2;
using namespace opensaml::saml2md;
using namespace opensaml::saml2;
using namespace opensaml::saml2md;
@@
-84,7
+84,7
@@
public:
MetadataCredentialCriteria cc(*role);
cc.setPeerName("https://idp.example.org");
MetadataCredentialCriteria cc(*role);
cc.setPeerName("https://idp.example.org");
- TSM_ASSERT("Signature failed to validate.",
trustEngine
->validate(*sig, *metadataProvider, &cc));
+ TSM_ASSERT("Signature failed to validate.",
dynamic_cast<SignatureTrustEngine*>(trustEngine.get())
->validate(*sig, *metadataProvider, &cc));
descriptor = metadataProvider->getEntityDescriptor("https://idp2.example.org");
TSM_ASSERT("Retrieved entity descriptor was null", descriptor!=NULL);
descriptor = metadataProvider->getEntityDescriptor("https://idp2.example.org");
TSM_ASSERT("Retrieved entity descriptor was null", descriptor!=NULL);
@@
-94,6
+94,6
@@
public:
MetadataCredentialCriteria cc2(*role);
cc2.setPeerName("https://idp2.example.org");
MetadataCredentialCriteria cc2(*role);
cc2.setPeerName("https://idp2.example.org");
- TSM_ASSERT("Signature validated.", !
trustEngine
->validate(*sig, *metadataProvider, &cc2));
+ TSM_ASSERT("Signature validated.", !
dynamic_cast<SignatureTrustEngine*>(trustEngine.get())
->validate(*sig, *metadataProvider, &cc2));
}
};
}
};