Heimdal portability fixes (except for reauth)
[mech_eap.orig] / util_attr.h
index 6141658..01f8e2f 100644 (file)
  * SUCH DAMAGE.
  */
 
+/*
+ * Attribute provider interface.
+ */
+
 #ifndef _UTIL_ATTR_H_
 #define _UTIL_ATTR_H_ 1
 
-#define ATTR_TYPE_RADIUS            0U
-#define ATTR_TYPE_SAML_ASSERTION    1U
-#define ATTR_TYPE_SAML              2U
-#define ATTR_TYPE_LOCAL             3U
-#define ATTR_TYPE_MIN               ATTR_TYPE_RADIUS
-#define ATTR_TYPE_MAX               (ATTR_TYPE_LOCAL + 1U)
+#ifdef HAVE_HEIMDAL_VERSION
+/* Removed in draft-ietf-kitten-gssapi-naming-exts-08 */
+typedef struct gss_any *gss_any_t;
+#endif
 
 #ifdef __cplusplus
 #include <string>
+#include <new>
 
+struct gss_eap_attr_provider;
 struct gss_eap_attr_ctx;
 
+typedef bool
+(*gss_eap_attr_enumeration_cb)(const gss_eap_attr_provider *source,
+                               const gss_buffer_t attribute,
+                               void *data);
+
+#define ATTR_TYPE_RADIUS            0U                  /* RADIUS AVPs */
+#define ATTR_TYPE_SAML_ASSERTION    1U                  /* SAML assertion */
+#define ATTR_TYPE_SAML              2U                  /* SAML attributes */
+#define ATTR_TYPE_LOCAL             3U                  /* Local attributes */
+#define ATTR_TYPE_MIN               ATTR_TYPE_RADIUS
+#define ATTR_TYPE_MAX               ATTR_TYPE_LOCAL
+
+#define ATTR_FLAG_DISABLE_LOCAL     0x00000001
+
+/*
+ * Attribute provider: this represents a source of attributes derived
+ * from the security context.
+ */
 struct gss_eap_attr_provider
 {
 public:
     gss_eap_attr_provider(void) {}
     virtual ~gss_eap_attr_provider(void) {}
 
-    virtual bool initFromExistingContext(const gss_eap_attr_ctx *source,
-                                         const gss_eap_attr_provider *ctx)
+    bool initWithManager(const gss_eap_attr_ctx *manager)
     {
-        m_source = source;
+        m_manager = manager;
         return true;
     }
 
-    virtual bool initFromGssContext(const gss_eap_attr_ctx *source,
+    virtual bool initFromExistingContext(const gss_eap_attr_ctx *manager,
+                                         const gss_eap_attr_provider *ctx)
+    {
+        return initWithManager(manager);
+    }
+
+    virtual bool initFromGssContext(const gss_eap_attr_ctx *manager,
                                     const gss_cred_id_t cred,
                                     const gss_ctx_id_t ctx)
     {
-        m_source = source;
-        return true;
+        return initWithManager(manager);
     }
 
-    typedef bool
-    gss_eap_attr_enumeration_cb(const gss_eap_attr_provider *provider,
-                                const gss_buffer_t attribute,
-                                void *data);
-
     virtual bool getAttributeTypes(gss_eap_attr_enumeration_cb, void *data) const
     {
         return false;
     }
 
-    virtual void setAttribute(int complete,
+    virtual bool setAttribute(int complete,
                               const gss_buffer_t attr,
-                              const gss_buffer_t value) {}
-    virtual void deleteAttribute(const gss_buffer_t value) {}
+                              const gss_buffer_t value) { return false; }
+    virtual bool deleteAttribute(const gss_buffer_t value) { return false; }
     virtual bool getAttribute(const gss_buffer_t attr,
                               int *authenticated,
                               int *complete,
@@ -93,39 +114,54 @@ public:
                                        gss_any_t input) const {}
 
     virtual void exportToBuffer(gss_buffer_t buffer) const {}
-    virtual bool initFromBuffer(const gss_eap_attr_ctx *ctx,
-                                const gss_buffer_t buffer) { return false; }
+    virtual bool initFromBuffer(const gss_eap_attr_ctx *manager,
+                                const gss_buffer_t buffer)
+    {
+        return initWithManager(manager);
+    }
+
+    virtual time_t getExpiryTime(void) const { return 0; }
 
-    static bool init() { return true; }
-    static void finalize() {}
+    virtual OM_uint32 mapException(OM_uint32 *minor, std::exception &e) const
+    { return GSS_S_CONTINUE_NEEDED; }
+
+    static bool init(void) { return true; }
+    static void finalize(void) {}
 
     static gss_eap_attr_provider *createAttrContext(void) { return NULL; }
 
 protected:
-    const gss_eap_attr_ctx *m_source;
+    const gss_eap_attr_ctx *m_manager;
+
+private:
+    /* make non-copyable */
+    gss_eap_attr_provider(const gss_eap_attr_provider&);
+    gss_eap_attr_provider& operator=(const gss_eap_attr_provider&);
 };
 
-typedef gss_eap_attr_provider *(*gss_eap_attr_create_factory)(void);
+typedef gss_eap_attr_provider *(*gss_eap_attr_create_provider)(void);
 
-struct gss_eap_attr_ctx : gss_eap_attr_provider
+/*
+ * Attribute context: this manages a set of providers for a given
+ * security context.
+ */
+struct gss_eap_attr_ctx
 {
 public:
     gss_eap_attr_ctx(void);
     ~gss_eap_attr_ctx(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,
+    bool initFromExistingContext(const gss_eap_attr_ctx *manager);
+    bool initFromGssContext(const gss_cred_id_t cred,
                             const gss_ctx_id_t ctx);
 
     bool getAttributeTypes(gss_eap_attr_enumeration_cb, void *data) const;
     bool getAttributeTypes(gss_buffer_set_t *attrs);
 
-    void setAttribute(int complete,
+    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 getAttribute(const gss_buffer_t attr,
                       int *authenticated,
                       int *complete,
@@ -138,10 +174,7 @@ public:
                                gss_any_t input) const;
 
     void exportToBuffer(gss_buffer_t buffer) const;
-    bool initFromBuffer(const gss_eap_attr_ctx *ctx,
-                        const gss_buffer_t buffer);
-    static bool init();
-    static void finalize();
+    bool initFromBuffer(const gss_buffer_t buffer);
 
     static unsigned int
     attributePrefixToType(const gss_buffer_t prefix);
@@ -176,16 +209,37 @@ public:
     gss_eap_attr_provider *getProvider(unsigned int type) const;
     gss_eap_attr_provider *getProvider(const gss_buffer_t prefix) const;
 
+    static void
+    registerProvider(unsigned int type,
+                     const char *prefix,
+                     gss_eap_attr_create_provider factory);
+    static void
+    unregisterProvider(unsigned int type);
+
+    time_t getExpiryTime(void) const;
+    OM_uint32 mapException(OM_uint32 *minor, std::exception &e) const;
+
 private:
-    gss_eap_attr_provider *m_providers[ATTR_TYPE_MAX];
+    bool providerEnabled(unsigned int type) const;
+    void releaseProvider(unsigned int type);
+
+    gss_eap_attr_provider *getPrimaryProvider(void) const;
+
+    /* make non-copyable */
+    gss_eap_attr_ctx(const gss_eap_attr_ctx&);
+    gss_eap_attr_ctx& operator=(const gss_eap_attr_ctx&);
+
+    uint32_t m_flags;
+    gss_eap_attr_provider *m_providers[ATTR_TYPE_MAX + 1];
 };
 
+#endif /* __cplusplus */
+
 #include "util_radius.h"
 #include "util_saml.h"
 #include "util_shib.h"
 
-#include <string>
-#include <new>
+#ifdef __cplusplus
 
 static inline void
 duplicateBuffer(gss_buffer_desc &src, gss_buffer_t dst)
@@ -215,9 +269,18 @@ struct gss_eap_attr_ctx;
 extern "C" {
 #endif
 
-struct gss_eap_attr_ctx *
-gssEapCreateAttrContext(gss_cred_id_t acceptorCred,
-                        gss_ctx_id_t acceptorCtx);
+/*
+ * C wrappers for attribute context functions. These match their
+ * GSS naming extension equivalents. The caller is required to
+ * obtain the name mutex.
+ */
+
+OM_uint32
+gssEapCreateAttrContext(OM_uint32 *minor,
+                        gss_cred_id_t acceptorCred,
+                        gss_ctx_id_t acceptorCtx,
+                        struct gss_eap_attr_ctx **pAttrCtx,
+                        time_t *pExpiryTime);
 
 OM_uint32
 gssEapInquireName(OM_uint32 *minor,
@@ -281,9 +344,6 @@ gssEapReleaseAttrContext(OM_uint32 *minor,
                          gss_name_t name);
 
 OM_uint32
-gssEapAttrProvidersInit(OM_uint32 *minor);
-
-OM_uint32
 gssEapAttrProvidersFinalize(OM_uint32 *minor);
 
 #ifdef __cplusplus