Better error reporting through com_err

[mech_eap.orig] / util_saml.h

diff --git a/util_saml.h b/util_saml.h
index 8c5a548..7a750a0 100644 (file)
--- a/util_saml.h
+++ b/util_saml.h
@@ -33,6 +33,8 @@
 #ifndef _UTIL_SAML_H_
 #define _UTIL_SAML_H_ 1
 
+#ifdef __cplusplus
+
 namespace opensaml {
     namespace saml2 {
         class Attribute;
@@ -43,13 +45,15 @@ namespace opensaml {
 
 struct gss_eap_saml_assertion_provider : gss_eap_attr_provider {
 public:
-    gss_eap_saml_assertion_provider(const gss_eap_attr_ctx *ctx);
-    gss_eap_saml_assertion_provider(const gss_eap_attr_ctx *ctx,
-                                    gss_cred_id_t acceptorCred,
-                                    gss_ctx_id_t acceptorCtx);
-
+    gss_eap_saml_assertion_provider(void);
     ~gss_eap_saml_assertion_provider(void);
 
+    bool initFromExistingContext(const gss_eap_attr_ctx *source,
+                                 const gss_eap_attr_provider *ctx);
+    bool initFromGssContext(const gss_eap_attr_ctx *source,
+                            const gss_cred_id_t cred,
+                            const gss_ctx_id_t ctx);
+
     bool getAttributeTypes(gss_eap_attr_enumeration_cb, void *data) const;
     void setAttribute(int complete,
                       const gss_buffer_t attr,
@@ -66,40 +70,41 @@ public:
     void releaseAnyNameMapping(gss_buffer_t type_id,
                                gss_any_t input) const;
 
-    void marshall(gss_buffer_t buffer) const;
-    bool unmarshall(const gss_eap_attr_ctx *ctx,
-                    const gss_buffer_t buffer);
-
-    void setAssertion(const opensaml::saml2::Assertion *assertion);
+    void exportToBuffer(gss_buffer_t buffer) const;
+    bool initFromBuffer(const gss_eap_attr_ctx *ctx,
+                        const gss_buffer_t buffer);
 
     const opensaml::saml2::Assertion *getAssertion(void) const {
         return m_assertion;
     }
+    bool authenticated(void) const {
+        return m_authenticated;
+    }
 
-    static bool init();
-    static void finalize();
+    time_t getExpiryTime(void) const;
+
+    static bool init(void);
+    static void finalize(void);
+
+    static gss_eap_attr_provider *createAttrContext(void);
 
-    static gss_eap_attr_provider *
-    createAttrContext(const gss_eap_attr_ctx *ctx,
-                           gss_cred_id_t acceptorCred,
-                           gss_ctx_id_t acceptorCtx);
 private:
     static opensaml::saml2::Assertion *
         parseAssertion(const gss_buffer_t buffer);
 
+    void setAssertion(const opensaml::saml2::Assertion *assertion,
+                      bool authenticated = false);
+    void setAssertion(const gss_buffer_t buffer,
+                      bool authenticated = false);
+
     opensaml::saml2::Assertion *m_assertion;
+    bool m_authenticated;
 };
 
 struct gss_eap_saml_attr_provider : gss_eap_attr_provider {
 public:
-    gss_eap_saml_attr_provider(const gss_eap_attr_ctx *ctx)
-        : gss_eap_attr_provider(ctx) {}
-
-    gss_eap_saml_attr_provider(const gss_eap_attr_ctx *ctx,
-                               gss_cred_id_t acceptorCred,
-                               gss_ctx_id_t acceptorCtx);
-
-    ~gss_eap_saml_attr_provider(void);
+    gss_eap_saml_attr_provider(void) {}
+    ~gss_eap_saml_attr_provider(void) {}
 
     bool getAttributeTypes(gss_eap_attr_enumeration_cb, void *data) const;
     void setAttribute(int complete,
@@ -117,22 +122,33 @@ public:
     void releaseAnyNameMapping(gss_buffer_t type_id,
                                gss_any_t input) const;
 
-    void marshall(gss_buffer_t buffer) const;
-    bool unmarshall(const gss_eap_attr_ctx *ctx,
-                    const gss_buffer_t buffer);
+    void exportToBuffer(gss_buffer_t buffer) const;
+    bool initFromBuffer(const gss_eap_attr_ctx *ctx,
+                        const gss_buffer_t buffer);
 
-    const opensaml::saml2::Attribute *
-        getAttribute(const gss_buffer_t attr) const;
+    bool getAttribute(const gss_buffer_t attr,
+                      int *authenticated,
+                      int *complete,
+                      const opensaml::saml2::Attribute **pAttribute) const;
+    bool getAssertion(int *authenticated,
+                      const opensaml::saml2::Assertion **pAssertion) const;
 
-    const opensaml::saml2::Assertion *getAssertion(void) const;
+    static bool init(void);
+    static void finalize(void);
 
-    static bool init();
-    static void finalize();
+    static gss_eap_attr_provider *createAttrContext(void);
 
-    static gss_eap_attr_provider *
-    createAttrContext(const gss_eap_attr_ctx *ctx,
-                           gss_cred_id_t acceptorCred,
-                           gss_ctx_id_t acceptorCtx);
+private:
 };
 
+extern "C" {
+#endif
+
+OM_uint32 gssEapSamlAttrProvidersInit(OM_uint32 *minor);
+OM_uint32 gssEapSamlAttrProvidersFinalize(OM_uint32 *minor);
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _UTIL_SAML_H_ */