Changeset 256:042af0000c0a in freeDiameter

Timestamp:

Apr 16, 2010, 4:57:39 PM (14 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Ported the auth plugin

Location:

extensions/app_radgw

Files:

• CMakeLists.txt (modified) (3 diffs)
• rgw_common.h (modified) (1 diff)
• rgw_plugins.c (modified) (10 diffs)
• rgwx_auth.c (added)
• rgwx_debug.c (modified) (6 diffs)
• rgwx_sample.c (modified) (2 diffs)

extensions/app_radgw/CMakeLists.txt

@@ -67 +67 @@
 ENDMACRO(RGWX_ADD_PLUGIN)
 
+
+### Debug 
 # Example of plugin:
 OPTION(BUILD_RGWX_SAMPLE "Build sample plugin? (for developers only)" OFF)
@@ -80 +82 @@
 
 
+### Authentication, Authorization messages translation.
+OPTION(BUILD_RGWX_AUTH "Build Authentication & Authorization RADIUS translation plugin? (RFC2865, RFC3579)" ON)
+        IF (BUILD_RGWX_AUTH)
+           RGWX_ADD_PLUGIN(auth ${RG_COMMON_HEADER} rgwx_auth.c)
+        ENDIF (BUILD_RGWX_AUTH)
 
 
@@ -104 +111 @@
 #       ENDIF (BUILD_SUB_ECHO_DROP)
 # 
-# OPTION(BUILD_SUB_AUTH "Build RADIUS Authentication & Authorization sub-extension? (RFC2865, RFC3579)" ON)
-#       IF (BUILD_SUB_AUTH)
-#          ADD_DEFINITIONS(-DSUB_AUTH_VERBO=2)
-#          ADD_LIBRARY(sub_auth MODULE ${RG_COMMON_HEADER} sub_auth.c)
-#          TARGET_LINK_LIBRARIES(sub_auth rg_common)
-#       ENDIF (BUILD_SUB_AUTH)
-# 
 # OPTION(BUILD_SUB_ACCT "Build RADIUS Accounting sub-extension? (RFC2866)" ON)
 #       IF (BUILD_SUB_ACCT)

extensions/app_radgw/rgw_common.h

@@ -56 +56 @@
 /* This structure points to a RADIUS client description, the definition is not known to plugins */
 struct rgw_client;
+/* This function is required to be able to translate user paswords */
+int rgw_clients_getkey(struct rgw_client * cli, unsigned char **key, size_t *key_len);
 
 /* Each plugin must provide the following structure. */
 extern struct rgw_api {
+        /* The name of the plugin */
+        const char * rgwp_name;
+
         /* Parse the configuration file. It may be called several times with different configurations.
-            Returns NULL on errors.
-            Called even if no configuration file is passed (with NULL parameter then) */
-        struct rgwp_config * (*rgwp_conf_parse) ( char * conf_file );
+            Called even if no configuration file is passed (with NULL conf_file parameter then) */
+        int (*rgwp_conf_parse) ( char * conf_file, struct rgwp_config ** state );
         
-        /* Cleanup the configuration state when the daemon is exiting. */
-        void (*rgwp_conf_free) (struct rgwp_config * conf);
+        /* Cleanup the configuration state when the daemon is exiting (called even if state is NULL). */
+        void (*rgwp_conf_free) (struct rgwp_config * state);
 
         /* handle an incoming RADIUS message */

extensions/app_radgw/rgw_plugins.c

@@ -54 +54 @@
         unsigned char           *cc;            /* array of command codes, or NULL for all cc */
         size_t                   cc_len;        /* size of the previous array */
-        
-        char                    *plgname;       /* basename of the plugin, for debug messages. To be freed when object is detroyed */
-        char                    *conffile;      /* configuration file passed to the extension, or "(null)". To be freed when object is destroyed */
 };
 
@@ -177 +174 @@
         struct plg_descr * new;
         int ret = 0;
-        char * tmp;
         
         TRACE_ENTRY("%p %p %d %p %zi", plgfile, conffile, type, codes_array, codes_sz);
         
         CHECK_PARAMS( plgfile && type && codes_array && (cache_started == 0) );
-        
-        CHECK_MALLOC( tmp = strdup(plgfile) );
         
         CHECK_MALLOC( new = malloc(sizeof(struct plg_descr)) );
@@ -189 +183 @@
         
         fd_list_init(&new->chain, new);
-        
-        /* Copy names, for debug */
-        CHECK_MALLOC( new->plgname = strdup(basename(tmp)) ); /* basename is a stupid function :( */
-        free(tmp);
-        CHECK_MALLOC( new->conffile = conffile ?: strdup("(null)") );
         
         /* Try and load the plugin */
@@ -212 +201 @@
         }
         
-        /* Now parse the configuration file, this will initialize all extension states and store it in the returned pointer (the subextensions must be re-entrant) */
+        TRACE_DEBUG(FULL, "Plugin '%s' found in file '%s'", new->descriptor->rgwp_name, plgfile);
+        
+        /* Now parse the configuration file, this will initialize all plugin states and store it in the "cs" pointer (the plugin must be re-entrant, so no global state) */
         if (new->descriptor->rgwp_conf_parse) {
-                TRACE_DEBUG(FULL, "Parsing plugin conf file: %s", new->conffile );
-                new->cs = (*(new->descriptor->rgwp_conf_parse))(conffile);
-                if (new->cs == NULL) {
-                        fd_log_debug("An error occurred while parsing configuration file '%s' in plugin '%s', aborting...\n", new->conffile, new->plgname);
-                        goto error;
-                }
-                TRACE_DEBUG(INFO, "RADIUS/Diameter gateway plugin '%s%s%s%s' initialized.", new->plgname, conffile ? " (" : "",  conffile ? new->conffile : "", conffile ? ")" : "");
+                CHECK_FCT_DO( (*(new->descriptor->rgwp_conf_parse))(conffile, &new->cs), 
+                        {
+                                fd_log_debug("An error occurred while parsing configuration file '%s' in plugin '%s', aborting...\n", conffile, plgfile);
+                                goto error;
+                        } );
         }
         
@@ -283 +272 @@
                 plg = (struct plg_descr *)ptr;
                 
-                fd_log_debug("  %-25s ( %-25s ) - types: %s%s, codes: ", 
-                                plg->plgname, 
-                                basename(plg->conffile),
+                fd_log_debug("  %-25s ( %p ) - types: %s%s, codes: ", 
+                                plg->descriptor->rgwp_name, 
+                                plg->cs,
                                 plg->type & RGW_PLG_TYPE_AUTH ? "Au" : "  ",
                                 plg->type & RGW_PLG_TYPE_ACCT ? "Ac" : "  ");
@@ -317 +306 @@
                 for (ptr = accel->plugins.next; ptr != &accel->plugins; ptr = ptr->next) {
                         struct plg_accel_item * item = (struct plg_accel_item *)ptr;
-                        fd_log_debug("     %-15s (%s)\n", item->plg->plgname, basename(item->plg->conffile));
+                        fd_log_debug("     %-15s (%p)\n", item->plg->descriptor->rgwp_name, item->plg->cs);
                 }
         }
@@ -326 +315 @@
                 for (ptr = accel->plugins.next; ptr != &accel->plugins; ptr = ptr->next) {
                         struct plg_accel_item * item = (struct plg_accel_item *)ptr;
-                        fd_log_debug("     %-15s (%s)\n", item->plg->plgname, basename(item->plg->conffile));
+                        fd_log_debug("     %-15s (%p)\n", item->plg->descriptor->rgwp_name, item->plg->cs);
                 }
         }
@@ -359 +348 @@
                 
                 if (plg->descriptor->rgwp_rad_req) {
-                        TRACE_DEBUG(ANNOYING, "Calling next plugin: %s", plg->plgname);
+                        TRACE_DEBUG(ANNOYING, "Calling next plugin: %s", plg->descriptor->rgwp_name);
                         ret = (*plg->descriptor->rgwp_rad_req)(plg->cs, *session, &(*rad)->radius, &rad_ans, diam_msg, cli);
                         if (ret)
                                 break;
                 } else {
-                        TRACE_DEBUG(ANNOYING, "Skipping extension '%s' (NULL callback)", plg->plgname);
+                        TRACE_DEBUG(ANNOYING, "Skipping extension '%s' (NULL callback)", plg->descriptor->rgwp_name);
                 }                                       
         }
@@ -420 +409 @@
                 
                 if (plg->descriptor->rgwp_diam_ans) {
-                        TRACE_DEBUG(ANNOYING, "Calling next plugin: %s", plg->plgname);
+                        TRACE_DEBUG(ANNOYING, "Calling next plugin: %s", plg->descriptor->rgwp_name);
                         ret = (*plg->descriptor->rgwp_diam_ans)(plg->cs, session, diam_ans, rad_ans, (void *)cli);
                         if (ret)
                                 break;
                 } else {
-                        TRACE_DEBUG(ANNOYING, "Skipping extension '%s' (NULL callback)", plg->plgname);
+                        TRACE_DEBUG(ANNOYING, "Skipping extension '%s' (NULL callback)", plg->descriptor->rgwp_name);
                 }                                       
         }
@@ -493 +482 @@
                 struct plg_descr * plg = (struct plg_descr *) plg_list.next;
                 fd_list_unlink(&plg->chain);
-                free(plg->conffile);
                 free(plg->cc);
-                if (plg->cs && plg->descriptor && plg->descriptor->rgwp_conf_free ) {
-                        TRACE_DEBUG(INFO, "RADIUS/Diameter gateway plugin '%s' cleaning up...", plg->plgname);
+                if (plg->descriptor && plg->descriptor->rgwp_conf_free ) {
+                        TRACE_DEBUG(INFO, "RADIUS/Diameter gateway plugin '%s' cleaning up...", plg->descriptor->rgwp_name);
                         (*plg->descriptor->rgwp_conf_free)(plg->cs);
                 }
-                free(plg->plgname);
-                dlclose(plg->dlo);
+                if (plg->dlo)
+                        dlclose(plg->dlo);
                 free(plg);
         }

extensions/app_radgw/rgwx_debug.c

@@ -38 +38 @@
 #include "rgw_common.h"
 
-struct rgwp_config {
-        char * confstring;
-};
-
-/* The function called at plugin initialization */
-static struct rgwp_config * debug_conf_parse ( char * conf_file )
+/* Store the configuration string in the state */
+static int debug_conf_parse ( char * conf_file, struct rgwp_config ** state )
 {
-        struct rgwp_config * ret = NULL;
+        TRACE_ENTRY("%p %p", conf_file, state);
+        CHECK_PARAMS(state);
         
-        TRACE_ENTRY("%p", conf_file);
+        *state = (void *)conf_file;
         
-        CHECK_MALLOC_DO( ret = malloc(sizeof(struct rgwp_config)), return NULL );
-        
-        ret->confstring = conf_file;
-        
-        return ret;
+        return 0;
 }
 
-/* This function is called when the plugin is unloaded, to cleanup all the states */
-static void debug_conf_free(struct rgwp_config * cs)
-{
-        TRACE_ENTRY("%p", cs);
-        CHECK_PARAMS_DO( cs, );
-        free(cs);
-        return;
-}
 
 /* Function to display the content of a RADIUS message (more friendly way than radius_msg_dump) */
@@ -91 +76 @@
         TRACE_ENTRY("%p %p %p %p %p %p", cs, session, rad_req, rad_ans, diam_fw, cli);
         
-        fd_log_debug("------------- RADIUS/Diameter Request Debug%s%s%s -------------\n", cs->confstring ? " [" : "", cs->confstring ?: "", cs->confstring ? "]" : "");
+        fd_log_debug("------------- RADIUS/Diameter Request Debug%s%s%s -------------\n", cs ? " [" : "", cs ? (char *)cs : "", cs ? "]" : "");
         
         if (!rad_req) {
@@ -114 +99 @@
         }
         
-        fd_log_debug("===========  Debug%s%s%s complete =============\n", cs->confstring ? " [" : "", cs->confstring ?: "", cs->confstring ? "]" : "");
+        fd_log_debug("===========  Debug%s%s%s complete =============\n", cs ? " [" : "", cs ? (char *)cs : "", cs ? "]" : "");
         
         return 0;
@@ -124 +109 @@
         TRACE_ENTRY("%p %p %p %p %p", cs, session, diam_ans, rad_fw, cli);
 
-        fd_log_debug("------------- RADIUS/Diameter Answer Debug%s%s%s -------------\n", cs->confstring ? " [" : "", cs->confstring ?: "", cs->confstring ? "]" : "");
+        fd_log_debug("------------- RADIUS/Diameter Answer Debug%s%s%s -------------\n", cs ? " [" : "", cs ? (char *)cs : "", cs ? "]" : "");
         
         if (!diam_ans || ! *diam_ans) {
@@ -140 +125 @@
         }
         
-        fd_log_debug("===========  Debug%s%s%s complete =============\n", cs->confstring ? " [" : "", cs->confstring ?: "", cs->confstring ? "]" : "");
+        fd_log_debug("===========  Debug%s%s%s complete =============\n", cs ? " [" : "", cs ? (char *)cs : "", cs ? "]" : "");
         return 0;
 }
@@ -147 +132 @@
 /* The exported symbol */
 struct rgw_api rgwp_descriptor = {
-        debug_conf_parse,
-        debug_conf_free,
-        debug_rad_req,
-        debug_diam_ans
+        .rgwp_name       = "debug",
+        .rgwp_conf_parse = debug_conf_parse,
+        .rgwp_conf_free  = NULL,
+        .rgwp_rad_req    = debug_rad_req,
+        .rgwp_diam_ans   = debug_diam_ans
 };      

extensions/app_radgw/rgwx_sample.c

@@ -41 +41 @@
 struct rgwp_config {
         /* In a real extension, we would store the parsed configuration file, and the states of the extension */
-        int state;
+        int init;
 };
 
 /* The function called at plugin initialization */
-static struct rgwp_config * sample_conf_parse ( char * conf_file )
+static int sample_conf_parse ( char * conf_file, struct rgwp_config ** state )
 {
-        struct rgwp_config * ret = NULL;
+        TRACE_ENTRY("%p %p", conf_file, state);
+        CHECK_PARAMS(state);
         
-        TRACE_ENTRY("%p", conf_file);
+        CHECK_MALLOC( *state = malloc(sizeof(struct rgwp_config)) );
         
-        CHECK_MALLOC_DO( ret = malloc(sizeof(struct rgwp_config)), return NULL );
+        (*state)->init = 1;
         
-        ret->state = 1;
-        
-        return ret;
+        return 0;
 }
 
 /* This function is called when the plugin is unloaded, to cleanup all the states */
-static void sample_conf_free(struct rgwp_config * cs)
+static void sample_conf_free(struct rgwp_config * state)
 {
-        TRACE_ENTRY("%p", cs);
-        CHECK_PARAMS_DO( cs, );
-        free(cs);
+        TRACE_ENTRY("%p", state);
+        CHECK_PARAMS_DO( state, );
+        free(state);
         return;
 }
@@ -88 +87 @@
 /* Finally, we declare the structure that will be loaded by main RADIUS/Diameter gateway extension */
 struct rgw_api rgwp_descriptor = {
-        sample_conf_parse,
-        sample_conf_free,
-        sample_rad_req,
-        sample_diam_ans
+        .rgwp_name       = "sample",
+        .rgwp_conf_parse = sample_conf_parse,
+        .rgwp_conf_free  = sample_conf_free,
+        .rgwp_rad_req    = sample_rad_req,
+        .rgwp_diam_ans   = sample_diam_ans
 };