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

Introduced workitems to Attestation IMV

Browse Source
This commit is contained in:
Andreas Steffen
2013-06-21 23:25:23 +02:00
parent 7e9bdd20aa
commit b1da8368d0
20 changed files with 777 additions and 471 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libimcv/imv/imv_database.c
+32 -25
View File
@@ -59,7 +59,7 @@ struct private_imv_database_t {
};
METHOD(imv_database_t, get_session, imv_session_t*,
METHOD(imv_database_t, add_session, imv_session_t*,
private_imv_database_t *this, TNC_ConnectionID conn_id,
u_int32_t ar_id_type, chunk_t ar_id_value)
{
@@ -123,6 +123,26 @@ METHOD(imv_database_t, get_session, imv_session_t*,
return session;
}
METHOD(imv_database_t, remove_session, void,
private_imv_database_t *this, imv_session_t *session)
{
enumerator_t *enumerator;
imv_session_t *current;
this->mutex->lock(this->mutex);
enumerator = this->sessions->create_enumerator(this->sessions);
while (enumerator->enumerate(enumerator, &current))
{
if (current == session)
{
this->sessions->remove_at(this->sessions, enumerator);
break;
}
}
enumerator->destroy(enumerator);
this->mutex->unlock(this->mutex);
}
METHOD(imv_database_t, add_product, int,
private_imv_database_t *this, imv_session_t *session, char *product)
{
@@ -204,10 +224,9 @@ METHOD(imv_database_t, policy_script, bool,
{
imv_workitem_t *workitem;
imv_workitem_type_t type;
imv_session_t *current;
int id, session_id, rec_fail, rec_noresult;
enumerator_t *enumerator, *e;
char command[512], resp[128], *last, *argument;
int id, session_id, arg_int, rec_fail, rec_noresult;
enumerator_t *e;
char command[512], resp[128], *last, *arg_str;
FILE *shell;
session_id = session->get_session_id(session);
@@ -250,17 +269,18 @@ METHOD(imv_database_t, policy_script, bool,
{
/* get workitem list generated by policy manager */
e = this->db->query(this->db,
"SELECT id, type, argument, rec_fail, rec_noresult "
"FROM workitems WHERE session = ?",
DB_INT, session_id, DB_INT, DB_INT, DB_TEXT, DB_INT, DB_INT);
"SELECT id, type, arg_str, arg_int, rec_fail, rec_noresult "
"FROM workitems WHERE session = ?", DB_INT, session_id,
DB_INT, DB_INT, DB_TEXT, DB_INT,DB_INT, DB_INT);
if (!e)
{
DBG1(DBG_IMV, "no workitem enumerator returned");
return FALSE;
}
while (e->enumerate(e, &id, &type, &argument, &rec_fail, &rec_noresult))
while (e->enumerate(e, &id, &type, &arg_str, &arg_int, &rec_fail,
&rec_noresult))
{
workitem = imv_workitem_create(id, type, argument, rec_fail,
workitem = imv_workitem_create(id, type, arg_str, arg_int, rec_fail,
rec_noresult);
session->insert_workitem(session, workitem);
}
@@ -270,20 +290,6 @@ METHOD(imv_database_t, policy_script, bool,
}
else if (!start && session->get_policy_started(session))
{
/* remove session */
this->mutex->lock(this->mutex);
enumerator = this->sessions->create_enumerator(this->sessions);
while (enumerator->enumerate(enumerator, &current))
{
if (current == session)
{
this->sessions->remove_at(this->sessions, enumerator);
break;
}
}
enumerator->destroy(enumerator);
this->mutex->unlock(this->mutex);
session->set_policy_started(session, FALSE);
}
@@ -329,7 +335,8 @@ imv_database_t *imv_database_create(char *uri, char *script)
INIT(this,
.public = {
.get_session = _get_session,
.add_session = _add_session,
.remove_session = _remove_session,
.add_product = _add_product,
.add_device = _add_device,
.add_recommendation = _add_recommendation,