January 2006 - Freeradius-Devel - lists.freeradius.org

[PATCH 10/10] rlm_python: 10-block-threads-around-python-c-api-calls.patch
by Paul P Komkoff Jr 30 Jan '06

30 Jan '06

Block threads around python C api calls --- commit cd221cd2a83d00df8ef7d0d05783766d0764aeee tree e631d404351b6c224f67d4f52d4bdb028847ff56 parent bc293834b5669396a77ba07a20ca9f60c9c34050 author <stingray(a)boxster64.stingr.net> Sun, 29 Jan 2006 16:07:57 +0300 committer <stingray(a)boxster64.stingr.net> Sun, 29 Jan 2006 16:07:57 +0300 src/modules/rlm_python/rlm_python.c | 26 +++++++++++++++++++++----- 1 files changed, 21 insertions(+), 5 deletions(-) diff --git a/src/modules/rlm_python/rlm_python.c b/src/modules/rlm_python/rlm_python.c --- a/src/modules/rlm_python/rlm_python.c +++ b/src/modules/rlm_python/rlm_python.c @@ -33,6 +33,11 @@ #include "modules.h" #include "conffile.h" +#define Pyx_BLOCK_THREADS {PyGILState_STATE __gstate = PyGILState_Ensure(); +#define Pyx_UNBLOCK_THREADS PyGILState_Release(__gstate);} + + + static const char rcsid[] = "$Id: rlm_python.c,v 1.6 2004/02/26 19:04:34 aland Exp $"; /* @@ -188,6 +193,8 @@ static void python_error() { PyObject *pStr1 = NULL; PyObject *pStr2 = NULL; + Pyx_BLOCK_THREADS + PyErr_Fetch(&pType, &pValue, &pTraceback); if (pType == NULL || pValue == NULL) goto failed; @@ -201,6 +208,8 @@ failed: Py_XDECREF(pType); Py_XDECREF(pValue); Py_XDECREF(pTraceback); + + Pyx_UNBLOCK_THREADS } static int python_init() @@ -233,8 +242,11 @@ failed: } static int python_destroy() { + Pyx_BLOCK_THREADS Py_XDECREF(radiusd_module); Py_Finalize(); + Pyx_UNBLOCK_THREADS + return 0; } @@ -324,6 +336,9 @@ static int python_function(REQUEST *requ for (vp = request->packet->vps; vp; vp = vp->next) tuplelen++; } + + gstate = PyGILState_Ensure(); + if (tuplelen == 0) { Py_INCREF(Py_None); pArgs = Py_None; @@ -355,12 +370,8 @@ static int python_function(REQUEST *requ } /* Call Python function. */ - gstate = PyGILState_Ensure(); - pRet = PyObject_CallFunctionObjArgs(pFunc, pArgs, NULL); - PyGILState_Release(gstate); - if (pRet == NULL) goto failed; @@ -414,11 +425,14 @@ static int python_function(REQUEST *requ okay: Py_DECREF(pArgs); Py_DECREF(pRet); + PyGILState_Release(gstate); return ret; failed: python_error(); Py_XDECREF(pArgs); Py_XDECREF(pRet); + PyGILState_Release(gstate); + return -1; } @@ -451,19 +465,21 @@ static int python_load_function(char *mo PyGILState_Release(gstate); return 0; failed: - PyGILState_Release(gstate); python_error(); radlog(L_ERR, "rlm_python:%s: failed to import python function '%s.%s'", funcname, module, func); Py_XDECREF(*pFunc); *pFunc = NULL; Py_XDECREF(*pModule); + PyGILState_Release(gstate); *pModule = NULL; return -1; } static void python_objclear(PyObject **ob) { if (*ob != NULL) { + Pyx_BLOCK_THREADS Py_DECREF(*ob); + Pyx_UNBLOCK_THREADS *ob = NULL; } } -- Paul P 'Stingray' Komkoff Jr // http://stingr.net/key <- my pgp key This message represents the official view of the voices in my head

1 0

[PATCH 9/10] rlm_python: 09-reimplement-instantiate--detach.patch
by Paul P Komkoff Jr 30 Jan '06

30 Jan '06

Reimplement instantiate & detach --- commit bc293834b5669396a77ba07a20ca9f60c9c34050 tree 462bbe5457760d3594e6d58f7a669ecca00b0dc9 parent 3af430ff7cc509f59963279178e0909b9983af3a author <stingray(a)boxster64.stingr.net> Sun, 29 Jan 2006 15:57:07 +0300 committer <stingray(a)boxster64.stingr.net> Sun, 29 Jan 2006 15:57:07 +0300 src/modules/rlm_python/rlm_python.c | 228 ++++++++++++++++------------------- 1 files changed, 107 insertions(+), 121 deletions(-) diff --git a/src/modules/rlm_python/rlm_python.c b/src/modules/rlm_python/rlm_python.c --- a/src/modules/rlm_python/rlm_python.c +++ b/src/modules/rlm_python/rlm_python.c @@ -461,6 +461,30 @@ failed: return -1; } +static void python_objclear(PyObject **ob) { + if (*ob != NULL) { + Py_DECREF(*ob); + *ob = NULL; + } +} + +static void python_instance_clear(struct rlm_python_t *data) { + python_objclear(&data->pFunc_instantiate); + python_objclear(&data->pFunc_authorize); + python_objclear(&data->pFunc_authenticate); + python_objclear(&data->pFunc_preacct); + python_objclear(&data->pFunc_accounting); + python_objclear(&data->pFunc_checksimul); + python_objclear(&data->pFunc_detach); + + python_objclear(&data->pModule_instantiate); + python_objclear(&data->pModule_authorize); + python_objclear(&data->pModule_authenticate); + python_objclear(&data->pModule_preacct); + python_objclear(&data->pModule_accounting); + python_objclear(&data->pModule_checksimul); + python_objclear(&data->pModule_detach); +} /* * Do any per-module initialization that is separate to each @@ -473,81 +497,94 @@ failed: * in *instance otherwise put a null pointer there. * */ -static int python_instantiate(CONF_SECTION *conf, void **instance) -{ - struct rlm_python_t *data; - /* - * Set up a storage area for instance data - */ - data = rad_malloc(sizeof(*data)); - if (!data) { - return -1; - } - memset(data, 0, sizeof(*data)); - - /* - * If the configuration parameters can't be parsed, then - * fail. - */ - if (cf_section_parse(conf, data, module_config) < 0) { - free(data); - return -1; - } - - - /* - * Import user modules. - */ - - if (python_load_function(data->mod_instantiate, data->func_instantiate, - &data->pModule_instantiate, &data->pFunc_instantiate)==-1) { - /* TODO: check if we need to cleanup data */ - return -1; - } - - if (python_load_function(data->mod_authenticate, data->func_authenticate, - &data->pModule_authenticate, &data->pFunc_authenticate)==-1) { - /* TODO: check if we need to cleanup data */ - return -1; - } - - if (python_load_function(data->mod_authorize, data->func_authorize, - &data->pModule_authorize, &data->pFunc_authorize)==-1) { - /* TODO: check if we need to cleanup data */ - return -1; - } - - if (python_load_function(data->mod_preacct, data->func_preacct, - &data->pModule_preacct, &data->pFunc_preacct)==-1) { - /* TODO: check if we need to cleanup data */ - return -1; - } - - if (python_load_function(data->mod_accounting, data->func_accounting, - &data->pModule_accounting, &data->pFunc_accounting)==-1) { - /* TODO: check if we need to cleanup data */ - return -1; - } - - if (python_load_function(data->mod_checksimul, data->func_checksimul, - &data->pModule_checksimul, &data->pFunc_checksimul)==-1) { - /* TODO: check if we need to cleanup data */ - return -1; - } - - if (python_load_function(data->mod_detach, data->func_detach, - &data->pModule_detach, &data->pFunc_detach)==-1) { - /* TODO: check if we need to cleanup data */ - return -1; - } +static int python_instantiate(CONF_SECTION *conf, void **instance) { + struct rlm_python_t *data = NULL; + + /* + * Set up a storage area for instance data + */ + if ((data = malloc(sizeof(*data))) == NULL) + return -1; + bzero(data, sizeof(*data)); + + /* + * If the configuration parameters can't be parsed, then + * fail. + */ + if (cf_section_parse(conf, data, module_config) < 0) { + free(data); + return -1; + } + + /* + * Import user modules. + */ + if (python_load_function(data->mod_instantiate, + data->func_instantiate, + &data->pModule_instantiate, + &data->pFunc_instantiate) < 0) + goto failed; + + if (python_load_function(data->mod_authenticate, + data->func_authenticate, + &data->pModule_authenticate, + &data->pFunc_authenticate) < 0) + goto failed; + + if (python_load_function(data->mod_authorize, + data->func_authorize, + &data->pModule_authorize, + &data->pFunc_authorize) < 0) + goto failed; + + if (python_load_function(data->mod_preacct, + data->func_preacct, + &data->pModule_preacct, + &data->pFunc_preacct) < 0) + goto failed; + + if (python_load_function(data->mod_accounting, + data->func_accounting, + &data->pModule_accounting, + &data->pFunc_accounting) < 0) + goto failed; + + if (python_load_function(data->mod_checksimul, + data->func_checksimul, + &data->pModule_checksimul, + &data->pFunc_checksimul) < 0) + goto failed; + + if (python_load_function(data->mod_detach, + data->func_detach, + &data->pModule_detach, + &data->pFunc_detach) < 0) + goto failed; + + *instance = data; + /* Call the instantiate function. No request. Use the return value. */ + + return python_function(NULL, data->pFunc_instantiate, "instantiate"); +failed: + python_error(); + python_instance_clear(data); + return -1; +} + +static int python_detach(void *instance) { + struct rlm_python_t *data = (struct rlm_python_t *) instance; + int ret; - *instance=data; + ret = python_function(NULL, data->pFunc_detach, "detach"); - /* Call the instantiate function. No request. Use the return value. */ - return python_function(NULL, data->pFunc_instantiate, "instantiate"); + python_instance_clear(data); + + free(data); + return ret; } + /* Wrapper functions */ static int python_authorize(void *instance, REQUEST *request) { @@ -589,57 +626,6 @@ static int python_checksimul(void *insta } -static int python_detach(void *instance) -{ - int return_value; - - /* Default return value is failure */ - return_value = -1; - - if (((struct rlm_python_t *)instance)->pFunc_detach && - PyCallable_Check(((struct rlm_python_t *)instance)->pFunc_detach)) { - - PyObject *pArgs, *pValue; - - /* call the function with an empty tuple */ - - pArgs = PyTuple_New(0); - pValue = PyObject_CallObject(((struct rlm_python_t *)instance)->pFunc_detach, - pArgs); - - if (pValue == NULL) { - python_error(); - return -1; - } - else { - if (!PyInt_Check(pValue)) { - radlog(L_ERR, "detach: return value not an integer"); - } - else { - return_value = PyInt_AsLong(pValue); - } - } - - /* Decrease reference counts for the argument and return tuple */ - Py_DECREF(pArgs); - Py_DECREF(pValue); - } - - free(instance); - -#if 0 - /* xxx test delete module object so it will be reloaded later. - * xxx useless since we can't SIGHUP reliably, anyway. - */ - PyObject_Del(((struct rlm_python_t *)instance)->pModule_accounting); -#endif - - radlog(L_DBG, "python_detach done"); - - /* Return the specified by the Python module */ - return return_value; -} - /* * The module name should be the only globally exported symbol. * That is, everything else should be 'static'. -- Paul P 'Stingray' Komkoff Jr // http://stingr.net/key <- my pgp key This message represents the official view of the voices in my head

1 0

[PATCH 8/10] rlm_python: 08-cleanup-python-load-function.patch
by Paul P Komkoff Jr 30 Jan '06

30 Jan '06

Cleanup python_load_function --- commit 3af430ff7cc509f59963279178e0909b9983af3a tree 9eca021acb490e7b60269dd7f8d729be0f3c3a58 parent 97c0260f921dabc7d751a99c5ca7f07a1f916e8a author <stingray(a)boxster64.stingr.net> Sun, 29 Jan 2006 15:43:49 +0300 committer <stingray(a)boxster64.stingr.net> Sun, 29 Jan 2006 15:43:49 +0300 src/modules/rlm_python/rlm_python.c | 76 ++++++++++++++++++----------------- 1 files changed, 40 insertions(+), 36 deletions(-) diff --git a/src/modules/rlm_python/rlm_python.c b/src/modules/rlm_python/rlm_python.c --- a/src/modules/rlm_python/rlm_python.c +++ b/src/modules/rlm_python/rlm_python.c @@ -425,36 +425,40 @@ failed: /* * Import a user module and load a function from it */ -static int load_python_function(const char* module, const char* func, - PyObject** pyModule, PyObject** pyFunc) { - if ((module==NULL) || (func==NULL)) { - *pyFunc=NULL; - *pyModule=NULL; - } else { - PyObject *pName; - - pName = PyString_FromString(module); - Py_INCREF(pName); - *pyModule = PyImport_Import(pName); - Py_DECREF(pName); - if (*pyModule != NULL) { - PyObject *pDict; - - pDict = PyModule_GetDict(*pyModule); - /* pDict: borrowed reference */ - - *pyFunc = PyDict_GetItemString(pDict, func); - /* pFunc: Borrowed reference */ - } else { - python_error(); - - radlog(L_ERR, "Failed to import python module \"%s\"\n", module); - return -1; - } - } - - return 0; +static int python_load_function(char *module, const char *func, PyObject **pModule, PyObject **pFunc) { + const char funcname[] = "python_load_function"; + PyGILState_STATE gstate; + + *pFunc = NULL; + *pModule = NULL; + gstate = PyGILState_Ensure(); + + if (module != NULL && func != NULL) { + if ((*pModule = PyImport_ImportModule(module)) == NULL) { + radlog(L_ERR, "rlm_python:%s: module '%s' is not found", funcname, module); + goto failed; + } + if ((*pFunc = PyObject_GetAttrString(*pModule, func)) == NULL) { + radlog(L_ERR, "rlm_python:%s: function '%s.%s' is not found", funcname, module, func); + goto failed; + } + if (!PyCallable_Check(*pFunc)) { + radlog(L_ERR, "rlm_python:%s: function '%s.%s' is not callable", funcname, module, func); + goto failed; + } + } + PyGILState_Release(gstate); + return 0; +failed: + PyGILState_Release(gstate); + python_error(); + radlog(L_ERR, "rlm_python:%s: failed to import python function '%s.%s'", funcname, module, func); + Py_XDECREF(*pFunc); + *pFunc = NULL; + Py_XDECREF(*pModule); + *pModule = NULL; + return -1; } @@ -496,43 +500,43 @@ static int python_instantiate(CONF_SECTI * Import user modules. */ - if (load_python_function(data->mod_instantiate, data->func_instantiate, + if (python_load_function(data->mod_instantiate, data->func_instantiate, &data->pModule_instantiate, &data->pFunc_instantiate)==-1) { /* TODO: check if we need to cleanup data */ return -1; } - if (load_python_function(data->mod_authenticate, data->func_authenticate, + if (python_load_function(data->mod_authenticate, data->func_authenticate, &data->pModule_authenticate, &data->pFunc_authenticate)==-1) { /* TODO: check if we need to cleanup data */ return -1; } - if (load_python_function(data->mod_authorize, data->func_authorize, + if (python_load_function(data->mod_authorize, data->func_authorize, &data->pModule_authorize, &data->pFunc_authorize)==-1) { /* TODO: check if we need to cleanup data */ return -1; } - if (load_python_function(data->mod_preacct, data->func_preacct, + if (python_load_function(data->mod_preacct, data->func_preacct, &data->pModule_preacct, &data->pFunc_preacct)==-1) { /* TODO: check if we need to cleanup data */ return -1; } - if (load_python_function(data->mod_accounting, data->func_accounting, + if (python_load_function(data->mod_accounting, data->func_accounting, &data->pModule_accounting, &data->pFunc_accounting)==-1) { /* TODO: check if we need to cleanup data */ return -1; } - if (load_python_function(data->mod_checksimul, data->func_checksimul, + if (python_load_function(data->mod_checksimul, data->func_checksimul, &data->pModule_checksimul, &data->pFunc_checksimul)==-1) { /* TODO: check if we need to cleanup data */ return -1; } - if (load_python_function(data->mod_detach, data->func_detach, + if (python_load_function(data->mod_detach, data->func_detach, &data->pModule_detach, &data->pFunc_detach)==-1) { /* TODO: check if we need to cleanup data */ return -1; -- Paul P 'Stingray' Komkoff Jr // http://stingr.net/key <- my pgp key This message represents the official view of the voices in my head

1 0

[PATCH 7/10] rlm_python: 07-rewrite-python-function-wrapper-at-once.patch
by Paul P Komkoff Jr 30 Jan '06

30 Jan '06

Rewrite python_function wrapper at once --- commit 97c0260f921dabc7d751a99c5ca7f07a1f916e8a tree e0b6eab89ae865662aa5a09447fd7ffe805d90a1 parent 8b5cb6f9d73fc724c0ad822fc83523e13d84801e author <stingray(a)boxster64.stingr.net> Sun, 29 Jan 2006 15:36:23 +0300 committer <stingray(a)boxster64.stingr.net> Sun, 29 Jan 2006 15:36:23 +0300 src/modules/rlm_python/rlm_python.c | 331 +++++++++++++---------------------- 1 files changed, 125 insertions(+), 206 deletions(-) diff --git a/src/modules/rlm_python/rlm_python.c b/src/modules/rlm_python/rlm_python.c --- a/src/modules/rlm_python/rlm_python.c +++ b/src/modules/rlm_python/rlm_python.c @@ -295,214 +295,133 @@ static void python_vptuple(VALUE_PAIR ** * xxx We're not checking the errors. If we have errors, what do we do? */ -static int python_function(REQUEST *request, - PyObject *pFunc, const char *function_name) -{ -#define BUF_SIZE 1024 - - char buf[BUF_SIZE]; /* same size as vp_print buffer */ - - VALUE_PAIR *vp; - - PyObject *pValue, *pValuePairContainer, **pValueHolder, **pValueHolderPtr; - int i, n_tuple, return_value; - - /* Return with "OK, continue" if the function is not defined. */ - if (pFunc == NULL) { - return RLM_MODULE_OK; - } - - /* Default return value is "OK, continue" */ - return_value = RLM_MODULE_OK; - - /* We will pass a tuple containing (name, value) tuples - * We can safely use the Python function to build up a tuple, - * since the tuple is not used elsewhere. - * - * Determine the size of our tuple by walking through the packet. - * If request is NULL, pass None. - */ - n_tuple = 0; - - if (request != NULL) { - for (vp = request->packet->vps; vp; vp = vp->next) { - n_tuple++; - } - } - - /* Create the tuple and a holder for the pointers, so that we can - * decref more efficiently later without the overhead of reading - * the tuple. - * - * We use malloc() instead of the Python memory allocator since we - * are not embedded. - */ - - if (NULL == (pValueHolder = pValueHolderPtr = - malloc(sizeof(PyObject *) * n_tuple))) { - - radlog(L_ERR, "%s: malloc of %d bytes failed\n", - function_name, sizeof(PyObject *) * n_tuple); - - return -1; - } - - if (n_tuple == 0) { - pValuePairContainer = Py_None; - } - else { - pValuePairContainer = PyTuple_New(n_tuple); - - i = 0; - for (vp = request->packet->vps; vp; vp = vp->next) { - PyObject *pValuePair, *pString1, *pString2; - - /* The inside tuple has two only: */ - pValuePair = PyTuple_New(2); - - /* The name. logic from vp_prints, lib/print.c */ - if (vp->flags.has_tag) { - snprintf(buf, BUF_SIZE, "%s:%d", vp->name, vp->flags.tag); - } - else { - strcpy(buf, vp->name); - } - - pString1 = PyString_FromString(buf); - PyTuple_SetItem(pValuePair, 0, pString1); - - - /* The value. Use delimiter - don't know what that means */ - vp_prints_value(buf, sizeof(buf), vp, 1); - pString2 = PyString_FromString(buf); - PyTuple_SetItem(pValuePair, 1, pString2); - - /* Put the tuple inside the container */ - PyTuple_SetItem(pValuePairContainer, i++, pValuePair); - - /* Store the pointer in our malloc() storage */ - *pValueHolderPtr++ = pValuePair; - } - } - - - /* Call Python function. - */ - - if (pFunc && PyCallable_Check(pFunc)) { - PyObject *pArgs; - - /* call the function with a singleton tuple containing the - * container tuple. - */ - - if ((pArgs = PyTuple_New(1)) == NULL) { - radlog(L_ERR, "%s: could not create tuple", function_name); - return -1; - } - if ((PyTuple_SetItem(pArgs, 0, pValuePairContainer)) != 0) { - radlog(L_ERR, "%s: could not set tuple item", function_name); - return -1; - } - - if ((pValue = PyObject_CallObject(pFunc, pArgs)) == NULL) { - radlog(L_ERR, "%s: function call failed", function_name); - python_error(); - return -1; - } - - /* The function returns either: - * 1. tuple containing the integer return value, - * then the integer reply code (or None to not set), - * then the string tuples to build the reply with. - * (returnvalue, (p1, s1), (p2, s2)) - * - * 2. the function return value alone - * - * 3. None - default return value is set - * - * xxx This code is messy! - */ - - if (PyTuple_Check(pValue)) { - PyObject *pTupleInt; - - if (PyTuple_Size(pValue) != 3) { - radlog(L_ERR, "%s: tuple must be " \ - "(return, replyTuple, configTuple)", - function_name); - - } - else { - pTupleInt = PyTuple_GetItem(pValue, 0); - - if ((pTupleInt == NULL) || !PyInt_Check(pTupleInt)) { - radlog(L_ERR, "%s: first tuple element not an integer", - function_name); - } - else { - /* Now have the return value */ - return_value = PyInt_AsLong(pTupleInt); - - /* Reply item tuple */ - python_vptuple(&request->reply->vps, - PyTuple_GetItem(pValue, 1), function_name); - - /* Config item tuple */ - python_vptuple(&request->config_items, - PyTuple_GetItem(pValue, 2), function_name); - } - } - } - else if (PyInt_Check(pValue)) { - /* Just an integer */ - return_value = PyInt_AsLong(pValue); - } - else if (pValue == Py_None) { - /* returned 'None', return value defaults to "OK, continue." */ - return_value = RLM_MODULE_OK; - } - else { - /* Not tuple or None */ - radlog(L_ERR, "%s function did not return a tuple or None\n", - function_name); - } - - - /* Decrease reference counts for the argument and return tuple */ - Py_DECREF(pArgs); - Py_DECREF(pValue); - } - - /* Decrease reference count for the tuples passed, the - * container tuple, and the return value. - */ - - pValueHolderPtr = pValueHolder; - i = n_tuple; - while (i--) { - /* Can't write as pValueHolderPtr since Py_DECREF is a macro */ - Py_DECREF(*pValueHolderPtr); - pValueHolderPtr++; - } - free(pValueHolder); - Py_DECREF(pValuePairContainer); - - /* pDict and pFunc are borrowed and must not be Py_DECREF-ed */ - - /* Free pairs if we are rejecting. - * xxx Shouldn't the core do that? - */ - - if ((return_value == RLM_MODULE_REJECT) && (request != NULL)) { - pairfree(&(request->reply->vps)); - } - - /* Return the specified by the Python module */ - return return_value; +static int python_function(REQUEST *request, PyObject *pFunc, const char *funcname) { + char buf[1024]; + VALUE_PAIR *vp; + PyObject *pRet = NULL; + PyObject *pArgs = NULL; + int tuplelen; + int ret; + + PyGILState_STATE gstate; + + /* Return with "OK, continue" if the function is not defined. */ + if (pFunc == NULL) + return RLM_MODULE_OK; + + /* Default return value is "OK, continue" */ + ret = RLM_MODULE_OK; + + /* We will pass a tuple containing (name, value) tuples + * We can safely use the Python function to build up a tuple, + * since the tuple is not used elsewhere. + * + * Determine the size of our tuple by walking through the packet. + * If request is NULL, pass None. + */ + tuplelen = 0; + if (request != NULL) { + for (vp = request->packet->vps; vp; vp = vp->next) + tuplelen++; + } + if (tuplelen == 0) { + Py_INCREF(Py_None); + pArgs = Py_None; + } else { + int i = 0; + if ((pArgs = PyTuple_New(tuplelen)) == NULL) + goto failed; + for (vp = request->packet->vps; vp != NULL; vp = vp->next, i++) { + PyObject *pPair; + PyObject *pStr; + /* The inside tuple has two only: */ + if ((pPair = PyTuple_New(2)) == NULL) + goto failed; + /* Put the tuple inside the container */ + PyTuple_SET_ITEM(pArgs, i, pPair); + /* The name. logic from vp_prints, lib/print.c */ + if (vp->flags.has_tag) + snprintf(buf, sizeof(buf), "%s:%d", vp->name, vp->flags.tag); + else + strcpy(buf, vp->name); + if ((pStr = PyString_FromString(buf)) == NULL) + goto failed; + PyTuple_SET_ITEM(pPair, 0, pStr); + vp_prints_value(buf, sizeof(buf), vp, 1); + if ((pStr = PyString_FromString(buf)) == NULL) + goto failed; + PyTuple_SET_ITEM(pPair, 1, pStr); + } + } + + /* Call Python function. */ + gstate = PyGILState_Ensure(); + + pRet = PyObject_CallFunctionObjArgs(pFunc, pArgs, NULL); + + PyGILState_Release(gstate); + + if (pRet == NULL) + goto failed; + + if (request == NULL) + goto okay; + /* The function returns either: + * 1. tuple containing the integer return value, + * then the integer reply code (or None to not set), + * then the string tuples to build the reply with. + * (returnvalue, (p1, s1), (p2, s2)) + * + * 2. the function return value alone + * + * 3. None - default return value is set + * + * xxx This code is messy! + */ + if (PyTuple_CheckExact(pRet)) { + PyObject *pTupleInt; + + if (PyTuple_GET_SIZE(pRet) != 3) { + radlog(L_ERR, "rlm_python:%s: tuple must be (return, replyTuple, configTuple)", funcname); + goto failed; + } + pTupleInt = PyTuple_GET_ITEM(pRet, 0); + if (!PyInt_CheckExact(pTupleInt)) { + radlog(L_ERR, "rlm_python:%s: first tuple element not an integer", funcname); + goto failed; + } + /* Now have the return value */ + ret = PyInt_AsLong(pTupleInt); + /* Reply item tuple */ + python_vptuple(&request->reply->vps, PyTuple_GET_ITEM(pRet, 1), funcname); + /* Config item tuple */ + python_vptuple(&request->config_items, PyTuple_GET_ITEM(pRet, 2), funcname); + } else + if (PyInt_CheckExact(pRet)) { + /* Just an integer */ + ret = PyInt_AsLong(pRet); + } else + if (pRet == Py_None) { + /* returned 'None', return value defaults to "OK, continue." */ + ret = RLM_MODULE_OK; + } else { + /* Not tuple or None */ + radlog(L_ERR, "rlm_python:%s: function did not return a tuple or None", funcname); + goto failed; + } + if (ret == RLM_MODULE_REJECT && request != NULL) + pairfree(&request->reply->vps); +okay: + Py_DECREF(pArgs); + Py_DECREF(pRet); + return ret; +failed: + python_error(); + Py_XDECREF(pArgs); + Py_XDECREF(pRet); + return -1; } - /* * Import a user module and load a function from it */ -- Paul P 'Stingray' Komkoff Jr // http://stingr.net/key <- my pgp key This message represents the official view of the voices in my head

1 0

[PATCH 6/10] rlm_python: 06-cleanup-python-vptuple-ex-add-vp-tuple.patch
by Paul P Komkoff Jr 30 Jan '06

30 Jan '06

Cleanup python_vptuple (ex add_vp_tuple) --- commit 8b5cb6f9d73fc724c0ad822fc83523e13d84801e tree 399b39a24da14201a108d1875610894c0d620ab7 parent 113545c895789bc9e16b3321b7636bef01289d90 author <stingray(a)boxster64.stingr.net> Sun, 29 Jan 2006 15:26:36 +0300 committer <stingray(a)boxster64.stingr.net> Sun, 29 Jan 2006 15:26:36 +0300 src/modules/rlm_python/rlm_python.c | 142 +++++++++++++---------------------- 1 files changed, 52 insertions(+), 90 deletions(-) diff --git a/src/modules/rlm_python/rlm_python.c b/src/modules/rlm_python/rlm_python.c --- a/src/modules/rlm_python/rlm_python.c +++ b/src/modules/rlm_python/rlm_python.c @@ -238,96 +238,58 @@ static int python_destroy() { return 0; } -/* Tuple to value pair conversion */ -static void add_vp_tuple(VALUE_PAIR **vpp, PyObject *pValue, - const char *function_name) { - int i, outertuplesize; - VALUE_PAIR *vp; - - /* If the Python function gave us None for the tuple, then just return. */ - if (pValue == Py_None) { - return; - } - - if (!PyTuple_Check(pValue)) { - radlog(L_ERR, "%s: non-tuple passed", function_name); - } - - /* Get the tuple size. */ - outertuplesize = PyTuple_Size(pValue); - - for (i = 0; i < outertuplesize; i++) { - PyObject *pTupleElement = PyTuple_GetItem(pValue, i); - - if ((pTupleElement != NULL) && - (PyTuple_Check(pTupleElement))) { - - /* Check if it's a pair */ - int tuplesize; - - if ((tuplesize = PyTuple_Size(pTupleElement)) != 2) { - radlog(L_ERR, "%s: tuple element %d is a tuple " - " of size %d. must be 2\n", function_name, - i, tuplesize); - } - else { - PyObject *pString1, *pString2; - - pString1 = PyTuple_GetItem(pTupleElement, 0); - pString2 = PyTuple_GetItem(pTupleElement, 1); - - /* xxx PyString_Check does not compile here */ - if ((pString1 != NULL) && - (pString2 != NULL) && - PyObject_TypeCheck(pString1,&PyString_Type) && - PyObject_TypeCheck(pString2,&PyString_Type)) { - - - const char *s1, *s2; - - /* pairmake() will convert and find any - * errors in the pair. - */ - - s1 = PyString_AsString(pString1); - s2 = PyString_AsString(pString2); - - if ((s1 != NULL) && (s2 != NULL)) { - radlog(L_DBG, "%s: %s = %s ", - function_name, s1, s2); - - /* xxx Might need to support other T_OP */ - vp = pairmake(s1, s2, T_OP_EQ); - if (vp != NULL) { - pairadd(vpp, vp); - radlog(L_DBG, "%s: s1, s2 OK\n", - function_name); - } - else { - radlog(L_DBG, "%s: s1, s2 FAILED\n", - function_name); - } - } - else { - radlog(L_ERR, "%s: string conv failed\n", - function_name); - } - - } - else { - radlog(L_ERR, "%s: tuple element %d must be " - "(string, string)", function_name, i); - } - } - } - else { - radlog(L_ERR, "%s: tuple element %d is not a tuple\n", - function_name, i); - } - } - +static void python_vptuple(VALUE_PAIR **vpp, PyObject *pValue, const char *funcname) { + int i; + int tuplesize; + VALUE_PAIR *vp; + + /* If the Python function gave us None for the tuple, then just return. */ + if (pValue == Py_None) + return; + + if (!PyTuple_CheckExact(pValue)) { + radlog(L_ERR, "rlm_python:%s: non-tuple passed", funcname); + return; + } + /* Get the tuple tuplesize. */ + tuplesize = PyTuple_GET_SIZE(pValue); + for (i = 0; i < tuplesize; i++) { + PyObject *pTupleElement = PyTuple_GET_ITEM(pValue, i); + PyObject *pStr1; + PyObject *pStr2; + int pairsize; + const char *s1; + const char *s2; + + if (!PyTuple_CheckExact(pTupleElement)) { + radlog(L_ERR, "rlm_python:%s: tuple element %d is not a tuple", funcname, i); + continue; + } + /* Check if it's a pair */ + if ((pairsize = PyTuple_GET_SIZE(pTupleElement)) != 2) { + radlog(L_ERR, "rlm_python:%s: tuple element %d is a tuple of size %d. Must be 2", funcname, i, pairsize); + continue; + } + pStr1 = PyTuple_GET_ITEM(pTupleElement, 0); + pStr2 = PyTuple_GET_ITEM(pTupleElement, 1); + if ((!PyString_CheckExact(pStr1)) || (!PyString_CheckExact(pStr2))) { + radlog(L_ERR, "rlm_python:%s: tuple element %d must be as (str, str)", funcname, i); + continue; + } + s1 = PyString_AsString(pStr1); + s2 = PyString_AsString(pStr2); + /* xxx Might need to support other T_OP */ + vp = pairmake(s1, s2, T_OP_EQ); + if (vp != NULL) { + pairadd(vpp, vp); + radlog(L_DBG, "rlm_python:%s: '%s' = '%s'", funcname, s1, s2); + } else { + radlog(L_DBG, "rlm_python:%s: Failed: '%s' = '%s'", funcname, s1, s2); + } + } } + /* This is the core Python function that the others wrap around. * Pass the value-pair print strings in a tuple. * xxx We're not checking the errors. If we have errors, what do we do? @@ -483,11 +445,11 @@ static int python_function(REQUEST *requ return_value = PyInt_AsLong(pTupleInt); /* Reply item tuple */ - add_vp_tuple(&request->reply->vps, + python_vptuple(&request->reply->vps, PyTuple_GetItem(pValue, 1), function_name); /* Config item tuple */ - add_vp_tuple(&request->config_items, + python_vptuple(&request->config_items, PyTuple_GetItem(pValue, 2), function_name); } } -- Paul P 'Stingray' Komkoff Jr // http://stingr.net/key <- my pgp key This message represents the official view of the voices in my head

1 0

[PATCH 5/10] rlm_python: 05-add-python-destroy.patch
by Paul P Komkoff Jr 30 Jan '06

30 Jan '06

Add python_destroy --- commit 113545c895789bc9e16b3321b7636bef01289d90 tree 743555c505186ec716ff7255127ef6f5923a60d0 parent 2803bf1c6d966ed8b5a1ea6deb54ab728df32277 author <stingray(a)boxster64.stingr.net> Sun, 29 Jan 2006 15:21:40 +0300 committer <stingray(a)boxster64.stingr.net> Sun, 29 Jan 2006 15:21:40 +0300 src/modules/rlm_python/rlm_python.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/src/modules/rlm_python/rlm_python.c b/src/modules/rlm_python/rlm_python.c --- a/src/modules/rlm_python/rlm_python.c +++ b/src/modules/rlm_python/rlm_python.c @@ -232,6 +232,12 @@ failed: return -1; } +static int python_destroy() { + Py_XDECREF(radiusd_module); + Py_Finalize(); + return 0; +} + /* Tuple to value pair conversion */ static void add_vp_tuple(VALUE_PAIR **vpp, PyObject *pValue, const char *function_name) { @@ -774,5 +780,5 @@ module_t rlm_python = { NULL /* post-auth */ }, python_detach, /* detach */ - NULL, /* destroy */ + python_destroy, /* destroy */ }; -- Paul P 'Stingray' Komkoff Jr // http://stingr.net/key <- my pgp key This message represents the official view of the voices in my head

1 0

[PATCH 4/10] rlm_python: 04-properly-initialize-radiusd-module-in-python-init.patch
by Paul P Komkoff Jr 30 Jan '06

30 Jan '06

Properly initialize radiusd_module (in python_init) Cleanup python_error --- commit 2803bf1c6d966ed8b5a1ea6deb54ab728df32277 tree dfa2a7567c484f4a07a5d4bb9e27fbb87f2d067d parent 850e29fc4532bed1394abde8aab371b14f92d5f7 author <stingray(a)boxster64.stingr.net> Sun, 29 Jan 2006 15:18:36 +0300 committer <stingray(a)boxster64.stingr.net> Sun, 29 Jan 2006 15:18:36 +0300 src/modules/rlm_python/rlm_python.c | 90 ++++++++++++++++------------------- 1 files changed, 42 insertions(+), 48 deletions(-) diff --git a/src/modules/rlm_python/rlm_python.c b/src/modules/rlm_python/rlm_python.c --- a/src/modules/rlm_python/rlm_python.c +++ b/src/modules/rlm_python/rlm_python.c @@ -181,36 +181,55 @@ static PyMethodDef radiusd_methods[] = { {NULL, NULL, 0, NULL} }; -/* - * Do any per-module initialization. e.g. set up connections - * to external databases, read configuration files, set up - * dictionary entries, etc. - * - * Try to avoid putting too much stuff in here - it's better to - * do it in instantiate() where it is not global. - */ -static int python_init(void) +static void python_error() { + PyObject *pType = NULL; + PyObject *pValue = NULL; + PyObject *pTraceback = NULL; + PyObject *pStr1 = NULL; + PyObject *pStr2 = NULL; + + PyErr_Fetch(&pType, &pValue, &pTraceback); + if (pType == NULL || pValue == NULL) + goto failed; + if ((pStr1 = PyObject_Str(pType)) == NULL || (pStr2 = PyObject_Str(pValue)) == NULL) + goto failed; + radlog(L_ERR, "rlm_python:EXCEPT:%s: %s", PyString_AsString(pStr1), PyString_AsString(pStr2)); + +failed: + Py_XDECREF(pStr1); + Py_XDECREF(pStr2); + Py_XDECREF(pType); + Py_XDECREF(pValue); + Py_XDECREF(pTraceback); +} + +static int python_init() { - /* - * Initialize Python interpreter. Fatal error if this fails. - */ + int i; + + Py_SetProgramName("radiusd"); + Py_Initialize(); - radlog(L_DBG, "python_init done"); + PyEval_InitThreads(); // This also grabs a lock - return 0; -} + if ((radiusd_module = Py_InitModule3("radiusd", radiusd_methods, "FreeRADIUS Module.")) == NULL) + goto failed; -/* Extract string representation of Python error. */ -static void python_error(void) { - PyObject *pType, *pValue, *pTraceback, *pStr1, *pStr2; + for (i = 0; radiusd_constants[i].name; i++) + if ((PyModule_AddIntConstant(radiusd_module, radiusd_constants[i].name, radiusd_constants[i].value)) < 0) + goto failed; - PyErr_Fetch(&pType, &pValue, &pTraceback); - pStr1 = PyObject_Str(pType); - pStr2 = PyObject_Str(pValue); + PyEval_ReleaseLock(); // Drop lock grabbed by InitThreads - radlog(L_ERR, "%s: %s\n", - PyString_AsString(pStr1), PyString_AsString(pStr2)); + radlog(L_DBG, "python_init done"); + + return 0; + +failed: + python_error(); + Py_Finalize(); + return -1; } /* Tuple to value pair conversion */ @@ -566,7 +585,6 @@ static int load_python_function(const ch static int python_instantiate(CONF_SECTION *conf, void **instance) { struct rlm_python_t *data; - int idx; /* * Set up a storage area for instance data @@ -588,30 +606,6 @@ static int python_instantiate(CONF_SECTI /* - * Setup our 'radiusd' module. - */ - - /* Code */ - if ((radiusd_module = - Py_InitModule3("radiusd", radiusd_methods, - "FreeRADIUS Module.")) == NULL) { - - radlog(L_ERR, "Python Py_InitModule3 failed"); - free(data); - return -1; - } - - /* - * Load constants into module - */ - for (idx=0; radiusd_constants[idx].name; idx++) - if ((PyModule_AddIntConstant(radiusd_module, radiusd_constants[idx].name, radiusd_constants[idx].value)) == -1) { - - radlog(L_ERR, "Python AddIntConstant failed"); - } - - - /* * Import user modules. */ -- Paul P 'Stingray' Komkoff Jr // http://stingr.net/key <- my pgp key This message represents the official view of the voices in my head

1 0

[PATCH 3/10] rlm_python: 03-cleanup-radius-constants.patch
by Paul P Komkoff Jr 30 Jan '06

30 Jan '06

Cleanup radius_constants --- commit 850e29fc4532bed1394abde8aab371b14f92d5f7 tree 529b8ecb89184be8c779afd81daad1d725e1b511 parent 6050d39e6f0c26ecd73c026fcca6e6a17806a4e3 author <stingray(a)boxster64.stingr.net> Sun, 29 Jan 2006 15:03:39 +0300 committer <stingray(a)boxster64.stingr.net> Sun, 29 Jan 2006 15:03:39 +0300 src/modules/rlm_python/rlm_python.c | 50 ++++++++++++++++++----------------- 1 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/modules/rlm_python/rlm_python.c b/src/modules/rlm_python/rlm_python.c --- a/src/modules/rlm_python/rlm_python.c +++ b/src/modules/rlm_python/rlm_python.c @@ -129,6 +129,29 @@ static CONF_PARSER module_config[] = { { NULL, -1, 0, NULL, NULL } /* end the list */ }; +static struct { + const char* name; + int value; +} radiusd_constants[] = { + { "L_DBG", L_DBG }, + { "L_AUTH", L_AUTH }, + { "L_INFO", L_INFO }, + { "L_ERR", L_ERR }, + { "L_PROXY", L_PROXY }, + { "L_CONS", L_CONS }, + { "RLM_MODULE_REJECT", RLM_MODULE_REJECT }, + { "RLM_MODULE_FAIL", RLM_MODULE_FAIL }, + { "RLM_MODULE_OK", RLM_MODULE_OK }, + { "RLM_MODULE_HANDLED", RLM_MODULE_HANDLED }, + { "RLM_MODULE_INVALID", RLM_MODULE_INVALID }, + { "RLM_MODULE_USERLOCK",RLM_MODULE_USERLOCK }, + { "RLM_MODULE_NOTFOUND",RLM_MODULE_NOTFOUND }, + { "RLM_MODULE_NOOP", RLM_MODULE_NOOP }, + { "RLM_MODULE_UPDATED", RLM_MODULE_UPDATED }, + { "RLM_MODULE_NUMCODES",RLM_MODULE_NUMCODES }, + { NULL, 0 }, +}; + /* Let assume that radiusd module is only one since we have only one intepreter */ @@ -493,29 +516,6 @@ static int python_function(REQUEST *requ } -static struct varlookup { - const char* name; - int value; -} constants[] = { - { "L_DBG", L_DBG }, - { "L_AUTH", L_AUTH }, - { "L_INFO", L_INFO }, - { "L_ERR", L_ERR }, - { "L_PROXY", L_PROXY }, - { "L_CONS", L_CONS }, - { "RLM_MODULE_REJECT", RLM_MODULE_REJECT }, - { "RLM_MODULE_FAIL", RLM_MODULE_FAIL }, - { "RLM_MODULE_OK", RLM_MODULE_OK }, - { "RLM_MODULE_HANDLED", RLM_MODULE_HANDLED }, - { "RLM_MODULE_INVALID", RLM_MODULE_INVALID }, - { "RLM_MODULE_USERLOCK",RLM_MODULE_USERLOCK }, - { "RLM_MODULE_NOTFOUND",RLM_MODULE_NOTFOUND }, - { "RLM_MODULE_NOOP", RLM_MODULE_NOOP }, - { "RLM_MODULE_UPDATED", RLM_MODULE_UPDATED }, - { "RLM_MODULE_NUMCODES",RLM_MODULE_NUMCODES }, - { NULL, 0 }, -}; - /* * Import a user module and load a function from it */ @@ -604,8 +604,8 @@ static int python_instantiate(CONF_SECTI /* * Load constants into module */ - for (idx=0; constants[idx].name; idx++) - if ((PyModule_AddIntConstant(radiusd_module, constants[idx].name, constants[idx].value)) == -1) { + for (idx=0; radiusd_constants[idx].name; idx++) + if ((PyModule_AddIntConstant(radiusd_module, radiusd_constants[idx].name, radiusd_constants[idx].value)) == -1) { radlog(L_ERR, "Python AddIntConstant failed"); } -- Paul P 'Stingray' Komkoff Jr // http://stingr.net/key <- my pgp key This message represents the official view of the voices in my head

1 0

[PATCH 2/10] rlm_python: 02-rename-radlog-py-to-python-radlog.patch
by Paul P Komkoff Jr 30 Jan '06

30 Jan '06

Rename radlog_py to python_radlog Add Py_INCREF(None) because we are returning it. Change radlog invokation. --- commit 6050d39e6f0c26ecd73c026fcca6e6a17806a4e3 tree 5e412673bfc4727599b0afa7c5e917cdf1a5ddf5 parent 20b0202331f6bc26c46d3c91caf3c209a5958e01 author <stingray(a)boxster64.stingr.net> Sun, 29 Jan 2006 14:54:05 +0300 committer <stingray(a)boxster64.stingr.net> Sun, 29 Jan 2006 14:54:05 +0300 src/modules/rlm_python/rlm_python.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/modules/rlm_python/rlm_python.c b/src/modules/rlm_python/rlm_python.c --- a/src/modules/rlm_python/rlm_python.c +++ b/src/modules/rlm_python/rlm_python.c @@ -139,7 +139,7 @@ static PyObject *radiusd_module = NULL; */ /* radlog wrapper */ -static PyObject *radlog_py(const PyObject *self, PyObject *args) { +static PyObject *python_radlog(const PyObject *module, PyObject *args) { int status; char *msg; @@ -147,12 +147,14 @@ static PyObject *radlog_py(const PyObjec return NULL; } - radlog(status, msg); + radlog(status, "%s", msg); + Py_INCREF(Py_None); + return Py_None; } static PyMethodDef radiusd_methods[] = { - {"radlog", (PyCFunction)radlog_py, METH_VARARGS, "freeradius radlog()."}, + {"radlog", (PyCFunction) &python_radlog, METH_VARARGS, "freeradius radlog()."}, {NULL, NULL, 0, NULL} }; -- Paul P 'Stingray' Komkoff Jr // http://stingr.net/key <- my pgp key This message represents the official view of the voices in my head

1 0

rlm_ippool failed to get Pool-Name attribute on solaris 10
by German Gumenyuk 30 Jan '06

30 Jan '06

dear All, i need freeradius to assign IP address from several IP pools (rlm_ippool). Before i have tryed this on Linux (suse 10). that worked fine I have taken the same configuaration to the solaris 10 - thing does not work. In debug info comes: --- Processing the post-auth section of radiusd.conf modcall: entering group post-auth for request 0 rlm_ippool: Could not find Pool-Name attribute. modcall[post-auth]: module "p2_2" returns noop for request 0 rlm_ippool: Could not find Pool-Name attribute. modcall[post-auth]: module "p2_3" returns noop for request 0 rlm_ippool: Could not find Pool-Name attribute. modcall[post-auth]: module "p2_4" returns noop for request 0 rlm_ippool: Could not find Pool-Name attribute. modcall[post-auth]: module "p2_5" returns noop for request 0 rlm_ippool: Could not find Pool-Name attribute. modcall[post-auth]: module "p2_6" returns noop for request 0 modcall: group post-auth returns noop for request 0 --- As result Access-Accept is sent without IP address. i have tryed that on solaris with freeradius 1.1.0 in 64-bit and with 1.0.5 with 32-bit (similar i have used on suse) here is part of my users config file: user4 Auth-Type := Local, User-Password == "user4" Cisco-Avpair = "gprs:charging-profile-index=6", Cisco-Avpair += "csg:billing_plan=", Fall-Through = yes DEFAULT Client-IP-Address == "10.200.12.31", NAS-Identifier == "GGSN02_s4", Pool-Name := "p2_2" Service-Type = Login, Framed-Protocol = PPP DEFAULT Client-IP-Address == "10.200.12.32", NAS-Identifier == "GGSN03_s4", Pool-Name := "p2_3" Service-Type = Login, Framed-Protocol = PPP ... Can you please tell me where in sources it takes place assignment of the PW_POOL_NAME attribute to the request->config_items. What could be here the problem ? appriciate you help in this matter German Gumenyuk --------------------------------- Bring words and photos together (easily) with PhotoMail - it's free and works with Yahoo! Mail.

2 1