kotovalexarian-likes-gitlab
/
hagrid-keyserver--hagrid
mirror of https://gitlab.com/hagrid-keyserver/hagrid.git
1
0
Fork 0
Code Releases Activity

fromSql

This commit is contained in:
Nora Widdecke 2022-01-18 15:03:17 +01:00
parent dd75ceab05
commit 44ca689b15
2 changed files with 60 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
database/src/sqlite.rs
View File

@ -19,6 +19,7 @@ use openpgp_utils::POLICY;
use r2d2_sqlite::rusqlite::params;
use r2d2_sqlite::rusqlite::OptionalExtension;
use r2d2_sqlite::rusqlite::Result as RusqliteResult;
use r2d2_sqlite::SqliteConnectionManager;
pub struct Sqlite {
@ -121,7 +122,7 @@ impl Sqlite {
fpr: &Fingerprint,
) -> Result<Option<Fingerprint>> {
let conn = self.pool.get().unwrap();
let primary_fingerprint: Option<String> = conn
let primary_fingerprint: Option<Fingerprint> = conn
.query_row(
"
SELECT primary_fingerprint
@ -132,8 +133,6 @@ impl Sqlite {
|row| row.get(0),
)
.optional()?;
let primary_fingerprint =
primary_fingerprint.map(|fp| Fingerprint::from_str(&fp).unwrap());
Ok(primary_fingerprint)
}
@ -142,7 +141,7 @@ impl Sqlite {
kid: &KeyID,
) -> Result<Option<Fingerprint>> {
let conn = self.pool.get().unwrap();
let primary_fingerprint: Option<String> = conn
let primary_fingerprint: Option<Fingerprint> = conn
.query_row(
"
SELECT primary_fingerprint
@ -153,8 +152,6 @@ impl Sqlite {
|row| row.get(0),
)
.optional()?;
let primary_fingerprint =
primary_fingerprint.map(|fp| Fingerprint::from_str(&fp).unwrap());
Ok(primary_fingerprint)
}
@ -303,7 +300,7 @@ impl Database for Sqlite {
use super::Query::*;
let conn = self.pool.get().unwrap();
let fp: Option<Option<String>> = match term {
let fp: Option<Option<Fingerprint>> = match term {
ByFingerprint(ref fp) => {
conn.query_row(
"
@ -345,7 +342,7 @@ impl Database for Sqlite {
}
_ => None,
};
fp.flatten().and_then(|fp| Fingerprint::from_str(&fp).ok())
fp.flatten()
}
fn link_email(&self, email: &Email, fpr: &Fingerprint) -> Result<()> {
@ -489,7 +486,7 @@ impl Database for Sqlite {
// XXX: Rename: binary_cert_by_email
fn by_email_wkd(&self, email: &Email) -> Option<Vec<u8>> {
let conn = self.pool.get().unwrap();
let primary_fingerprint: Option<String> = conn
let primary_fingerprint: Option<Fingerprint> = conn
.query_row(
"
SELECT primary_fingerprint
@ -510,7 +507,7 @@ impl Database for Sqlite {
FROM certs
WHERE fingerprint = ?1
",
[primary_fingerprint],
[primary_fingerprint.to_string()],
|row| row.get(0),
)
.optional()
@ -553,7 +550,7 @@ impl Database for Sqlite {
for row in cert_stmt.query_map([], |row| {
// TODO: create a struct which implements FromSql for this
Ok((
row.get::<_, String>(0)?,
row.get::<_, Fingerprint>(0)?,
row.get::<_, String>(1)?,
row.get::<_, Option<Vec<u8>>>(2)?,
))
@ -578,9 +575,10 @@ impl Database for Sqlite {
",
)?;
let mut linking_userids = stmt
.query_map([&primary_fp], |row| row.get::<_, String>(0))?
.flat_map(|res| res.map(|email| Email::from_str(&email)))
.collect::<Result<Vec<Email>>>()?;
.query_map([&primary_fp.to_string()], |row| {
row.get::<_, Email>(0)
})?
.collect::<RusqliteResult<Vec<Email>>>()?;
linking_userids.sort_unstable();
if linking_userids != published_userids {
return Err(anyhow!(
@ -613,9 +611,10 @@ impl Database for Sqlite {
",
)?;
let mut linking_fps = stmt
.query_map([&primary_fp], |row| row.get::<_, String>(0))?
.flat_map(|res| res.map(|fp| Fingerprint::from_str(&fp)))
.collect::<Result<Vec<Fingerprint>>>()?;
.query_map([&primary_fp.to_string()], |row| {
row.get::<_, Fingerprint>(0)
})?
.collect::<RusqliteResult<Vec<Fingerprint>>>()?;
linking_fps.sort_unstable();
if linking_fps != published_fps {
return Err(anyhow!(
@ -649,9 +648,10 @@ impl Database for Sqlite {
",
)?;
let mut linking_kids = stmt
.query_map([&primary_fp], |row| row.get::<_, String>(0))?
.flat_map(|res| res.map(|fp| KeyID::from_str(&fp)))
.collect::<Result<Vec<KeyID>>>()?;
.query_map([&primary_fp.to_string()], |row| {
row.get::<_, KeyID>(0)
})?
.collect::<RusqliteResult<Vec<KeyID>>>()?;
linking_kids.sort_unstable();
if linking_kids != published_kids {
return Err(anyhow!(

42
database/src/types.rs
View File

@ -77,6 +77,21 @@ impl FromStr for Email {
}
}
use r2d2_sqlite::rusqlite::types::{
FromSql, FromSqlError, FromSqlResult, ValueRef,
};
impl FromSql for Email {
fn column_result(value: ValueRef<'_>) -> FromSqlResult<Self> {
value
.as_str()
.and_then(|v| {
Email::from_str(v)
.map_err(|err| FromSqlError::Other(err.into()))
})
}
}
#[derive(Clone, Debug, Hash, PartialEq, Eq, PartialOrd, Ord)]
pub struct Fingerprint([u8; 20]);
@ -135,6 +150,17 @@ impl FromStr for Fingerprint {
}
}
impl FromSql for Fingerprint {
fn column_result(value: ValueRef<'_>) -> FromSqlResult<Self> {
value
.as_str()
.and_then(|v| {
Fingerprint::from_str(v)
.map_err(|err| FromSqlError::Other(err.into()))
})
}
}
#[derive(Serialize, Deserialize, Clone, Debug, Hash, PartialEq, Eq, PartialOrd, Ord)]
pub struct KeyID([u8; 8]);
@ -183,13 +209,25 @@ impl FromStr for KeyID {
fn from_str(s: &str) -> Result<KeyID> {
match sequoia_openpgp::KeyID::from_hex(s)? {
sequoia_openpgp::KeyID::V4(a) => Ok(KeyID(a)),
sequoia_openpgp::KeyID::Invalid(_) =>
Err(anyhow!("'{}' is not a valid long key ID", s)),
sequoia_openpgp::KeyID::Invalid(_) => {
Err(anyhow!("'{}' is not a valid long key ID", s))
}
_ => Err(anyhow!("unknown keyid type")),
}
}
}
impl FromSql for KeyID {
fn column_result(value: ValueRef<'_>) -> FromSqlResult<Self> {
value
.as_str()
.and_then(|v| {
KeyID::from_str(v)
.map_err(|err| FromSqlError::Other(err.into()))
})
}
}
#[cfg(test)]
mod tests {
use super::*;