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

attr-sql: Use a serializable transaction when inserting identities

Browse Source
This commit is contained in:
Tobias Brunner
2013-10-11 15:29:10 +02:00
parent b283a6e9ef
commit bd085dd978
1 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libhydra/plugins/attr_sql/sql_attribute.c
+5 -12
View File
@@ -50,9 +50,8 @@ static u_int get_identity(private_sql_attribute_t *this, identification_t *id)
{ {
enumerator_t *e; enumerator_t *e;
u_int row; u_int row;
int try = 0;
retry: this->db->transaction(this->db, TRUE);
/* look for peer identity in the identities table */ /* look for peer identity in the identities table */
e = this->db->query(this->db, e = this->db->query(this->db,
"SELECT id FROM identities WHERE type = ? AND data = ?", "SELECT id FROM identities WHERE type = ? AND data = ?",
@@ -61,26 +60,20 @@ retry:
if (e && e->enumerate(e, &row)) if (e && e->enumerate(e, &row))
{ {
e->destroy(e); e->destroy(e);
this->db->commit(this->db);
return row; return row;
} }
DESTROY_IF(e); DESTROY_IF(e);
if (try > 0)
{
return 0;
}
/* not found, insert new one */ /* not found, insert new one */
if (this->db->execute(this->db, &row, if (this->db->execute(this->db, &row,
"INSERT INTO identities (type, data) VALUES (?, ?)", "INSERT INTO identities (type, data) VALUES (?, ?)",
DB_INT, id->get_type(id), DB_BLOB, id->get_encoding(id)) == 1) DB_INT, id->get_type(id), DB_BLOB, id->get_encoding(id)) == 1)
{ {
this->db->commit(this->db);
return row; return row;
} }
/* the INSERT could fail due to the UNIQUE constraint, if the identity was this->db->rollback(this->db);
* added concurrently by another thread or the pool utility, return 0;
* therefore try finding it again. a nicer fix would be to use locking
* on the database, but our API currently not supports that */
try++;
goto retry;
} }
/** /**