/*
- * Copyright 2001-2006 Internet2
+ * Copyright 2001-2007 Internet2
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
#define __shibsp_sessioncache_h__
#include <shibsp/base.h>
-#include <saml/saml1/core/Assertions.h>
-#include <saml/saml2/metadata/Metadata.h>
+
+#ifndef SHIBSP_LITE
+# include <saml/saml1/core/Assertions.h>
+# include <saml/saml2/metadata/Metadata.h>
+#endif
#include <xmltooling/Lockable.h>
namespace shibsp {
virtual ~Session() {}
public:
/**
+ * Returns the session key.
+ *
+ * @return unique ID of session
+ */
+ virtual const char* getID() const=0;
+
+ /**
* Returns the address of the client associated with the session.
*
* @return the client's network address
* @return the IdP's entityID
*/
virtual const char* getEntityID() const=0;
-
+
/**
- * Returns the timestamp on the authentication event at the IdP.
+ * Returns the protocol family used to initiate the session.
+ *
+ * @return the protocol constant that represents the general SSO protocol used
+ */
+ virtual const char* getProtocol() const=0;
+
+ /**
+ * Returns the UTC timestamp on the authentication event at the IdP.
*
- * @return the authentication timestamp
+ * @return the UTC authentication timestamp
*/
- virtual time_t getAuthnInstant() const=0;
+ virtual const char* getAuthnInstant() const=0;
+#ifndef SHIBSP_LITE
/**
* Returns the NameID associated with a session.
*
* <p>SAML 1.x identifiers will be promoted to the 2.0 type.
*
- * @return reference to a SAML 2.0 NameID
+ * @return a SAML 2.0 NameID associated with the session, if any
*/
- virtual const opensaml::saml2::NameID& getNameID() const=0;
+ virtual const opensaml::saml2::NameID* getNameID() const=0;
+#endif
/**
* Returns the SessionIndex provided with the session.
virtual const char* getAuthnContextDeclRef() const=0;
/**
- * Returns the set of resolved attributes associated with the session.
+ * Returns the resolved attributes associated with the session.
*
- * @return an immutable array of attributes
+ * @return an immutable map of attributes keyed by attribute ID
*/
- virtual const std::vector<const Attribute*>& getAttributes() const=0;
-
- /**
- * Adds additional attributes to the session.
- *
- * @param attributes reference to an array of Attributes to cache (will be freed by cache)
- */
- virtual void addAttributes(const std::vector<Attribute*>& attributes)=0;
+ virtual const std::multimap<std::string,Attribute*>& getAttributes() const=0;
/**
* Returns the identifiers of the assertion(s) cached by the session.
*/
virtual const std::vector<const char*>& getAssertionIDs() const=0;
+#ifndef SHIBSP_LITE
+ /**
+ * Adds additional attributes to the session.
+ *
+ * @param attributes reference to an array of Attributes to cache (will be freed by cache)
+ */
+ virtual void addAttributes(const std::vector<Attribute*>& attributes)=0;
+
/**
* Returns an assertion cached by the session.
*
* @param id identifier of the assertion to retrieve
* @return pointer to assertion, or NULL
*/
- virtual const opensaml::RootObject* getAssertion(const char* id) const=0;
+ virtual const opensaml::Assertion* getAssertion(const char* id) const=0;
/**
* Stores an assertion in the session.
*
* @param assertion pointer to an assertion to cache (will be freed by cache)
*/
- virtual void addAssertion(opensaml::RootObject* assertion)=0;
+ virtual void addAssertion(opensaml::Assertion* assertion)=0;
+#endif
};
/**
* <p>The following XML content is supported to configure the cache:
* <dl>
* <dt>cacheTimeout</dt>
- * <dd>attribute containing maximum lifetime in seconds for sessions in cache</dd>
- * <dt>cleanupInterval</dt>
- * <dd>attribute containing interval in seconds between attempts to purge expired sessions</dd>
- * <dt>strictValidity</dt>
- * <dd>boolean attribute indicating whether to honor SessionNotOnOrAfter information</dd>
- * <dt>writeThrough</dt>
- * <dd>boolean attribute indicating that every access to a session should update persistent storage</dd>
+ * <dd>attribute containing maximum lifetime in seconds for unused sessions to remain in cache</dd>
* </dl>
*
* @param e root of DOM tree to configure the cache
*/
- SessionCache(const DOMElement* e);
+ SessionCache(const xercesc::DOMElement* e);
- /** maximum lifetime in seconds for sessions */
+ /** maximum lifetime in seconds for unused sessions to be cached */
unsigned long m_cacheTimeout;
- /** interval in seconds between attempts to purge expired sessions */
- unsigned long m_cleanupInterval;
-
- /** whether to honor SessionNotOnOrAfter information */
- bool m_strictValidity;
-
- /** whether every session access should update persistent storage */
- bool m_writeThrough;
-
public:
virtual ~SessionCache() {}
+#ifndef SHIBSP_LITE
/**
* Inserts a new session into the cache.
*
- * <p>The SSO token remains owned by the caller and must be copied by the
- * cache. Any Attributes supplied become the property of the cache.
+ * <p>The SSO tokens and Attributes remain owned by the caller and are copied by the cache.
*
- * @param application reference to Application that owns the Session
- * @param client_addr network address of client
- * @param ssoToken reference to SSO assertion initiating the session
- * @param issuer issuing metadata of assertion issuer, if known
- * @param attributes optional set of resolved Attributes to cache with session
+ * @param expires expiration time of session
+ * @param application reference to Application that owns the Session
+ * @param client_addr network address of client
+ * @param issuer issuing metadata of assertion issuer, if known
+ * @param protocol protocol family used to initiate the session
+ * @param nameid principal identifier, normalized to SAML 2, if any
+ * @param authn_instant UTC timestamp of authentication at IdP, if known
+ * @param session_index index of session between principal and IdP, if any
+ * @param authncontext_class method/category of authentication event, if known
+ * @param authncontext_decl specifics of authentication event, if known
+ * @param tokens assertions to cache with session, if any
+ * @param attributes optional map of resolved Attributes to cache with session
* @return newly created session's key
*/
virtual std::string insert(
+ time_t expires,
const Application& application,
- const char* client_addr,
- const opensaml::RootObject& ssoToken,
+ const char* client_addr=NULL,
const opensaml::saml2md::EntityDescriptor* issuer=NULL,
- const std::vector<Attribute*>* attributes=NULL
+ const XMLCh* protocol=NULL,
+ const opensaml::saml2::NameID* nameid=NULL,
+ const XMLCh* authn_instant=NULL,
+ const XMLCh* session_index=NULL,
+ const XMLCh* authncontext_class=NULL,
+ const XMLCh* authncontext_decl=NULL,
+ const std::vector<const opensaml::Assertion*>* tokens=NULL,
+ const std::multimap<std::string,Attribute*>* attributes=NULL
+ )=0;
+
+ /**
+ * Deletes an existing session or sessions.
+ *
+ * @param issuer source of session(s)
+ * @param nameid name identifier associated with the session(s) to terminate
+ * @param index index of session, or NULL for all sessions associated with other parameters
+ * @param application reference to Application that owns the session(s)
+ * @param sessions on exit, contains the IDs of the matching sessions removed
+ */
+ virtual void remove(
+ const opensaml::saml2md::EntityDescriptor* issuer,
+ const opensaml::saml2::NameID& nameid,
+ const char* index,
+ const Application& application,
+ std::vector<std::string>& sessions
)=0;
+#endif
/**
* Locates an existing session.
*
- * <p>If "writeThrough" is configured, then every attempt to locate a session
- * requires that the record be updated in persistent storage to reflect the fact
- * that it was accessed (to maintain timeout information).
+ * <p>If the client address is supplied, then a check will be performed against
+ * the address recorded in the record.
*
* @param key session key
* @param application reference to Application that owns the Session
* @param client_addr network address of client (if known)
+ * @param timeout inactivity timeout to enforce (0 for none, NULL to bypass check/update of last access)
* @return pointer to locked Session, or NULL
*/
- virtual Session* find(const char* key, const Application& application, const char* client_addr)=0;
+ virtual Session* find(
+ const char* key, const Application& application, const char* client_addr=NULL, time_t* timeout=NULL
+ )=0;
/**
* Deletes an existing session.
*
* @param key session key
* @param application reference to Application that owns the Session
- * @param client_addr network address of client (if known)
*/
- virtual void remove(const char* key, const Application& application, const char* client_addr)=0;
+ virtual void remove(const char* key, const Application& application)=0;
};
- /** SessionCache implementation that delegates to a remoted version. */
- #define REMOTED_SESSION_CACHE "edu.internet2.middleware.shibboleth.sp.provider.RemotedSessionCache"
-
+#ifndef SHIBSP_LITE
/** SessionCache implementation backed by a StorageService. */
- #define STORAGESERVICE_SESSION_CACHE "edu.internet2.middleware.shibboleth.sp.provider.StorageServiceSessionCache"
+ #define STORAGESERVICE_SESSION_CACHE "StorageService"
+#endif
+
+ /** SessionCache implementation for lite builds that delegates to a remoted version. */
+ #define REMOTED_SESSION_CACHE "Remoted"
/**
* Registers SessionCache classes into the runtime.
projects / shibboleth / sp.git / blobdiff