projects
/
shibboleth
/
cpp-opensaml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Reducing header overuse, non-inlining selected methods (CPPOST-35).
[shibboleth/cpp-opensaml.git]
/
saml
/
binding
/
SOAPClient.h
diff --git
a/saml/binding/SOAPClient.h
b/saml/binding/SOAPClient.h
index
2c745cc
..
0941a6c
100644
(file)
--- a/
saml/binding/SOAPClient.h
+++ b/
saml/binding/SOAPClient.h
@@
-1,5
+1,5
@@
/*
/*
- * Copyright 2001-200
7
Internet2
+ * Copyright 2001-200
9
Internet2
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-23,11
+23,17
@@
#ifndef __saml_soap11client_h__
#define __saml_soap11client_h__
#ifndef __saml_soap11client_h__
#define __saml_soap11client_h__
-#include <saml/binding/SecurityPolicy.h>
+#include <saml/base.h>
+
#include <xmltooling/soap/SOAPClient.h>
namespace opensaml {
#include <xmltooling/soap/SOAPClient.h>
namespace opensaml {
+ class SAML_API SecurityPolicy;
+ namespace saml2md {
+ class SAML_API MetadataCredentialCriteria;
+ };
+
/**
* Specialized SOAPClient for SAML SOAP bindings.
*/
/**
* Specialized SOAPClient for SAML SOAP bindings.
*/
@@
-38,14
+44,10
@@
namespace opensaml {
* Creates a SOAP client instance with a particular SecurityPolicy.
*
* @param policy reference to SecurityPolicy to apply
* Creates a SOAP client instance with a particular SecurityPolicy.
*
* @param policy reference to SecurityPolicy to apply
- * @param validating controls schema validation
*/
*/
- SOAPClient(SecurityPolicy& policy, bool validating=false)
- : soap11::SOAPClient(validating), m_policy(policy), m_force(true), m_correlate(NULL) {}
+ SOAPClient(SecurityPolicy& policy);
- virtual ~SOAPClient() {
- XMLString::release(&m_correlate);
- }
+ virtual ~SOAPClient();
/**
* Controls whether to force transport/peer authentication via an X509TrustEngine.
/**
* Controls whether to force transport/peer authentication via an X509TrustEngine.
@@
-54,19
+56,21
@@
namespace opensaml {
*
* @param force true iff the client should refuse to communicate without this protection
*/
*
* @param force true iff the client should refuse to communicate without this protection
*/
- void forceTransportAuthentication(bool force=true) {
- m_force = force;
- }
+ void forceTransportAuthentication(bool force=true);
+ using soap11::SOAPClient::send;
+
/**
/**
- * Override prepares the SecurityPolicy by clearing Issuer identity, in case the policy
- * is reused.
+ * SAML-specific method uses metadata to determine the peer name and prepare the
+ * transport layer with peer credential information. The SecurityPolicy is also reset,
+ * in case the policy is reused.
*
* @param env SOAP envelope to send
*
* @param env SOAP envelope to send
- * @param peer peer to send message to, expressed in TrustEngine terms
+ * @param from identity of sending application
+ * @param to peer to send message to, expressed in metadata criteria terms
* @param endpoint URL of endpoint to recieve message
*/
* @param endpoint URL of endpoint to recieve message
*/
- v
oid send(const soap11::Envelope& env, const xmltooling::KeyInfoSource& peer
, const char* endpoint);
+ v
irtual void send(const soap11::Envelope& env, const char* from, saml2md::MetadataCredentialCriteria& to
, const char* endpoint);
/**
* Override applies SecurityPolicy to envelope before returning it.
/**
* Override applies SecurityPolicy to envelope before returning it.
@@
-77,6
+81,13
@@
namespace opensaml {
void reset();
void reset();
+ /**
+ * Returns the SecurityPolicy supplied to the client.
+ *
+ * @return the associated SecurityPolicy
+ */
+ SecurityPolicy& getPolicy() const;
+
protected:
/**
* Override prepares transport by assigning an X509TrustEngine to it, if one is
protected:
/**
* Override prepares transport by assigning an X509TrustEngine to it, if one is
@@
-84,7
+95,7
@@
namespace opensaml {
*
* @param transport reference to transport layer
*/
*
* @param transport reference to transport layer
*/
- void prepareTransport(
const
xmltooling::SOAPTransport& transport);
+ void prepareTransport(xmltooling::SOAPTransport& transport);
/** Reference to security policy to apply. */
SecurityPolicy& m_policy;
/** Reference to security policy to apply. */
SecurityPolicy& m_policy;
@@
-92,11
+103,11
@@
namespace opensaml {
/** Flag controlling whether transport/peer authn is mandatory. */
bool m_force;
/** Flag controlling whether transport/peer authn is mandatory. */
bool m_force;
- /** Message correlation ID. */
- XMLCh* m_correlate;
-
- private:
+ /** Metadata-based peer identity. */
const saml2md::RoleDescriptor* m_peer;
const saml2md::RoleDescriptor* m_peer;
+
+ /** Metadata-based CredentialCriteria for supplying credentials to TrustEngine. */
+ saml2md::MetadataCredentialCriteria* m_criteria;
};
};
};
};