use JSON instead of DDF marshalling

[mech_eap.git] / util_shib.h

diff --git a/util_shib.h b/util_shib.h
index aa5cd14..7cacd66 100644 (file)
--- a/util_shib.h
+++ b/util_shib.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, JANET(UK)
+ * Copyright (c) 2011, JANET(UK)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -30,27 +30,40 @@
  * SUCH DAMAGE.
  */
 
+/*
+ * Local attribute provider.
+ */
+
 #ifndef _UTIL_SHIB_H_
 #define _UTIL_SHIB_H_ 1
 
+#ifdef __cplusplus
+
 #include <vector>
 
 namespace shibsp {
     class Attribute;
 };
 
+namespace shibresolver {
+    class ShibbolethResolver;
+};
+
 struct gss_eap_shib_attr_provider : gss_eap_attr_provider {
 public:
-    gss_eap_shib_attr_provider(const gss_eap_attr_ctx *ctx);
-    gss_eap_shib_attr_provider(const gss_eap_attr_ctx *ctx,
-                               gss_cred_id_t acceptorCred,
-                               gss_ctx_id_t acceptorCtx);
+    gss_eap_shib_attr_provider(void);
     ~gss_eap_shib_attr_provider(void);
 
-    void setAttribute(int complete,
+    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 setAttribute(int complete,
                       const gss_buffer_t attr,
                       const gss_buffer_t value);
-    void deleteAttribute(const gss_buffer_t value);
+    bool deleteAttribute(const gss_buffer_t value);
     bool getAttributeTypes(gss_eap_attr_enumeration_cb, void *data) const;
     bool getAttribute(const gss_buffer_t attr,
                       int *authenticated,
@@ -63,27 +76,52 @@ 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);
+    const char *prefix(void) const;
+    const char *name(void) const;
+    bool initWithJsonObject(const gss_eap_attr_ctx *manager,
+                           json_t *obj);
+    json_t *jsonRepresentation(void) const;
 
+    static bool init(void);
+    static void finalize(void);
 
-    static bool init();
-    static void finalize();
+    OM_uint32 mapException(OM_uint32 *minor, std::exception &e) const;
 
-    static gss_eap_attr_provider *
-    createAttrContext(const gss_eap_attr_ctx *ctx,
-                      gss_cred_id_t acceptorCred,
-                           gss_ctx_id_t acceptorCtx);
-private:
-    int getAttributeIndex(const gss_buffer_t attr) const;
-    const shibsp::Attribute *getAttribute(const gss_buffer_t attr) const;
+    static gss_eap_attr_provider *createAttrContext(void);
 
-    const std::vector<shibsp::Attribute *> getAttributes(void) const {
+    std::vector<shibsp::Attribute *> getAttributes(void) const {
         return m_attributes;
     }
 
+private:
+    static shibsp::Attribute *
+        duplicateAttribute(const shibsp::Attribute *src);
+    static std::vector <shibsp::Attribute *>
+        duplicateAttributes(const std::vector <shibsp::Attribute *>src);
+
+    ssize_t getAttributeIndex(const gss_buffer_t attr) const;
+    const shibsp::Attribute *getAttribute(const gss_buffer_t attr) const;
+
+    bool authenticated(void) const { return m_authenticated; }
+
+    friend bool
+    addRadiusAttribute(const gss_eap_attr_provider *source,
+                       const gss_buffer_t attribute,
+                       void *data);
+
     std::vector<shibsp::Attribute *> m_attributes;
+    int m_authenticated;
 };
 
+
+extern "C" {
+#endif
+
+OM_uint32 gssEapLocalAttrProviderInit(OM_uint32 *minor);
+OM_uint32 gssEapLocalAttrProviderFinalize(OM_uint32 *minor);
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _UTIL_SHIB_H_ */