X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fresolver.git;a=blobdiff_plain;f=shibresolver%2Fresolver.h;h=f9c1febf5f61470f8ca1670315a5ff0df73ef875;hp=947e8ab576bf5d59c7819d0239f9ecfa8a8416b3;hb=HEAD;hpb=ebc845ceb5411c95de71a8d7842f68283da60385 diff --git a/shibresolver/resolver.h b/shibresolver/resolver.h index 947e8ab..f9c1feb 100644 --- a/shibresolver/resolver.h +++ b/shibresolver/resolver.h @@ -35,16 +35,9 @@ namespace xmltooling { class XMLTOOL_API XMLObject; }; -#ifndef SHIBSP_LITE -namespace opensaml { - namespace saml2 { - class SAML_API Assertion; - }; -}; -#endif - namespace shibsp { class SHIBSP_API Attribute; + class SHIBSP_API SPRequest; }; namespace shibresolver { @@ -66,12 +59,12 @@ namespace shibresolver { virtual ~ShibbolethResolver(); /** - * Sets the calling service URI, making the Shibboleth SP responsible for + * Sets the calling service request, making the Shibboleth SP responsible for * mapping the service to an Application instance. * - * @param uri identifies the service performing attribute resolution + * @param request identifies the service request performing attribute resolution */ - void setServiceURI(const char* uri); + void setRequest(const shibsp::SPRequest* request); /** * Sets the application ID to use for resolution, bypassing the mapping @@ -89,23 +82,16 @@ namespace shibresolver { void setIssuer(const char* issuer); /** - * Adds a SAML token as input to the resolver. + * Adds an XML token as input to the resolver, generally a SAML assertion. *
The caller retains ownership of the object. * * @param token an input token to evaluate */ - void addToken( -#ifdef SHIBSP_LITE - const xmltooling::XMLObject* token -#else - const opensaml::saml2::Assertion* token -#endif - ); + void addToken(const xmltooling::XMLObject* token); /** * Adds an Attribute as input to the resolver. - *
The caller retains ownership of the object, but it MAY be modified - * during the resolution process. + *
The caller retains ownership of the object.
*
* @param attr an input Attribute
*/
@@ -149,7 +135,7 @@ namespace shibresolver {
#else
unsigned long features = shibsp::SPConfig::OutOfProcess,
#endif
- const char* config = nullptr,
+ const char* config = NULL,
bool rethrow = false
);
@@ -168,8 +154,8 @@ namespace shibresolver {
static ShibbolethResolver* create();
protected:
- /** Service URI */
- std::string m_serviceURI;
+ /** Service request. */
+ const shibsp::SPRequest* m_request;
/** Application ID. */
std::string m_appID;
@@ -178,18 +164,13 @@ namespace shibresolver {
std::string m_issuer;
/** Input tokens. */
-#ifdef SHIBSP_LITE
std::vector