denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added support for named attribute groups

Browse Source 
Add the possibility to group attributes by a name and assign these
groups to connections. This allows a more granular configuration of
which client will receive what atrributes.
This commit is contained in:
Heiko Hund
2010-07-09 13:09:31 +02:00
committed by Martin Willi
parent db4ad736be
commit ec7adea007
12 changed files with 377 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libhydra/plugins/attr_sql/sql_attribute.c
+109 -8
View File
@@ -73,6 +73,26 @@ static u_int get_identity(private_sql_attribute_t *this, identification_t *id)
return 0;
}
/**
* Lookup an attribute pool by name
*/
static u_int get_attr_pool(private_sql_attribute_t *this, char *name)
{
enumerator_t *e;
u_int row = 0;
e = this->db->query(this->db,
"SELECT id FROM attribute_pools WHERE name = ?",
DB_TEXT, name, DB_UINT);
if (e)
{
e->enumerate(e, &row);
}
DESTROY_IF(e);
return row;
}
/**
* Lookup pool by name
*/
@@ -327,20 +347,101 @@ static bool release_address(private_sql_attribute_t *this,
* Implementation of sql_attribute_t.create_attribute_enumerator
*/
static enumerator_t* create_attribute_enumerator(private_sql_attribute_t *this,
identification_t *id, host_t *vip)
char *names, identification_t *id, host_t *vip)
{
enumerator_t *attr_enumerator = NULL;
if (vip)
{
enumerator_t *enumerator;
enumerator_t *names_enumerator;
u_int count;
char *name;
enumerator = this->db->query(this->db,
"SELECT type, value FROM attributes", DB_INT, DB_BLOB);
if (enumerator)
this->db->execute(this->db, NULL, "BEGIN EXCLUSIVE TRANSACTION");
/* in a first step check for attributes that match name and id */
if (id)
{
return enumerator;
u_int identity = get_identity(this, id);
names_enumerator = enumerator_create_token(names, ",", " ");
while (names_enumerator->enumerate(names_enumerator, &name))
{
u_int attr_pool = get_attr_pool(this, name);
if (!attr_pool)
{
continue;
}
attr_enumerator = this->db->query(this->db,
"SELECT count(*) FROM attributes "
"WHERE pool = ? AND identity = ?",
DB_UINT, attr_pool, DB_UINT, identity, DB_UINT);
if (attr_enumerator &&
attr_enumerator->enumerate(attr_enumerator, &count) &&
count != 0)
{
attr_enumerator->destroy(attr_enumerator);
attr_enumerator = this->db->query(this->db,
"SELECT type, value FROM attributes "
"WHERE pool = ? AND identity = ?", DB_UINT,
attr_pool, DB_UINT, identity, DB_INT, DB_BLOB);
break;
}
DESTROY_IF(attr_enumerator);
attr_enumerator = NULL;
}
names_enumerator->destroy(names_enumerator);
}
/* in a second step check for attributes that match name */
if (!attr_enumerator)
{
names_enumerator = enumerator_create_token(names, ",", " ");
while (names_enumerator->enumerate(names_enumerator, &name))
{
u_int attr_pool = get_attr_pool(this, name);
if (!attr_pool)
{
continue;
}
attr_enumerator = this->db->query(this->db,
"SELECT count(*) FROM attributes "
"WHERE pool = ? AND identity = 0",
DB_UINT, attr_pool, DB_UINT);
if (attr_enumerator &&
attr_enumerator->enumerate(attr_enumerator, &count) &&
count != 0)
{
attr_enumerator->destroy(attr_enumerator);
attr_enumerator = this->db->query(this->db,
"SELECT type, value FROM attributes "
"WHERE pool = ? AND identity = 0",
DB_UINT, attr_pool, DB_INT, DB_BLOB);
break;
}
DESTROY_IF(attr_enumerator);
attr_enumerator = NULL;
}
names_enumerator->destroy(names_enumerator);
}
this->db->execute(this->db, NULL, "END TRANSACTION");
/* lastly try to find global attributes */
if (!attr_enumerator)
{
attr_enumerator = this->db->query(this->db,
"SELECT type, value FROM attributes "
"WHERE pool = 0 AND identity = 0",
DB_INT, DB_BLOB);
}
}
return enumerator_create_empty();
return (attr_enumerator ? attr_enumerator : enumerator_create_empty());
}
/**
@@ -361,7 +462,7 @@ sql_attribute_t *sql_attribute_create(database_t *db)
this->public.provider.acquire_address = (host_t*(*)(attribute_provider_t *this, char*, identification_t *, host_t *))acquire_address;
this->public.provider.release_address = (bool(*)(attribute_provider_t *this, char*,host_t *, identification_t*))release_address;
this->public.provider.create_attribute_enumerator = (enumerator_t*(*)(attribute_provider_t*, identification_t *id, host_t *host))create_attribute_enumerator;
this->public.provider.create_attribute_enumerator = (enumerator_t*(*)(attribute_provider_t*, char *names, identification_t *id, host_t *host))create_attribute_enumerator;
this->public.destroy = (void(*)(sql_attribute_t*))destroy;
this->db = db;