projects
/
shibboleth
/
cpp-sp-resolver.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4b34bfc
)
Check for empty issuer.
author
Scott Cantor
<cantor.2@osu.edu>
Thu, 21 Oct 2010 23:00:17 +0000
(23:00 +0000)
committer
Scott Cantor
<cantor.2@osu.edu>
Thu, 21 Oct 2010 23:00:17 +0000
(23:00 +0000)
shibresolver/resolver.cpp
patch
|
blob
|
history
diff --git
a/shibresolver/resolver.cpp
b/shibresolver/resolver.cpp
index
ce4a722
..
fe75fa2
100644
(file)
--- a/
shibresolver/resolver.cpp
+++ b/
shibresolver/resolver.cpp
@@
-281,10
+281,10
@@
void RemotedResolver::resolve(
pair<const EntityDescriptor*,const RoleDescriptor*> entity = pair<const EntityDescriptor*,const RoleDescriptor*>(nullptr,nullptr);
MetadataProvider* m = app.getMetadataProvider();
Locker locker(m);
pair<const EntityDescriptor*,const RoleDescriptor*> entity = pair<const EntityDescriptor*,const RoleDescriptor*>(nullptr,nullptr);
MetadataProvider* m = app.getMetadataProvider();
Locker locker(m);
- if (issuer) {
+ if (issuer
&& *issuer
) {
// Use metadata to locate the IdP's SSO service.
MetadataProviderCriteria mc(app, issuer, &IDPSSODescriptor::ELEMENT_QNAME, samlconstants::SAML20P_NS);
// Use metadata to locate the IdP's SSO service.
MetadataProviderCriteria mc(app, issuer, &IDPSSODescriptor::ELEMENT_QNAME, samlconstants::SAML20P_NS);
- entity
=
m->getEntityDescriptor(mc);
+ entity
=
m->getEntityDescriptor(mc);
if (!entity.first) {
log.warn("unable to locate metadata for provider (%s)", issuer);
throw MetadataException("Unable to locate metadata for identity provider ($entityID)", namedparams(1, "entityID", issuer));
if (!entity.first) {
log.warn("unable to locate metadata for provider (%s)", issuer);
throw MetadataException("Unable to locate metadata for identity provider ($entityID)", namedparams(1, "entityID", issuer));
@@
-300,7
+300,7
@@
void RemotedResolver::resolve(
AttributeExtractor* extractor = app.getAttributeExtractor();
if (extractor) {
Locker extlocker(extractor);
AttributeExtractor* extractor = app.getAttributeExtractor();
if (extractor) {
Locker extlocker(extractor);
- if (
issuer
) {
+ if (
entity.second
) {
pair<bool,const char*> mprefix = app.getString("metadataAttributePrefix");
if (mprefix.first) {
log.debug("extracting metadata-derived attributes...");
pair<bool,const char*> mprefix = app.getString("metadataAttributePrefix");
if (mprefix.first) {
log.debug("extracting metadata-derived attributes...");