factory out prefix registration

diff --git a/mech_eap/util_attr.cpp b/mech_eap/util_attr.cpp
index d41c8d7..398aa57 100644 (file)
--- a/mech_eap/util_attr.cpp
+++ b/mech_eap/util_attr.cpp
@@ -36,14 +36,36 @@
 #include <exception>
 #include <new>
 
-static gss_eap_attr_create_factory
-gss_eap_attr_factories[ATTR_TYPE_MAX];
+static gss_eap_attr_create_provider gssEapAttrFactories[ATTR_TYPE_MAX];
+static gss_buffer_desc gssEapAttrPrefixes[ATTR_TYPE_MAX];
 
 void
 gss_eap_attr_ctx::registerProvider(unsigned int type,
-                                   gss_eap_attr_create_factory factory)
+                                   const char *prefix,
+                                   gss_eap_attr_create_provider factory)
 {
-    gss_eap_attr_factories[type] = factory;
+    assert(type < ATTR_TYPE_MAX);
+
+    assert(gssEapAttrFactories[type] == NULL);
+
+    gssEapAttrFactories[type] = factory;
+    if (prefix != NULL) {
+        gssEapAttrPrefixes[type].value = (void *)prefix;
+        gssEapAttrPrefixes[type].length = strlen(prefix);
+    } else {
+        gssEapAttrPrefixes[type].value = NULL;
+        gssEapAttrPrefixes[type].length = 0;
+    }
+}
+
+void
+gss_eap_attr_ctx::unregisterProvider(unsigned int type)
+{
+    assert(type < ATTR_TYPE_MAX);
+
+    gssEapAttrFactories[type] = NULL;
+    gssEapAttrPrefixes[type].value = NULL;
+    gssEapAttrPrefixes[type].length = 0;
 }
 
 gss_eap_attr_ctx::gss_eap_attr_ctx(void)
@@ -51,12 +73,34 @@ gss_eap_attr_ctx::gss_eap_attr_ctx(void)
     for (unsigned int i = 0; i < ATTR_TYPE_MAX; i++) {
         gss_eap_attr_provider *provider;
 
-        provider = (gss_eap_attr_factories[i])();
+        provider = (gssEapAttrFactories[i])();
 
         m_providers[i] = provider;
     }
 }
 
+unsigned int
+gss_eap_attr_ctx::attributePrefixToType(const gss_buffer_t prefix)
+{
+    unsigned int i;
+
+    for (i = ATTR_TYPE_MIN; i < ATTR_TYPE_LOCAL; i++) {
+        if (bufferEqual(&gssEapAttrPrefixes[i], prefix))
+            return i;
+    }
+
+    return ATTR_TYPE_LOCAL;
+}
+
+const gss_buffer_t
+gss_eap_attr_ctx::attributeTypeToPrefix(unsigned int type)
+{
+    if (type < ATTR_TYPE_MIN || type >= ATTR_TYPE_LOCAL)
+        return GSS_C_NO_BUFFER;
+
+    return &gssEapAttrPrefixes[type];
+}
+
 bool
 gss_eap_attr_ctx::initFromExistingContext(const gss_eap_attr_ctx *manager,
                                           const gss_eap_attr_provider *provider)
@@ -104,24 +148,6 @@ gss_eap_attr_ctx::~gss_eap_attr_ctx(void)
         delete m_providers[i];
 }
 
-bool
-gss_eap_attr_ctx::init(void)
-{
-    return gss_eap_radius_attr_provider::init() &&
-           gss_eap_saml_assertion_provider::init() &&
-           gss_eap_saml_attr_provider::init() &&
-           gss_eap_shib_attr_provider::init();
-}
-
-void
-gss_eap_attr_ctx::finalize(void)
-{
-    gss_eap_shib_attr_provider::finalize();
-    gss_eap_saml_attr_provider::finalize();
-    gss_eap_saml_assertion_provider::finalize();
-    gss_eap_radius_attr_provider::finalize();
-}
-
 gss_eap_attr_provider *
 gss_eap_attr_ctx::getProvider(unsigned int type) const
 {
@@ -340,49 +366,6 @@ mapException(OM_uint32 *minor, std::exception &e)
     return GSS_S_FAILURE;
 }
 
-static gss_buffer_desc attributePrefixes[] = {
-    {
-        /* ATTR_TYPE_RADIUS_AVP */
-        sizeof("urn:ietf:params:gss-eap:radius-avp"),
-        (void *)"urn:ietf:params:gss-eap:radius-avp",
-    },
-    {
-        /* ATTR_TYPE_SAML_AAA_ASSERTION */
-        sizeof("urn:ietf:params:gss-eap:saml-aaa-assertion"),
-        (void *)"urn:ietf:params:gss-eap:saml-aaa-assertion"
-    },
-    {
-        /* ATTR_TYPE_SAML_ATTR */
-        sizeof("urn:ietf:params:gss-eap:saml-attr"),
-        (void *)"urn:ietf:params:gss-eap:saml-attr"
-    },
-};
-
-unsigned int
-gss_eap_attr_ctx::attributePrefixToType(const gss_buffer_t prefix)
-{
-    unsigned int i;
-
-    for (i = ATTR_TYPE_MIN;
-         i < sizeof(attributePrefixes) / sizeof(attributePrefixes[0]);
-         i++)
-    {
-        if (bufferEqual(&attributePrefixes[i], prefix))
-            return i;
-    }
-
-    return ATTR_TYPE_LOCAL;
-}
-
-const gss_buffer_t
-gss_eap_attr_ctx::attributeTypeToPrefix(unsigned int type)
-{
-    if (type < ATTR_TYPE_MIN || type >= ATTR_TYPE_LOCAL)
-        return GSS_C_NO_BUFFER;
-
-    return &attributePrefixes[type];
-}
-
 void
 gss_eap_attr_ctx::decomposeAttributeName(const gss_buffer_t attribute,
                                          gss_buffer_t prefix,
@@ -690,19 +673,26 @@ OM_uint32
 gssEapAttrProvidersInit(OM_uint32 *minor)
 {
     try {
-        gss_eap_attr_ctx::init();
+        if (gss_eap_radius_attr_provider::init()    &&
+            gss_eap_saml_assertion_provider::init() &&
+            gss_eap_saml_attr_provider::init()      &&
+            gss_eap_shib_attr_provider::init())
+            return GSS_S_COMPLETE;
     } catch (std::exception &e) {
         return mapException(minor, e);
     }
 
-    return GSS_S_COMPLETE;
+    return GSS_S_FAILURE;
 }
 
 OM_uint32
 gssEapAttrProvidersFinalize(OM_uint32 *minor)
 {
     try {
-        gss_eap_attr_ctx::finalize();
+        gss_eap_shib_attr_provider::finalize();
+        gss_eap_saml_attr_provider::finalize();
+        gss_eap_saml_assertion_provider::finalize();
+        gss_eap_radius_attr_provider::finalize();
     } catch (std::exception &e) {
         return mapException(minor, e);
     }

diff --git a/mech_eap/util_attr.h b/mech_eap/util_attr.h
index ebde1db..f7687b7 100644 (file)
--- a/mech_eap/util_attr.h
+++ b/mech_eap/util_attr.h
@@ -117,7 +117,7 @@ private:
     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
 {
@@ -152,8 +152,6 @@ public:
     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();
 
     static unsigned int
     attributePrefixToType(const gss_buffer_t prefix);
@@ -189,7 +187,11 @@ public:
     gss_eap_attr_provider *getProvider(const gss_buffer_t prefix) const;
 
     static void
-    registerProvider(unsigned int type, gss_eap_attr_create_factory factory);
+    registerProvider(unsigned int type,
+                     const char *prefix,
+                     gss_eap_attr_create_provider factory);
+    static void
+    unregisterProvider(unsigned int type);
 
 private:
     /* make non-copyable */

diff --git a/mech_eap/util_radius.cpp b/mech_eap/util_radius.cpp
index e7a9c4f..6eed537 100644 (file)
--- a/mech_eap/util_radius.cpp
+++ b/mech_eap/util_radius.cpp
@@ -129,6 +129,7 @@ bool
 gss_eap_radius_attr_provider::init(void)
 {
     gss_eap_attr_ctx::registerProvider(ATTR_TYPE_RADIUS,
+                                       "urn:ietf:params:gss-eap:radius-avp",
                                        gss_eap_radius_attr_provider::createAttrContext);
     return true;
 }
@@ -136,7 +137,7 @@ gss_eap_radius_attr_provider::init(void)
 void
 gss_eap_radius_attr_provider::finalize(void)
 {
-    gss_eap_attr_ctx::registerProvider(ATTR_TYPE_RADIUS, NULL);
+    gss_eap_attr_ctx::unregisterProvider(ATTR_TYPE_RADIUS);
 }
 
 gss_eap_attr_provider *

diff --git a/mech_eap/util_saml.cpp b/mech_eap/util_saml.cpp
index 09d02fc..703fc38 100644 (file)
--- a/mech_eap/util_saml.cpp
+++ b/mech_eap/util_saml.cpp
@@ -262,6 +262,7 @@ bool
 gss_eap_saml_assertion_provider::init(void)
 {
     gss_eap_attr_ctx::registerProvider(ATTR_TYPE_SAML_ASSERTION,
+                                       "urn:ietf:params:gss-eap:saml-aaa-assertion",
                                        gss_eap_saml_assertion_provider::createAttrContext);
     return true;
 }
@@ -269,7 +270,7 @@ gss_eap_saml_assertion_provider::init(void)
 void
 gss_eap_saml_assertion_provider::finalize(void)
 {
-    gss_eap_attr_ctx::registerProvider(ATTR_TYPE_SAML_ASSERTION, NULL);
+    gss_eap_attr_ctx::unregisterProvider(ATTR_TYPE_SAML_ASSERTION);
 }
 
 gss_eap_attr_provider *
@@ -441,14 +442,15 @@ bool
 gss_eap_saml_attr_provider::init(void)
 {
     gss_eap_attr_ctx::registerProvider(ATTR_TYPE_SAML,
-                                         gss_eap_saml_attr_provider::createAttrContext);
+                                       "urn:ietf:params:gss-eap:saml-attr",
+                                       gss_eap_saml_attr_provider::createAttrContext);
     return true;
 }
 
 void
 gss_eap_saml_attr_provider::finalize(void)
 {
-    gss_eap_attr_ctx::registerProvider(ATTR_TYPE_SAML, NULL);
+    gss_eap_attr_ctx::unregisterProvider(ATTR_TYPE_SAML);
 }
 
 gss_eap_attr_provider *

diff --git a/mech_eap/util_shib.cpp b/mech_eap/util_shib.cpp
index ff8bb6d..9756b37 100644 (file)
--- a/mech_eap/util_shib.cpp
+++ b/mech_eap/util_shib.cpp
@@ -364,6 +364,7 @@ gss_eap_shib_attr_provider::init(void)
         return false;
 
     gss_eap_attr_ctx::registerProvider(ATTR_TYPE_LOCAL,
+                                       NULL,
                                        gss_eap_shib_attr_provider::createAttrContext);
 
     return true;
@@ -373,7 +374,7 @@ void
 gss_eap_shib_attr_provider::finalize(void)
 {
     ShibbolethResolver::term();
-    gss_eap_attr_ctx::registerProvider(ATTR_TYPE_LOCAL, NULL);
+    gss_eap_attr_ctx::unregisterProvider(ATTR_TYPE_LOCAL);
 }
 
 gss_eap_attr_provider *