/*\r
- * Copyright 2001-2007 Internet2\r
+ * Copyright 2001-2009 Internet2\r
* \r
* Licensed under the Apache License, Version 2.0 (the "License");\r
* you may not use this file except in compliance with the License.\r
#include <shibsp/exceptions.h>\r
#include <shibsp/SPConfig.h>\r
#include <shibsp/ServiceProvider.h>\r
+#include <shibsp/metadata/MetadataProviderCriteria.h>\r
#include <shibsp/util/SPConstants.h>\r
#include <saml/saml2/metadata/Metadata.h>\r
#include <xmltooling/logging.h>\r
using namespace xmltooling;\r
using namespace std;\r
\r
+using xercesc::XMLString;\r
+\r
void usage()\r
{\r
cerr << "usage: mdquery -e <entityID> [-a <app id> -nostrict]" << endl;\r
\r
if (!entityID) {\r
usage();\r
- exit(-10);\r
+ return -10;\r
}\r
\r
- char* path=getenv("SHIBSP_SCHEMAS");\r
- if (!path)\r
- path=SHIBSP_SCHEMAS;\r
- char* config=getenv("SHIBSP_CONFIG");\r
- if (!config)\r
- config=SHIBSP_CONFIG;\r
-\r
- XMLToolingConfig::getConfig().log_config(getenv("SHIBSP_LOGGING") ? getenv("SHIBSP_LOGGING") : SHIBSP_LOGGING);\r
-\r
- SPConfig& conf=SPConfig::getConfig();\r
- conf.setFeatures(SPConfig::Metadata | SPConfig::OutOfProcess);\r
- if (!conf.init(path))\r
- return -1;\r
-\r
if (rname) {\r
if (!protocol) {\r
if (prot)\r
protocol = XMLString::transcode(prot);\r
}\r
if (!protocol) {\r
- conf.term();\r
usage();\r
- exit(-10);\r
+ return -10;\r
}\r
}\r
\r
- try {\r
- static const XMLCh _path[] = UNICODE_LITERAL_4(p,a,t,h);\r
- static const XMLCh validate[] = UNICODE_LITERAL_8(v,a,l,i,d,a,t,e);\r
- xercesc::DOMDocument* dummydoc=XMLToolingConfig::getConfig().getParser().newDocument();\r
- XercesJanitor<xercesc::DOMDocument> docjanitor(dummydoc);\r
- xercesc::DOMElement* dummy = dummydoc->createElementNS(NULL,_path);\r
- auto_ptr_XMLCh src(config);\r
- dummy->setAttributeNS(NULL,_path,src.get());\r
- dummy->setAttributeNS(NULL,validate,xmlconstants::XML_ONE);\r
- conf.setServiceProvider(conf.ServiceProviderManager.newPlugin(XML_SERVICE_PROVIDER,dummy));\r
- conf.getServiceProvider()->init();\r
- }\r
- catch (exception&) {\r
+ SPConfig& conf=SPConfig::getConfig();\r
+ conf.setFeatures(SPConfig::Metadata | SPConfig::Trust | SPConfig::OutOfProcess | SPConfig::Credentials);\r
+ if (!conf.init())\r
+ return -1;\r
+ if (!conf.instantiate()) {\r
conf.term();\r
return -2;\r
}\r
}\r
\r
app->getMetadataProvider()->lock();\r
- const EntityDescriptor* entity = app->getMetadataProvider()->getEntityDescriptor(entityID, strict);\r
- if (entity) {\r
- if (rname) {\r
- const XMLCh* ns = rns ? XMLString::transcode(rns) : samlconstants::SAML20MD_NS;\r
- auto_ptr_XMLCh n(rname);\r
- QName q(ns, n.get());\r
- const RoleDescriptor* role = entity->getRoleDescriptor(q, protocol);\r
- if (role) {\r
- XMLHelper::serialize(role->marshall(), cout, true);\r
- }\r
- else {\r
- log.error("compatible role %s not found for (%s)", q.toString().c_str(), entityID);\r
- }\r
- }\r
- else {\r
- XMLHelper::serialize(entity->marshall(), cout, true);\r
- }\r
+ MetadataProviderCriteria mc(*app, entityID, NULL, NULL, strict);\r
+ if (rname) {\r
+ const XMLCh* ns = rns ? XMLString::transcode(rns) : samlconstants::SAML20MD_NS;\r
+ auto_ptr_XMLCh n(rname);\r
+ QName q(ns, n.get());\r
+ mc.role = &q;\r
+ mc.protocol = protocol;\r
+ const RoleDescriptor* role = app->getMetadataProvider()->getEntityDescriptor(mc).second;\r
+ if (role)\r
+ XMLHelper::serialize(role->marshall(), cout, true);\r
+ else\r
+ log.error("compatible role %s not found for (%s)", q.toString().c_str(), entityID);\r
}\r
else {\r
- log.error("no metadata found for (%s)", entityID);\r
+ const EntityDescriptor* entity = app->getMetadataProvider()->getEntityDescriptor(mc).first;\r
+ if (entity)\r
+ XMLHelper::serialize(entity->marshall(), cout, true);\r
+ else\r
+ log.error("no metadata found for (%s)", entityID);\r
}\r
\r
app->getMetadataProvider()->unlock();\r