* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-
+
/**
* $Id$
* @file rlm_perl.c
* @copyright 2002,2006 The FreeRADIUS server project
* @copyright 2002 Boian Jordanov <bjordanov@orbitel.bg>
*/
-#include <freeradius-devel/ident.h>
RCSID("$Id$")
#include <freeradius-devel/radiusd.h>
#include <freeradius-devel/modules.h>
-
-#ifdef DEBUG
-#undef DEBUG
-#endif
+#include <freeradius-devel/rad_assert.h>
#ifdef INADDR_ANY
#undef INADDR_ANY
* a lot cleaner to do so, and a pointer to the structure can
* be used as the instance handle.
*/
-typedef struct perl_inst {
+typedef struct rlm_perl_t {
/* Name of the perl module */
- char *module;
+ char const *module;
/* Name of the functions for each module method */
- char *func_authorize;
- char *func_authenticate;
- char *func_accounting;
- char *func_start_accounting;
- char *func_stop_accounting;
- char *func_preacct;
- char *func_checksimul;
- char *func_detach;
- char *func_xlat;
+ char const *func_authorize;
+ char const *func_authenticate;
+ char const *func_accounting;
+ char const *func_start_accounting;
+ char const *func_stop_accounting;
+ char const *func_preacct;
+ char const *func_checksimul;
+ char const *func_detach;
+ char const *func_xlat;
#ifdef WITH_PROXY
- char *func_pre_proxy;
- char *func_post_proxy;
+ char const *func_pre_proxy;
+ char const *func_post_proxy;
#endif
- char *func_post_auth;
+ char const *func_post_auth;
#ifdef WITH_COA
- char *func_recv_coa;
- char *func_send_coa;
+ char const *func_recv_coa;
+ char const *func_send_coa;
#endif
- char *xlat_name;
- char *perl_flags;
- PerlInterpreter *perl;
+ char const *xlat_name;
+ char const *perl_flags;
+ PerlInterpreter *perl;
pthread_key_t *thread_key;
- pthread_mutex_t clone_mutex;
-} PERL_INST;
+#ifdef USE_ITHREADS
+ pthread_mutex_t clone_mutex;
+#endif
+
+ HV *rad_perlconf_hv; //!< holds "config" items (perl %RAD_PERLCONF hash).
+
+} rlm_perl_t;
/*
* A mapping of configuration file names to internal variables.
- *
- * Note that the string is dynamically allocated, so it MUST
- * be freed. When the configuration file parse re-reads the string,
- * it free's the old one, and strdup's the new one, placing the pointer
- * to the strdup'd string into 'config.string'. This gets around
- * buffer over-flows.
*/
+#define RLM_PERL_CONF(_x) { "func_" STRINGIFY(_x), PW_TYPE_STRING, \
+ offsetof(rlm_perl_t,func_##_x), NULL, STRINGIFY(_x)}
+
static const CONF_PARSER module_config[] = {
- { "module", PW_TYPE_FILENAME,
- offsetof(PERL_INST,module), NULL, "module"},
- { "func_authorize", PW_TYPE_STRING_PTR,
- offsetof(PERL_INST,func_authorize), NULL, "authorize"},
- { "func_authenticate", PW_TYPE_STRING_PTR,
- offsetof(PERL_INST,func_authenticate), NULL, "authenticate"},
- { "func_accounting", PW_TYPE_STRING_PTR,
- offsetof(PERL_INST,func_accounting), NULL, "accounting"},
- { "func_preacct", PW_TYPE_STRING_PTR,
- offsetof(PERL_INST,func_preacct), NULL, "preacct"},
- { "func_checksimul", PW_TYPE_STRING_PTR,
- offsetof(PERL_INST,func_checksimul), NULL, "checksimul"},
- { "func_detach", PW_TYPE_STRING_PTR,
- offsetof(PERL_INST,func_detach), NULL, "detach"},
- { "func_xlat", PW_TYPE_STRING_PTR,
- offsetof(PERL_INST,func_xlat), NULL, "xlat"},
+ { "module", FR_CONF_OFFSET(PW_TYPE_FILE_INPUT | PW_TYPE_DEPRECATED, rlm_perl_t, module), NULL },
+ { "filename", FR_CONF_OFFSET(PW_TYPE_FILE_INPUT | PW_TYPE_REQUIRED, rlm_perl_t, module), NULL },
+
+ RLM_PERL_CONF(authorize),
+ RLM_PERL_CONF(authenticate),
+ RLM_PERL_CONF(post_auth),
+ RLM_PERL_CONF(accounting),
+ RLM_PERL_CONF(preacct),
+ RLM_PERL_CONF(checksimul),
+ RLM_PERL_CONF(detach),
+ RLM_PERL_CONF(xlat),
+
#ifdef WITH_PROXY
- { "func_pre_proxy", PW_TYPE_STRING_PTR,
- offsetof(PERL_INST,func_pre_proxy), NULL, "pre_proxy"},
- { "func_post_proxy", PW_TYPE_STRING_PTR,
- offsetof(PERL_INST,func_post_proxy), NULL, "post_proxy"},
+ RLM_PERL_CONF(pre_proxy),
+ RLM_PERL_CONF(post_proxy),
#endif
- { "func_post_auth", PW_TYPE_STRING_PTR,
- offsetof(PERL_INST,func_post_auth), NULL, "post_auth"},
#ifdef WITH_COA
- { "func_recv_coa", PW_TYPE_STRING_PTR,
- offsetof(PERL_INST,func_recv_coa), NULL, "recv_coa"},
- { "func_send_coa", PW_TYPE_STRING_PTR,
- offsetof(PERL_INST,func_send_coa), NULL, "send_coa"},
+ RLM_PERL_CONF(recv_coa),
+ RLM_PERL_CONF(send_coa),
#endif
- { "perl_flags", PW_TYPE_STRING_PTR,
- offsetof(PERL_INST,perl_flags), NULL, NULL},
- { "func_start_accounting", PW_TYPE_STRING_PTR,
- offsetof(PERL_INST,func_start_accounting), NULL, NULL},
- { "func_stop_accounting", PW_TYPE_STRING_PTR,
- offsetof(PERL_INST,func_stop_accounting), NULL, NULL},
+ { "perl_flags", FR_CONF_OFFSET(PW_TYPE_STRING, rlm_perl_t, perl_flags), NULL },
+
+ { "func_start_accounting", FR_CONF_OFFSET(PW_TYPE_STRING, rlm_perl_t, func_start_accounting), NULL },
+
+ { "func_stop_accounting", FR_CONF_OFFSET(PW_TYPE_STRING, rlm_perl_t, func_stop_accounting), NULL },
{ NULL, -1, 0, NULL, NULL } /* end the list */
};
#define dl_modules "DynaLoader::dl_modules"
static void rlm_perl_clear_handles(pTHX)
{
- AV *librefs = get_av(dl_librefs, FALSE);
+ AV *librefs = get_av(dl_librefs, false);
if (librefs) {
av_clear(librefs);
}
static void **rlm_perl_get_handles(pTHX)
{
I32 i;
- AV *librefs = get_av(dl_librefs, FALSE);
- AV *modules = get_av(dl_modules, FALSE);
+ AV *librefs = get_av(dl_librefs, false);
+ AV *modules = get_av(dl_modules, false);
void **handles;
if (!librefs) return NULL;
for (i=0; i<=AvFILL(librefs); i++) {
void *handle;
- SV *handle_sv = *av_fetch(librefs, i, FALSE);
+ SV *handle_sv = *av_fetch(librefs, i, false);
if(!handle_sv) {
- radlog(L_ERR,
- "Could not fetch $%s[%d]!\n",
+ ERROR("Could not fetch $%s[%d]!\n",
dl_librefs, (int)i);
- continue;
+ continue;
}
handle = (void *)SvIV(handle_sv);
if (handle) {
- handles[i] = handle;
+ handles[i] = handle;
}
}
}
for (i=0; handles[i]; i++) {
- radlog(L_DBG, "close %p\n", handles[i]);
+ DEBUG("close %p\n", handles[i]);
dlclose(handles[i]);
}
free(handles);
}
+DIAG_OFF(shadow)
static void rlm_perl_destruct(PerlInterpreter *perl)
{
dTHXa(perl);
PL_origenviron = environ;
+
{
dTHXa(perl);
}
perl_destruct(perl);
perl_free(perl);
}
+DIAG_ON(shadow)
static void rlm_destroy_perl(PerlInterpreter *perl)
{
static PerlInterpreter *rlm_perl_clone(PerlInterpreter *perl, pthread_key_t *key)
{
+ int ret;
+
PerlInterpreter *interp;
UV clone_flags = 0;
PL_ptr_table = NULL;
PERL_SET_CONTEXT(aTHX);
- rlm_perl_clear_handles(aTHX);
+ rlm_perl_clear_handles(aTHX);
- pthread_setspecific(*key, interp);
+ ret = pthread_setspecific(*key, interp);
+ if (ret != 0) {
+ DEBUG("rlm_perl: Failed associating interpretor with thread %s", fr_syserror(ret));
+
+ rlm_perl_destruct(interp);
+ return NULL;
+ }
return interp;
}
#endif
-static void xs_init(pTHX)
-{
- const char *file = __FILE__;
-
- /* DynaLoader is a special case */
- newXS("DynaLoader::boot_DynaLoader", boot_DynaLoader, file);
-
-}
/*
- *
* This is wrapper for radlog
* Now users can call radiusd::radlog(level,msg) wich is the same
* calling radlog from C code.
- * Boyan
*/
static XS(XS_radiusd_radlog)
{
- dXSARGS;
- if (items !=2)
- croak("Usage: radiusd::radlog(level, message)");
- {
- int level;
- char *msg;
-
- level = (int) SvIV(ST(0));
- msg = (char *) SvPV(ST(1), PL_na);
-
- /*
- * Because 'msg' is a 'char *', we don't want '%s', etc.
- * in it to give us printf-style vulnerabilities.
- */
- radlog(level, "rlm_perl: %s", msg);
+ dXSARGS;
+ if (items !=2)
+ croak("Usage: radiusd::radlog(level, message)");
+ {
+ int level;
+ char *msg;
+
+ level = (int) SvIV(ST(0));
+ msg = (char *) SvPV(ST(1), PL_na);
+
+ /*
+ * Because 'msg' is a 'char *', we don't want '%s', etc.
+ * in it to give us printf-style vulnerabilities.
+ */
+ radlog(level, "rlm_perl: %s", msg);
}
- XSRETURN_NO;
+ XSRETURN_NO;
+}
+
+static void xs_init(pTHX)
+{
+ char const *file = __FILE__;
+
+ /* DynaLoader is a special case */
+ newXS("DynaLoader::boot_DynaLoader", boot_DynaLoader, file);
+
+ newXS("radiusd::radlog",XS_radiusd_radlog, "rlm_perl");
}
/*
* The xlat function
*/
-static size_t perl_xlat(void *instance, REQUEST *request, const char *fmt,
- char *out, size_t freespace)
+static ssize_t perl_xlat(void *instance, REQUEST *request, char const *fmt, char *out, size_t freespace)
{
- PERL_INST *inst= (PERL_INST *) instance;
- PerlInterpreter *perl;
- char params[1024], *ptr, *tmp;
+ rlm_perl_t *inst = (rlm_perl_t *) instance;
+ char *tmp;
+ char const *p, *q;
int count;
size_t ret = 0;
STRLEN n_a;
- /*
- * Do an xlat on the provided string (nice recursive operation).
- */
- if (!radius_xlat(params, sizeof(params), fmt, request, NULL, NULL)) {
- radlog(L_ERR, "rlm_perl: xlat failed.");
- return 0;
- }
+#ifdef USE_ITHREADS
+ PerlInterpreter *interp;
-#ifndef WITH_ITHREADS
- perl = inst->perl;
-#else
- perl = rlm_perl_clone(inst->perl,inst->thread_key);
+ pthread_mutex_lock(&inst->clone_mutex);
+ interp = rlm_perl_clone(inst->perl, inst->thread_key);
{
- dTHXa(perl);
+ dTHXa(interp);
+ PERL_SET_CONTEXT(interp);
}
+ pthread_mutex_unlock(&inst->clone_mutex);
+#else
+ PERL_SET_CONTEXT(inst->perl);
#endif
- PERL_SET_CONTEXT(perl);
{
- dSP;
- ENTER;SAVETMPS;
+ dSP;
+ ENTER;SAVETMPS;
- ptr = strtok(params, " ");
+ PUSHMARK(SP);
- PUSHMARK(SP);
+ p = fmt;
+ while ((q = strchr(p, ' '))) {
+ XPUSHs(sv_2mortal(newSVpv(p, p - q)));
- while (ptr != NULL) {
- XPUSHs(sv_2mortal(newSVpv(ptr,0)));
- ptr = strtok(NULL, " ");
- }
+ p = q + 1;
+ }
- PUTBACK;
+ PUTBACK;
- count = call_pv(inst->func_xlat, G_SCALAR | G_EVAL);
+ count = call_pv(inst->func_xlat, G_SCALAR | G_EVAL);
- SPAGAIN;
- if (SvTRUE(ERRSV)) {
- radlog(L_ERR, "rlm_perl: perl_xlat exit %s\n",
- SvPV(ERRSV,n_a));
- (void)POPs;
- } else if (count > 0) {
- tmp = POPp;
- strlcpy(out, tmp, freespace);
- ret = strlen(out);
+ SPAGAIN;
+ if (SvTRUE(ERRSV)) {
+ REDEBUG("Exit %s", SvPV(ERRSV,n_a));
+ (void)POPs;
+ } else if (count > 0) {
+ tmp = POPp;
+ strlcpy(out, tmp, freespace);
+ ret = strlen(out);
+
+ RDEBUG("Len is %zu , out is %s freespace is %zu", ret, out, freespace);
+ }
+
+ PUTBACK ;
+ FREETMPS ;
+ LEAVE ;
- radlog(L_DBG,"rlm_perl: Len is %zu , out is %s freespace is %zu",
- ret, out, freespace);
}
- PUTBACK ;
- FREETMPS ;
- LEAVE ;
+ return ret;
+}
+
+/*
+ * Parse a configuration section, and populate a HV.
+ * This function is recursively called (allows to have nested hashes.)
+ */
+static void perl_parse_config(CONF_SECTION *cs, int lvl, HV *rad_hv)
+{
+ if (!cs || !rad_hv) return;
+
+ int indent_section = (lvl + 1) * 4;
+ int indent_item = (lvl + 2) * 4;
+
+ DEBUG("%*s%s {", indent_section, " ", cf_section_name1(cs));
+
+ CONF_ITEM *ci;
+
+ for (ci = cf_item_find_next(cs, NULL);
+ ci;
+ ci = cf_item_find_next(cs, ci)) {
+ /*
+ * This is a section.
+ * Create a new HV, store it as a reference in current HV,
+ * Then recursively call perl_parse_config with this section and the new HV.
+ */
+ if (cf_item_is_section(ci)) {
+ CONF_SECTION *sub_cs = cf_itemtosection(ci);
+ char const *key = cf_section_name1(sub_cs); /* hash key */
+ HV *sub_hv;
+ SV *ref;
+
+ if (!key) continue;
+
+ if (hv_exists(rad_hv, key, strlen(key))) {
+ WARN("rlm_perl: Ignoring duplicate config section '%s'", key);
+ continue;
+ }
+
+ sub_hv = newHV();
+ ref = newRV_inc((SV*) sub_hv);
+
+ (void)hv_store(rad_hv, key, strlen(key), ref, 0);
+
+ perl_parse_config(sub_cs, lvl + 1, sub_hv);
+ } else if (cf_item_is_pair(ci)){
+ CONF_PAIR *cp = cf_itemtopair(ci);
+ char const *key = cf_pair_attr(cp); /* hash key */
+ char const *value = cf_pair_value(cp); /* hash value */
+
+ if (!key || !value) continue;
+ /*
+ * This is an item.
+ * Store item attr / value in current HV.
+ */
+ if (hv_exists(rad_hv, key, strlen(key))) {
+ WARN("rlm_perl: Ignoring duplicate config item '%s'", key);
+ continue;
+ }
+
+ (void)hv_store(rad_hv, key, strlen(key), newSVpv(value, strlen(value)), 0);
+
+ DEBUG("%*s%s = %s", indent_item, " ", key, value);
+ }
}
- return ret;
+
+ DEBUG("%*s}", indent_section, " ");
}
+
/*
* Do any per-module initialization that is separate to each
* configured instance of the module. e.g. set up connections
* that must be referenced in later calls, store a handle to it
* in *instance otherwise put a null pointer there.
*
- * Boyan:
* Setup a hashes wich we will use later
* parse a module and give him a chance to live
*
*/
-static int perl_instantiate(CONF_SECTION *conf, void **instance)
+static int mod_instantiate(CONF_SECTION *conf, void *instance)
{
- PERL_INST *inst = (PERL_INST *) instance;
- HV *rad_reply_hv;
- HV *rad_check_hv;
- HV *rad_config_hv;
- HV *rad_request_hv;
-#ifdef WITH_PROXY
- HV *rad_request_proxy_hv;
- HV *rad_request_proxy_reply_hv;
-#endif
+ rlm_perl_t *inst = instance;
AV *end_AV;
+ char const **embed_c; /* Stupid Perl and lack of const consistency */
char **embed;
- char **envp = NULL;
- const char *xlat_name;
+ char **envp = NULL;
+ char const *xlat_name;
int exitstatus = 0, argc=0;
- embed = rad_malloc(4 * sizeof(char *));
- memset(embed, 0, 4 *sizeof(char *));
- /*
- * Set up a storage area for instance data
- */
- inst = rad_malloc(sizeof(PERL_INST));
- memset(inst, 0, sizeof(PERL_INST));
-
- /*
- * If the configuration parameters can't be parsed, then
- * fail.
- */
- if (cf_section_parse(conf, inst, module_config) < 0) {
- free(embed);
- free(inst);
- return -1;
- }
-
+ MEM(embed_c = talloc_zero_array(inst, char const *, 4));
+ memcpy(&embed, &embed_c, sizeof(embed));
/*
* Create pthread key. This key will be stored in instance
*/
inst->thread_key = rad_malloc(sizeof(*inst->thread_key));
memset(inst->thread_key,0,sizeof(*inst->thread_key));
-
+
rlm_perl_make_key(inst->thread_key);
#endif
char arg[] = "0";
-
- embed[0] = NULL;
+
+ embed_c[0] = NULL;
if (inst->perl_flags) {
- embed[1] = inst->perl_flags;
- embed[2] = inst->module;
- embed[3] = arg;
+ embed_c[1] = inst->perl_flags;
+ embed_c[2] = inst->module;
+ embed_c[3] = arg;
argc = 4;
} else {
- embed[1] = inst->module;
- embed[2] = arg;
+ embed_c[1] = inst->module;
+ embed_c[2] = arg;
argc = 3;
}
- PERL_SYS_INIT3(&argc, &embed, &envp);
-#ifdef USE_ITHREADS
+ PERL_SYS_INIT3(&argc, &embed, &envp);
+
if ((inst->perl = perl_alloc()) == NULL) {
- radlog(L_DBG, "rlm_perl: No memory for allocating new perl !");
- free(embed);
- free(inst);
+ ERROR("rlm_perl: No memory for allocating new perl !");
return (-1);
}
perl_construct(inst->perl);
+
+#ifdef USE_ITHREADS
PL_perl_destruct_level = 2;
{
- dTHXa(inst->perl);
+ dTHXa(inst->perl);
}
PERL_SET_CONTEXT(inst->perl);
-#else
- if ((inst->perl = perl_alloc()) == NULL) {
- radlog(L_ERR, "rlm_perl: No memory for allocating new perl !");
- free(embed);
- free(inst);
- return -1;
- }
-
- perl_construct(inst->perl);
#endif
#if PERL_REVISION >= 5 && PERL_VERSION >=8
end_AV = PL_endav;
PL_endav = Nullav;
- newXS("radiusd::radlog",XS_radiusd_radlog, "rlm_perl");
-
if(!exitstatus) {
- exitstatus = perl_run(inst->perl);
+ perl_run(inst->perl);
} else {
- radlog(L_ERR,"rlm_perl: perl_parse failed: %s not found or has syntax errors. \n", inst->module);
- free(embed);
- free(inst);
+ ERROR("rlm_perl: perl_parse failed: %s not found or has syntax errors. \n", inst->module);
return (-1);
}
PL_endav = end_AV;
- rad_reply_hv = newHV();
- rad_check_hv = newHV();
- rad_config_hv = newHV();
- rad_request_hv = newHV();
-#ifdef WITH_PROXY
- rad_request_proxy_hv = newHV();
- rad_request_proxy_reply_hv = newHV();
-#endif
-
- rad_reply_hv = get_hv("RAD_REPLY",1);
- rad_check_hv = get_hv("RAD_CHECK",1);
- rad_config_hv = get_hv("RAD_CONFIG",1);
- rad_request_hv = get_hv("RAD_REQUEST",1);
-#ifdef WITH_PROXY
- rad_request_proxy_hv = get_hv("RAD_REQUEST_PROXY",1);
- rad_request_proxy_reply_hv = get_hv("RAD_REQUEST_PROXY_REPLY",1);
-#endif
-
xlat_name = cf_section_name2(conf);
- if (xlat_name == NULL)
+ if (!xlat_name)
xlat_name = cf_section_name1(conf);
- if (xlat_name){
- inst->xlat_name = strdup(xlat_name);
- xlat_register(xlat_name, perl_xlat, inst);
+ if (xlat_name) {
+ xlat_register(xlat_name, perl_xlat, NULL, inst);
}
- *instance = inst;
+ /* parse perl configuration sub-section */
+ CONF_SECTION *cs;
+ cs = cf_section_sub_find(conf, "config");
+ if (cs) {
+ DEBUG("rlm_perl (%s): parsing 'config' section...", xlat_name);
+
+ inst->rad_perlconf_hv = get_hv("RAD_PERLCONF",1);
+ perl_parse_config(cs, 0, inst->rad_perlconf_hv);
+
+ DEBUG("rlm_perl (%s): done parsing 'config'.", xlat_name);
+ }
return 0;
}
* Example for this is Cisco-AVPair that holds multiple values.
* Which will be available as array_ref in $RAD_REQUEST{'Cisco-AVPair'}
*/
-static void perl_store_vps(VALUE_PAIR *vp, HV *rad_hv)
+static void perl_store_vps(UNUSED TALLOC_CTX *ctx, REQUEST *request, VALUE_PAIR *vps, HV *rad_hv)
{
- VALUE_PAIR *nvp, *vpa;
- AV *av;
- const char *name;
- char namebuf[256];
- char buffer[1024];
- int len;
+ VALUE_PAIR *vp;
hv_undef(rad_hv);
-
- /*
- * Copy the valuepair list so we can remove attributes we've
- * already processed.
- */
- nvp = paircopy(vp);
- while (nvp) {
+ vp_cursor_t cursor;
+
+ pairsort(&vps, attrtagcmp);
+ for (vp = fr_cursor_init(&cursor, &vps);
+ vp;
+ vp = fr_cursor_next(&cursor)) {
+ VALUE_PAIR *next;
+
+ char const *name;
+ char namebuf[256];
+ char buffer[1024];
+
+ size_t len;
+
/*
- * Tagged attributes are added to the hash with name
+ * Tagged attributes are added to the hash with name
* <attribute>:<tag>, others just use the normal attribute
* name as the key.
*/
- if (nvp->flags.has_tag && (nvp->flags.tag != 0)) {
- snprintf(namebuf, sizeof(namebuf), "%s:%d",
- nvp->name, nvp->flags.tag);
+ if (vp->da->flags.has_tag && (vp->tag != TAG_ANY)) {
+ snprintf(namebuf, sizeof(namebuf), "%s:%d", vp->da->name, vp->tag);
name = namebuf;
} else {
- name = nvp->name;
+ name = vp->da->name;
}
/*
- * Create a new list with all the attributes like this one
- * which are in the same tag group.
+ * We've sorted by type, then tag, so attributes of the
+ * same type/tag should follow on from each other.
*/
- vpa = paircopy2(nvp, nvp->attribute, nvp->vendor, nvp->flags.tag);
-
- /*
- * Attribute has multiple values
- */
- if (vpa->next) {
- VALUE_PAIR *vpn;
+ if ((next = fr_cursor_next_peek(&cursor)) && ATTRIBUTE_EQ(vp, next)) {
+ AV *av;
av = newAV();
- for (vpn = vpa; vpn; vpn = vpn->next) {
- len = vp_prints_value(buffer, sizeof(buffer), vpn, FALSE);
- av_push(av, newSVpv(buffer, len));
+ for (next = fr_cursor_first(&cursor);
+ next;
+ next = fr_cursor_next_by_da(&cursor, vp->da, vp->tag)) {
+ switch (vp->da->type) {
+ case PW_TYPE_STRING:
+ av_push(av, newSVpv(next->vp_strvalue, next->length));
+ RDEBUG("<-- %s = %s", next->da->name, next->vp_strvalue);
+ break;
+
+ default:
+ len = vp_prints_value(buffer, sizeof(buffer), next, 0);
+ RDEBUG("<-- %s = %s", next->da->name, buffer);
+ av_push(av, newSVpv(buffer, truncate_len(len, sizeof(buffer))));
+ break;
+ }
}
(void)hv_store(rad_hv, name, strlen(name), newRV_noinc((SV *)av), 0);
-
- /*
- * Attribute has a single value, so its value just gets
- * added to the hash.
- */
- } else {
- len = vp_prints_value(buffer, sizeof(buffer), vpa, FALSE);
- (void)hv_store(rad_hv, name, strlen(name), newSVpv(buffer, len), 0);
+
+ continue;
}
- pairfree(&vpa);
-
/*
- * Finally remove all the VPs we processed from our copy
- * of the list.
+ * It's a normal single valued attribute
*/
- pairdelete(&nvp, nvp->attribute, nvp->vendor, nvp->flags.tag);
- }
+ switch (vp->da->type) {
+ case PW_TYPE_STRING:
+ RDEBUG("<-- %s = %s", next->da->name, next->vp_strvalue);
+ (void)hv_store(rad_hv, name, strlen(name), newSVpv(vp->vp_strvalue, vp->length), 0);
+ break;
- pairfree(&nvp); /* shouldn't be necessary, but hey... */
+ default:
+ len = vp_prints_value(buffer, sizeof(buffer), next, 0);
+ RDEBUG("<-- %s = %s", next->da->name, buffer);
+ (void)hv_store(rad_hv, name, strlen(name), newSVpv(buffer, truncate_len(len, sizeof(buffer))), 0);
+ break;
+ }
+ }
}
/*
* Value Pair Format
*
*/
-static int pairadd_sv(VALUE_PAIR **vp, char *key, SV *sv, FR_TOKEN op) {
- char *val;
- VALUE_PAIR *vpp;
-
- if (SvOK(sv)) {
- val = SvPV_nolen(sv);
- vpp = pairmake(key, val, op);
- if (vpp != NULL) {
- pairadd(vp, vpp);
- radlog(L_DBG,
- "rlm_perl: Added pair %s = %s", key, val);
- return 1;
- } else {
- radlog(L_DBG,
- "rlm_perl: ERROR: Failed to create pair %s = %s",
- key, val);
- }
- }
- return 0;
+static int pairadd_sv(TALLOC_CTX *ctx, REQUEST *request, VALUE_PAIR **vps, char *key, SV *sv, FR_TOKEN op)
+{
+ char *val;
+ VALUE_PAIR *vp;
+
+ if (SvOK(sv)) {
+ STRLEN len;
+ val = SvPV(sv, len);
+ vp = pairmake(ctx, vps, key, NULL, op);
+ if (!vp) {
+ fail:
+ REDEBUG("Failed to create pair %s = %s", key, val);
+ return 0;
+ }
+
+ if (vp->da->type != PW_TYPE_STRING) {
+ if (pairparsevalue(vp, val, 0) < 0) goto fail;
+ } else {
+ pairstrncpy(vp, val, len);
+ }
+
+ RDEBUG("--> %s = %s", key, val);
+ return 1;
+ }
+ return 0;
}
/*
- * Boyan :
- * Gets the content from hashes
- */
-static int get_hv_content(HV *my_hv, VALUE_PAIR **vp)
+ * Gets the content from hashes
+ */
+static int get_hv_content(TALLOC_CTX *ctx, REQUEST *request, HV *my_hv, VALUE_PAIR **vps)
{
- SV *res_sv, **av_sv;
- AV *av;
- char *key;
- I32 key_len, len, i, j;
- int ret=0;
-
- *vp = NULL;
- for (i = hv_iterinit(my_hv); i > 0; i--) {
- res_sv = hv_iternextsv(my_hv,&key,&key_len);
- if (SvROK(res_sv) && (SvTYPE(SvRV(res_sv)) == SVt_PVAV)) {
- av = (AV*)SvRV(res_sv);
- len = av_len(av);
- for (j = 0; j <= len; j++) {
- av_sv = av_fetch(av, j, 0);
- ret = pairadd_sv(vp, key, *av_sv, T_OP_ADD) + ret;
- }
- } else ret = pairadd_sv(vp, key, res_sv, T_OP_EQ) + ret;
- }
-
- return ret;
+ SV *res_sv, **av_sv;
+ AV *av;
+ char *key;
+ I32 key_len, len, i, j;
+ int ret=0;
+
+ *vps = NULL;
+ for (i = hv_iterinit(my_hv); i > 0; i--) {
+ res_sv = hv_iternextsv(my_hv,&key,&key_len);
+ if (SvROK(res_sv) && (SvTYPE(SvRV(res_sv)) == SVt_PVAV)) {
+ av = (AV*)SvRV(res_sv);
+ len = av_len(av);
+ for (j = 0; j <= len; j++) {
+ av_sv = av_fetch(av, j, 0);
+ ret = pairadd_sv(ctx, request, vps, key, *av_sv, T_OP_ADD) + ret;
+ }
+ } else ret = pairadd_sv(ctx, request, vps, key, res_sv, T_OP_EQ) + ret;
+ }
+
+ return ret;
}
/*
* Store all vps in hashes %RAD_CHECK %RAD_REPLY %RAD_REQUEST
*
*/
-static int rlmperl_call(void *instance, REQUEST *request, char *function_name)
+static int do_perl(void *instance, REQUEST *request, char const *function_name)
{
- PERL_INST *inst = instance;
+ rlm_perl_t *inst = instance;
VALUE_PAIR *vp;
int exitstatus=0, count;
STRLEN n_a;
HV *rad_request_proxy_hv;
HV *rad_request_proxy_reply_hv;
#endif
-
+
+ /*
+ * Radius has told us to call this function, but none
+ * is defined.
+ */
+ if (!function_name) return RLM_MODULE_FAIL;
+
#ifdef USE_ITHREADS
pthread_mutex_lock(&inst->clone_mutex);
interp = rlm_perl_clone(inst->perl,inst->thread_key);
{
- dTHXa(interp);
- PERL_SET_CONTEXT(interp);
+ dTHXa(interp);
+ PERL_SET_CONTEXT(interp);
}
-
+
pthread_mutex_unlock(&inst->clone_mutex);
#else
PERL_SET_CONTEXT(inst->perl);
#endif
{
- dSP;
+ dSP;
- ENTER;
- SAVETMPS;
+ ENTER;
+ SAVETMPS;
+ rad_reply_hv = get_hv("RAD_REPLY",1);
+ rad_check_hv = get_hv("RAD_CHECK",1);
+ rad_config_hv = get_hv("RAD_CONFIG",1);
+ rad_request_hv = get_hv("RAD_REQUEST",1);
- /*
- * Radius has told us to call this function, but none
- * is defined.
- */
- if (!function_name) {
- return RLM_MODULE_FAIL;
- }
+ perl_store_vps(request->reply, request, request->reply->vps, rad_reply_hv);
+ perl_store_vps(request, request, request->config_items, rad_check_hv);
+ perl_store_vps(request->packet, request, request->packet->vps, rad_request_hv);
+ perl_store_vps(request, request, request->config_items, rad_config_hv);
- rad_reply_hv = get_hv("RAD_REPLY",1);
- rad_check_hv = get_hv("RAD_CHECK",1);
- rad_config_hv = get_hv("RAD_CONFIG",1);
- rad_request_hv = get_hv("RAD_REQUEST",1);
#ifdef WITH_PROXY
- rad_request_proxy_hv = get_hv("RAD_REQUEST_PROXY",1);
- rad_request_proxy_reply_hv = get_hv("RAD_REQUEST_PROXY_REPLY",1);
+ rad_request_proxy_hv = get_hv("RAD_REQUEST_PROXY",1);
+ rad_request_proxy_reply_hv = get_hv("RAD_REQUEST_PROXY_REPLY",1);
+
+ if (request->proxy != NULL) {
+ perl_store_vps(request->proxy, request, request->proxy->vps, rad_request_proxy_hv);
+ } else {
+ hv_undef(rad_request_proxy_hv);
+ }
+
+ if (request->proxy_reply !=NULL) {
+ perl_store_vps(request->proxy_reply, request, request->proxy_reply->vps, rad_request_proxy_reply_hv);
+ } else {
+ hv_undef(rad_request_proxy_reply_hv);
+ }
#endif
- perl_store_vps(request->reply->vps, rad_reply_hv);
- perl_store_vps(request->config_items, rad_check_hv);
- perl_store_vps(request->packet->vps, rad_request_hv);
- perl_store_vps(request->config_items, rad_config_hv);
+ PUSHMARK(SP);
+ /*
+ * This way %RAD_xx can be pushed onto stack as sub parameters.
+ * XPUSHs( newRV_noinc((SV *)rad_request_hv) );
+ * XPUSHs( newRV_noinc((SV *)rad_reply_hv) );
+ * XPUSHs( newRV_noinc((SV *)rad_check_hv) );
+ * PUTBACK;
+ */
-#ifdef WITH_PROXY
- if (request->proxy != NULL) {
- perl_store_vps(request->proxy->vps, rad_request_proxy_hv);
- } else {
- hv_undef(rad_request_proxy_hv);
- }
+ count = call_pv(function_name, G_SCALAR | G_EVAL | G_NOARGS);
- if (request->proxy_reply !=NULL) {
- perl_store_vps(request->proxy_reply->vps, rad_request_proxy_reply_hv);
- } else {
- hv_undef(rad_request_proxy_reply_hv);
- }
-#endif
+ SPAGAIN;
- PUSHMARK(SP);
- /*
- * This way %RAD_xx can be pushed onto stack as sub parameters.
- * XPUSHs( newRV_noinc((SV *)rad_request_hv) );
- * XPUSHs( newRV_noinc((SV *)rad_reply_hv) );
- * XPUSHs( newRV_noinc((SV *)rad_check_hv) );
- * PUTBACK;
- */
-
- count = call_pv(function_name, G_SCALAR | G_EVAL | G_NOARGS);
-
- SPAGAIN;
-
- if (SvTRUE(ERRSV)) {
- radlog(L_ERR, "rlm_perl: perl_embed:: module = %s , func = %s exit status= %s\n",
- inst->module,
- function_name, SvPV(ERRSV,n_a));
- (void)POPs;
- }
+ if (SvTRUE(ERRSV)) {
+ ERROR("rlm_perl: perl_embed:: module = %s , func = %s exit status= %s\n",
+ inst->module,
+ function_name, SvPV(ERRSV,n_a));
+ (void)POPs;
+ }
- if (count == 1) {
- exitstatus = POPi;
- if (exitstatus >= 100 || exitstatus < 0) {
- exitstatus = RLM_MODULE_FAIL;
+ if (count == 1) {
+ exitstatus = POPi;
+ if (exitstatus >= 100 || exitstatus < 0) {
+ exitstatus = RLM_MODULE_FAIL;
+ }
}
- }
- PUTBACK;
- FREETMPS;
- LEAVE;
+ PUTBACK;
+ FREETMPS;
+ LEAVE;
- vp = NULL;
- if ((get_hv_content(rad_request_hv, &vp)) > 0 ) {
- pairfree(&request->packet->vps);
- request->packet->vps = vp;
vp = NULL;
+ if ((get_hv_content(request->packet, request, rad_request_hv, &vp)) > 0 ) {
+ pairfree(&request->packet->vps);
+ request->packet->vps = vp;
+ vp = NULL;
- /*
- * Update cached copies
- */
- request->username = pairfind(request->packet->vps, PW_USER_NAME, 0, TAG_ANY);
- request->password = pairfind(request->packet->vps, PW_USER_PASSWORD, 0, TAG_ANY);
- if (!request->password)
- request->password = pairfind(request->packet->vps, PW_CHAP_PASSWORD, 0, TAG_ANY);
- }
+ /*
+ * Update cached copies
+ */
+ request->username = pairfind(request->packet->vps, PW_USER_NAME, 0, TAG_ANY);
+ request->password = pairfind(request->packet->vps, PW_USER_PASSWORD, 0, TAG_ANY);
+ if (!request->password)
+ request->password = pairfind(request->packet->vps, PW_CHAP_PASSWORD, 0, TAG_ANY);
+ }
- if ((get_hv_content(rad_reply_hv, &vp)) > 0 ) {
- pairfree(&request->reply->vps);
- request->reply->vps = vp;
- vp = NULL;
- }
+ if ((get_hv_content(request->reply, request, rad_reply_hv, &vp)) > 0 ) {
+ pairfree(&request->reply->vps);
+ request->reply->vps = vp;
+ vp = NULL;
+ }
- if ((get_hv_content(rad_check_hv, &vp)) > 0 ) {
- pairfree(&request->config_items);
- request->config_items = vp;
- vp = NULL;
- }
+ if ((get_hv_content(request, request, rad_check_hv, &vp)) > 0 ) {
+ pairfree(&request->config_items);
+ request->config_items = vp;
+ vp = NULL;
+ }
#ifdef WITH_PROXY
- if (request->proxy &&
- (get_hv_content(rad_request_proxy_hv, &vp) > 0)) {
- pairfree(&request->proxy->vps);
- request->proxy->vps = vp;
- vp = NULL;
- }
+ if (request->proxy &&
+ (get_hv_content(request->proxy, request, rad_request_proxy_hv, &vp) > 0)) {
+ pairfree(&request->proxy->vps);
+ request->proxy->vps = vp;
+ vp = NULL;
+ }
- if (request->proxy_reply &&
- (get_hv_content(rad_request_proxy_reply_hv, &vp) > 0)) {
- pairfree(&request->proxy_reply->vps);
- request->proxy_reply->vps = vp;
- vp = NULL;
- }
+ if (request->proxy_reply &&
+ (get_hv_content(request->proxy_reply, request, rad_request_proxy_reply_hv, &vp) > 0)) {
+ pairfree(&request->proxy_reply->vps);
+ request->proxy_reply->vps = vp;
+ vp = NULL;
+ }
#endif
}
return exitstatus;
}
-/*
- * Find the named user in this modules database. Create the set
- * of attribute-value pairs to check and reply with for this user
- * from the database. The authentication code only needs to check
- * the password, the rest is done here.
- */
-static rlm_rcode_t perl_authorize(void *instance, REQUEST *request)
-{
- return rlmperl_call(instance, request,
- ((PERL_INST *)instance)->func_authorize);
-}
+#define RLM_PERL_FUNC(_x) static rlm_rcode_t CC_HINT(nonnull) mod_##_x(void *instance, REQUEST *request) \
+ { \
+ return do_perl(instance, request, \
+ ((rlm_perl_t *)instance)->func_##_x); \
+ }
+
+RLM_PERL_FUNC(authorize)
+RLM_PERL_FUNC(authenticate)
+RLM_PERL_FUNC(post_auth)
+
+RLM_PERL_FUNC(checksimul)
+
+#ifdef WITH_PROXY
+RLM_PERL_FUNC(pre_proxy)
+RLM_PERL_FUNC(post_proxy)
+#endif
+
+#ifdef WITH_COA
+RLM_PERL_FUNC(recv_coa)
+RLM_PERL_FUNC(send_coa)
+#endif
+
+RLM_PERL_FUNC(preacct)
-/*
- * Authenticate the user with the given password.
- */
-static rlm_rcode_t perl_authenticate(void *instance, REQUEST *request)
-{
- return rlmperl_call(instance, request,
- ((PERL_INST *)instance)->func_authenticate);
-}
-/*
- * Massage the request before recording it or proxying it
- */
-static rlm_rcode_t perl_preacct(void *instance, REQUEST *request)
-{
- return rlmperl_call(instance, request,
- ((PERL_INST *)instance)->func_preacct);
-}
/*
* Write accounting information to this modules database.
*/
-static rlm_rcode_t perl_accounting(void *instance, REQUEST *request)
+static rlm_rcode_t CC_HINT(nonnull) mod_accounting(void *instance, REQUEST *request)
{
VALUE_PAIR *pair;
int acctstatustype=0;
if ((pair = pairfind(request->packet->vps, PW_ACCT_STATUS_TYPE, 0, TAG_ANY)) != NULL) {
acctstatustype = pair->vp_integer;
- } else {
- radlog(L_ERR, "Invalid Accounting Packet");
- return RLM_MODULE_INVALID;
- }
+ } else {
+ ERROR("Invalid Accounting Packet");
+ return RLM_MODULE_INVALID;
+ }
switch (acctstatustype) {
- case PW_STATUS_START:
+ case PW_STATUS_START:
- if (((PERL_INST *)instance)->func_start_accounting) {
- return rlmperl_call(instance, request,
- ((PERL_INST *)instance)->func_start_accounting);
- } else {
- return rlmperl_call(instance, request,
- ((PERL_INST *)instance)->func_accounting);
- }
- break;
+ if (((rlm_perl_t *)instance)->func_start_accounting) {
+ return do_perl(instance, request,
+ ((rlm_perl_t *)instance)->func_start_accounting);
+ } else {
+ return do_perl(instance, request,
+ ((rlm_perl_t *)instance)->func_accounting);
+ }
+ break;
- case PW_STATUS_STOP:
+ case PW_STATUS_STOP:
- if (((PERL_INST *)instance)->func_stop_accounting) {
- return rlmperl_call(instance, request,
- ((PERL_INST *)instance)->func_stop_accounting);
- } else {
- return rlmperl_call(instance, request,
- ((PERL_INST *)instance)->func_accounting);
- }
- break;
- default:
- return rlmperl_call(instance, request,
- ((PERL_INST *)instance)->func_accounting);
+ if (((rlm_perl_t *)instance)->func_stop_accounting) {
+ return do_perl(instance, request,
+ ((rlm_perl_t *)instance)->func_stop_accounting);
+ } else {
+ return do_perl(instance, request,
+ ((rlm_perl_t *)instance)->func_accounting);
+ }
+ break;
+ default:
+ return do_perl(instance, request,
+ ((rlm_perl_t *)instance)->func_accounting);
}
}
-/*
- * Check for simultaneouse-use
- */
-static rlm_rcode_t perl_checksimul(void *instance, REQUEST *request)
-{
- return rlmperl_call(instance, request,
- ((PERL_INST *)instance)->func_checksimul);
-}
-#ifdef WITH_PROXY
-/*
- * Pre-Proxy request
- */
-static rlm_rcode_t perl_pre_proxy(void *instance, REQUEST *request)
-{
- return rlmperl_call(instance, request,
- ((PERL_INST *)instance)->func_pre_proxy);
-}
-/*
- * Post-Proxy request
- */
-static rlm_rcode_t perl_post_proxy(void *instance, REQUEST *request)
-{
- return rlmperl_call(instance, request,
- ((PERL_INST *)instance)->func_post_proxy);
-}
-#endif
/*
- * Pre-Auth request
- */
-static rlm_rcode_t perl_post_auth(void *instance, REQUEST *request)
-{
- return rlmperl_call(instance, request,
- ((PERL_INST *)instance)->func_post_auth);
-}
-#ifdef WITH_COA
-/*
- * Recv CoA request
- */
-static rlm_rcode_t perl_recv_coa(void *instance, REQUEST *request)
-{
- return rlmperl_call(instance, request,
- ((PERL_INST *)instance)->func_recv_coa);
-}
-/*
- * Send CoA request
- */
-static rlm_rcode_t perl_send_coa(void *instance, REQUEST *request)
-{
- return rlmperl_call(instance, request,
- ((PERL_INST *)instance)->func_send_coa);
-}
-#endif
-/*
* Detach a instance give a chance to a module to make some internal setup ...
*/
-static int perl_detach(void *instance)
+DIAG_OFF(nested-externs)
+static int mod_detach(void *instance)
{
- PERL_INST *inst = (PERL_INST *) instance;
+ rlm_perl_t *inst = (rlm_perl_t *) instance;
int exitstatus = 0, count = 0;
+ hv_undef(inst->rad_perlconf_hv);
+
#if 0
/*
* FIXME: Call this in the destruct function?
*/
- {
+ {
dTHXa(handle->clone);
PERL_SET_CONTEXT(handle->clone);
{
- dSP; ENTER; SAVETMPS; PUSHMARK(SP);
- count = call_pv(inst->func_detach, G_SCALAR | G_EVAL );
- SPAGAIN;
-
- if (count == 1) {
- exitstatus = POPi;
- /*
- * FIXME: bug in perl
- *
- */
- if (exitstatus >= 100 || exitstatus < 0) {
- exitstatus = RLM_MODULE_FAIL;
+ dSP; ENTER; SAVETMPS; PUSHMARK(SP);
+ count = call_pv(inst->func_detach, G_SCALAR | G_EVAL );
+ SPAGAIN;
+
+ if (count == 1) {
+ exitstatus = POPi;
+ /*
+ * FIXME: bug in perl
+ *
+ */
+ if (exitstatus >= 100 || exitstatus < 0) {
+ exitstatus = RLM_MODULE_FAIL;
+ }
}
+ PUTBACK;
+ FREETMPS;
+ LEAVE;
}
- PUTBACK;
- FREETMPS;
- LEAVE;
- }
- }
+ }
#endif
- if (inst->func_detach) {
- dTHXa(inst->perl);
- PERL_SET_CONTEXT(inst->perl);
- {
- dSP; ENTER; SAVETMPS;
- PUSHMARK(SP);
+ if (inst->func_detach) {
+ dTHXa(inst->perl);
+ PERL_SET_CONTEXT(inst->perl);
+ {
+ dSP; ENTER; SAVETMPS;
+ PUSHMARK(SP);
- count = call_pv(inst->func_detach, G_SCALAR | G_EVAL );
- SPAGAIN;
+ count = call_pv(inst->func_detach, G_SCALAR | G_EVAL );
+ SPAGAIN;
- if (count == 1) {
- exitstatus = POPi;
- if (exitstatus >= 100 || exitstatus < 0) {
- exitstatus = RLM_MODULE_FAIL;
+ if (count == 1) {
+ exitstatus = POPi;
+ if (exitstatus >= 100 || exitstatus < 0) {
+ exitstatus = RLM_MODULE_FAIL;
+ }
+ }
+ PUTBACK;
+ FREETMPS;
+ LEAVE;
}
}
- PUTBACK;
- FREETMPS;
- LEAVE;
- }
- }
-
- xlat_unregister(inst->xlat_name, perl_xlat, instance);
- free(inst->xlat_name);
#ifdef USE_ITHREADS
rlm_perl_destruct(inst->perl);
perl_free(inst->perl);
#endif
- PERL_SYS_TERM();
- free(inst);
+ PERL_SYS_TERM();
return exitstatus;
}
-
+DIAG_ON(nested-externs)
/*
* The module name should be the only globally exported symbol.
#else
RLM_TYPE_THREAD_UNSAFE,
#endif
- perl_instantiate, /* instantiation */
- perl_detach, /* detach */
+ sizeof(rlm_perl_t),
+ module_config,
+ mod_instantiate, /* instantiation */
+ mod_detach, /* detach */
{
- perl_authenticate, /* authenticate */
- perl_authorize, /* authorize */
- perl_preacct, /* preacct */
- perl_accounting, /* accounting */
- perl_checksimul, /* check simul */
+ mod_authenticate, /* authenticate */
+ mod_authorize, /* authorize */
+ mod_preacct, /* preacct */
+ mod_accounting, /* accounting */
+ mod_checksimul, /* check simul */
#ifdef WITH_PROXY
- perl_pre_proxy, /* pre-proxy */
- perl_post_proxy, /* post-proxy */
+ mod_pre_proxy, /* pre-proxy */
+ mod_post_proxy, /* post-proxy */
#else
NULL, NULL,
#endif
- perl_post_auth /* post-auth */
+ mod_post_auth /* post-auth */
#ifdef WITH_COA
- , perl_recv_coa,
- perl_send_coa
+ , mod_recv_coa,
+ mod_send_coa
#endif
},
};
projects / freeradius.git / blobdiff