[cpp-sp] branch master updated: Remove deprecated insert method on SessionCache.

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch master
in repository cpp-sp.

View the commit online:
http://git.shibboleth.net/view/?p=cpp-sp.git;a=commit;h=0e07ad622a6f6fd4ba61e27ff0248e6c4bcda226

The following commit(s) were added to refs/heads/master by this push:
       new  0e07ad6   Remove deprecated insert method on SessionCache.
0e07ad6 is described below

commit 0e07ad622a6f6fd4ba61e27ff0248e6c4bcda226
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Feb 5 14:51:20 2018 -0500

    Remove deprecated insert method on SessionCache.
---
 shibsp/SessionCache.h                      | 39 +-------------------------
 shibsp/impl/StorageServiceSessionCache.cpp | 44 ------------------------------
 2 files changed, 1 insertion(+), 82 deletions(-)

diff --git a/shibsp/SessionCache.h b/shibsp/SessionCache.h
index 7b7a6d6..35d3ec6 100644
--- a/shibsp/SessionCache.h
+++ b/shibsp/SessionCache.h
@@ -232,43 +232,6 @@ namespace shibsp {
 
 #ifndef SHIBSP_LITE
         /**
-         * @deprecated
-         * Inserts a new session into the cache and binds the session to the outgoing
-         * client response.
-         *
-         * <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 httpRequest       request that initiated session
-         * @param httpResponse      current response to client
-         * @param expires           expiration time of session
-         * @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 array of resolved Attributes to cache with session
-         */
-        virtual void insert(
-            const Application& application,
-            const xmltooling::HTTPRequest& httpRequest,
-            xmltooling::HTTPResponse& httpResponse,
-            time_t expires,
-            const opensaml::saml2md::EntityDescriptor* issuer=nullptr,
-            const XMLCh* protocol=nullptr,
-            const opensaml::saml2::NameID* nameid=nullptr,
-            const XMLCh* authn_instant=nullptr,
-            const XMLCh* session_index=nullptr,
-            const XMLCh* authncontext_class=nullptr,
-            const XMLCh* authncontext_decl=nullptr,
-            const std::vector<const opensaml::Assertion*>* tokens=nullptr,
-            const std::vector<Attribute*>* attributes=nullptr
-            )=0;
-
-        /**
          * Inserts a new session into the cache and binds the session to the outgoing
          * client response.
          *
@@ -306,7 +269,7 @@ namespace shibsp {
             const XMLCh* authncontext_decl=nullptr,
             const std::vector<const opensaml::Assertion*>* tokens=nullptr,
             const std::vector<Attribute*>* attributes=nullptr
-            );
+            )=0;
 
         /**
          * Determines whether the Session bound to a client request matches a set of input criteria.
diff --git a/shibsp/impl/StorageServiceSessionCache.cpp b/shibsp/impl/StorageServiceSessionCache.cpp
index d864504..d8e5039 100644
--- a/shibsp/impl/StorageServiceSessionCache.cpp
+++ b/shibsp/impl/StorageServiceSessionCache.cpp
@@ -99,26 +99,6 @@ namespace {
         void receive(DDF& in, ostream& out);
 
         void insert(
-            const Application& app,
-            const HTTPRequest& httpRequest,
-            HTTPResponse& httpResponse,
-            time_t expires,
-            const EntityDescriptor* issuer=nullptr,
-            const XMLCh* protocol=nullptr,
-            const saml2::NameID* nameid=nullptr,
-            const XMLCh* authn_instant=nullptr,
-            const XMLCh* session_index=nullptr,
-            const XMLCh* authncontext_class=nullptr,
-            const XMLCh* authncontext_decl=nullptr,
-            const vector<const Assertion*>* tokens=nullptr,
-            const vector<Attribute*>* attributes=nullptr
-            ) {
-            string dummy;
-            insert(dummy, app, httpRequest, httpResponse, expires, issuer, protocol, nameid,
-                    authn_instant, session_index, authncontext_class, authncontext_decl, tokens, attributes);
-        }
-
-        void insert(
             string& sessionID,
             const Application& app,
             const HTTPRequest& httpRequest,
@@ -876,30 +856,6 @@ SessionCache::~SessionCache()
 {
 }
 
-#ifndef SHIBSP_LITE
-
-void SessionCache::insert(
-    string& sessionID,
-    const Application& app,
-    const HTTPRequest& httpRequest,
-    HTTPResponse& httpResponse,
-    time_t expires,
-    const EntityDescriptor* issuer,
-    const XMLCh* protocol,
-    const saml2::NameID* nameid,
-    const XMLCh* authn_instant,
-    const XMLCh* session_index,
-    const XMLCh* authncontext_class,
-    const XMLCh* authncontext_decl,
-    const vector<const Assertion*>* tokens,
-    const vector<Attribute*>* attributes
-    ) {
-    return insert(app, httpRequest, httpResponse, expires, issuer, protocol, nameid,
-            authn_instant, session_index, authncontext_class, authncontext_decl, tokens, attributes);
-}
-
-#endif
-
 SessionCacheEx::SessionCacheEx()
 {
 }

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.