sharpetronics/strongswan
1
0
Fork 0
mirror of https://github.com/strongswan/strongswan.git synced 2025-10-08 00:02:03 -04:00
Code Issues Projects Releases Wiki Activity

vici: Support missing groups option in auth config

Browse Source
This commit is contained in:
Martin Willi 2014-02-19 15:25:10 +01:00
parent 6efa792d22
commit e6e975ff9d
2 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/libcharon/plugins/vici/vici_config.c
View File

@ -243,6 +243,9 @@ static void log_auth(auth_cfg_t *auth)
case AUTH_RULE_XAUTH_IDENTITY: case AUTH_RULE_XAUTH_IDENTITY:
DBG2(DBG_CFG, " xauth_id = %Y", v.id); DBG2(DBG_CFG, " xauth_id = %Y", v.id);
break; break;
case AUTH_RULE_GROUP:
DBG2(DBG_CFG, " group = %Y", v.id);
break;
default: default:
break; break;
} }
@ -949,6 +952,15 @@ CALLBACK(parse_xauth_id, bool,
return parse_id(cfg, AUTH_RULE_XAUTH_IDENTITY, v); return parse_id(cfg, AUTH_RULE_XAUTH_IDENTITY, v);
} }
/**
* Parse group membership
*/
CALLBACK(parse_group, bool,
auth_cfg_t *cfg, chunk_t v)
{
return parse_id(cfg, AUTH_RULE_GROUP, v);
}
/** /**
* Parse revocation status * Parse revocation status
*/ */
@ -1129,6 +1141,17 @@ CALLBACK(child_kv, bool,
&child->request->reply); &child->request->reply);
} }
CALLBACK(auth_li, bool,
auth_data_t *auth, vici_message_t *message, char *name, chunk_t value)
{
parse_rule_t rules[] = {
{ "groups", parse_group, auth->cfg },
};
return parse_rules(rules, countof(rules), name, value,
&auth->request->reply);
}
CALLBACK(auth_kv, bool, CALLBACK(auth_kv, bool,
auth_data_t *auth, vici_message_t *message, char *name, chunk_t value) auth_data_t *auth, vici_message_t *message, char *name, chunk_t value)
{ {
@ -1272,7 +1295,7 @@ CALLBACK(peer_sn, bool,
.cfg = auth_cfg_create(), .cfg = auth_cfg_create(),
}; };
if (!message->parse(message, ctx, NULL, auth_kv, NULL, &auth)) if (!message->parse(message, ctx, NULL, auth_kv, auth_li, &auth))
{ {
auth.cfg->destroy(auth.cfg); auth.cfg->destroy(auth.cfg);
return FALSE; return FALSE;

12
src/libcharon/plugins/vici/vici_query.c
View File

@ -539,6 +539,18 @@ static void build_auth_cfgs(peer_cfg_t *peer_cfg, bool local, vici_builder_t *b)
} }
rules->destroy(rules); rules->destroy(rules);
b->begin_list(b, "groups");
rules = auth->create_enumerator(auth);
while (rules->enumerate(rules, &rule, &v))
{
if (rule == AUTH_RULE_GROUP)
{
b->add_li(b, "%Y", v.id);
}
}
rules->destroy(rules);
b->end_list(b);
b->end_section(b); b->end_section(b);
} }
enumerator->destroy(enumerator); enumerator->destroy(enumerator);