Skip to content

Commit

Permalink
Merge pull request #46 from borikinternet/borik-devel
Browse files Browse the repository at this point in the history 
Improoved working with RADIUS AV pairs
  • Loading branch information
@miconda
miconda committed Jan 28, 2015
2 parents 2bb9422 + 93f74c2 commit 5a0faf2
Show file tree
Hide file tree
Showing 3 changed files with 81 additions and 79 deletions.
10 changes: 6 additions & 4 deletions modules/auth_radius/authrad_mod.c
View file
Expand Up @@ -65,6 +65,7 @@ static char* radius_config = DEFAULT_RADIUSCLIENT_CONF;
static int service_type = -1;

int use_ruri_flag = -1;
int import_all_avp = 0;

static char *auth_extra_str = 0;
struct extra_attr *auth_extra = 0;
Expand All @@ -89,10 +90,11 @@ static cmd_export_t cmds[] = {
* Exported parameters
*/
static param_export_t params[] = {
{"radius_config", PARAM_STRING, &radius_config },
{"service_type", INT_PARAM, &service_type },
{"use_ruri_flag", INT_PARAM, &use_ruri_flag },
{"auth_extra", PARAM_STRING, &auth_extra_str },
{"radius_config", PARAM_STRING, &radius_config },
{"service_type", INT_PARAM, &service_type },
{"use_ruri_flag", INT_PARAM, &use_ruri_flag },
{"auth_extra", PARAM_STRING, &auth_extra_str },
{"import_all_avp", INT_PARAM, &import_all_avp },
{0, 0, 0}
};

Expand Down
1 change: 1 addition & 0 deletions modules/auth_radius/authrad_mod.h
View file
Expand Up @@ -40,6 +40,7 @@ extern void *rh;
extern struct extra_attr *auth_extra;

extern int use_ruri_flag;
extern int import_all_avp;

extern auth_api_s_t auth_api;

Expand Down
149 changes: 74 additions & 75 deletions modules/auth_radius/sterman.c
View file
Expand Up @@ -70,80 +70,77 @@ static str val_arr[MAX_EXTRA];
static inline int extract_avp(VALUE_PAIR* vp, unsigned short *flags,
int_str *name, int_str *value)
{
static str names, values;
unsigned int r;
char *p;
char *end;

/* empty? */
if (vp->lvalue==0 || vp->strvalue==0)
goto error;

p = vp->strvalue;
end = vp->strvalue + vp->lvalue;

LM_DBG("string is <%.*s>\n", (int)(long)(end-p), p);

/* get name */
if (*p!='#') {
/* name AVP */
*flags |= AVP_NAME_STR;
names.s = p;
} else {
names.s = ++p;
}

names.len = 0;
while( p<end && *p!=':' && *p!='#')
p++;
if (names.s==p || p==end) {
LM_ERR("empty AVP name\n");
goto error;
}
names.len = p - names.s;
LM_DBG("AVP name is <%.*s>\n", names.len, names.s);

/* get value */
if (*p!='#') {
/* string value */
*flags |= AVP_VAL_STR;
}
values.s = ++p;
values.len = end-values.s;
if (values.len==0) {
LM_ERR("empty AVP value\n");
goto error;
}
LM_DBG("AVP val is <%.*s>\n", values.len, values.s);

if ( !((*flags)&AVP_NAME_STR) ) {
/* convert name to id*/
if (str2int(&names,&r)!=0 ) {
LM_ERR("invalid AVP ID '%.*s'\n", names.len,names.s);
goto error;
}
name->n = (int)r;
} else {
name->s = names;
}

if ( !((*flags)&AVP_VAL_STR) ) {
/* convert value to integer */
if (str2int(&values,&r)!=0 ) {
LM_ERR("invalid AVP numrical value '%.*s'\n", values.len,values.s);
goto error;
}
value->n = (int)r;
char *p, *q, *r;

LM_DBG("vp->name '%.*s'\n",(int)strlen(vp->name),vp->name);
LM_DBG("vp->attribute '%d'\n",vp->attribute);
LM_DBG("vp->type '%d'\n",vp->type);
LM_DBG("vp->lvalue '%d'\n",vp->lvalue);
if (vp->type == PW_TYPE_STRING)
LM_DBG("vp->strvalue '%.*s'\n",(int)strlen(vp->strvalue),vp->strvalue);

if ( vp->attribute == attrs[A_SIP_AVP].v && vp->type == PW_TYPE_STRING ) {
p = strchr(vp->strvalue,'#');
q = strchr(vp->strvalue,':');
if (!q && p == vp->strvalue && vp->strvalue+sizeof(char) != '\0' ) {
r = p;
r = strchr(r++,'#');
} else
r = NULL;
errno = 0;
if ( p == vp->strvalue && q ) {
/* int name and str value */
*flags |= AVP_VAL_STR;
name->n = strtol(++p,&q,10);
value->s.s = ++q;
value->s.len = strlen(q);
} else if ( p && !r && p > vp->strvalue && !q ) {
/* str name and int value */
*flags |= AVP_NAME_STR;
name->s.len = p - vp->strvalue;
name->s.s = vp->strvalue;
value->n = strtol(++p,&r,10);
} else if ( p && p != r && !q ) {
/* int name and int vale */
name->n = strtol(++p,&q,10);
value->n = strtol(++r,&q,10);
} else if ( (!p || p > q) && q ) {
/* str name and str value */
*flags |= AVP_VAL_STR|AVP_NAME_STR;
name->s.len = q - vp->strvalue;
name->s.s = vp->strvalue;
value->s.len = strlen(++q);
value->s.s = q;
} else /* error - unknown */
return 0;
if ( errno != 0 )
return 0;
} else if (vp->type == PW_TYPE_STRING) {
*flags |= AVP_VAL_STR|AVP_NAME_STR;
/* if start of value is the name of value */
if (vp->strvalue == strstr(vp->strvalue,vp->name))
/* then get value after name + one char delimiter */
p = vp->strvalue + strlen(vp->name) + sizeof(char);
else
p = vp->strvalue;
value->s.len = vp->lvalue - (p - vp->strvalue);
value->s.s = p;
name->s.len = strlen(vp->name);
name->s.s = vp->name;
} else if ((vp->type == PW_TYPE_INTEGER) || (vp->type == PW_TYPE_IPADDR) || (vp->type == PW_TYPE_DATE)) {
*flags |= AVP_NAME_STR;
value->n = vp->lvalue;
name->s.len = strlen(vp->name);
name->s.s = vp->name;
} else {
value->s = values;
LM_ERR("Unknown AVP type '%d'!\n",vp->type);
return 0;
}

return 0;
error:
return -1;
if ( ! name->s.len )
return 0;
return 1;
}


/*
* Generate AVPs from the database result
*/
Expand All @@ -153,14 +150,16 @@ static int generate_avps(VALUE_PAIR* received)
unsigned short flags;
VALUE_PAIR *vp;

LM_DBG("getting AVPs from RADIUS Reply\n");
vp = received;

LM_DBG("getting SIP AVPs from avpair %d\n", attrs[A_SIP_AVP].v);

for( ; (vp=rc_avpair_get(vp,attrs[A_SIP_AVP].v,0)) ; vp=vp->next) {
if ( ! import_all_avp )
vp=rc_avpair_get(vp,attrs[A_SIP_AVP].v,0);
for( ; vp; vp=import_all_avp?vp->next:rc_avpair_get(vp->next,attrs[A_SIP_AVP].v,0) ) {
flags = 0;
if (extract_avp( vp, &flags, &name, &val)!=0 )
if (!extract_avp( vp, &flags, &name, &val)){
LM_ERR("error while extracting AVP '%.*s'\n",(int)strlen(vp->name),vp->name);
continue;
}
if (add_avp( flags, name, val) < 0) {
LM_ERR("unable to create a new AVP\n");
} else {
Expand Down

0 comments on commit 5a0faf2

Please sign in to comment.