alemi/upp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: disallow upserting ids from api

Browse source
This commit is contained in:
əlemi 2024-12-02 23:54:08 +01:00
parent 201cae7ad1
commit 864f38f0da
Signed by: alemi
GPG key ID: A4895B84D311642C
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/main.rs
View file

@ -65,7 +65,7 @@ async fn entry(cli: Cli, config: Config, db: Database) -> Result<(), Box<dyn std
for (key, service) in config.service { for (key, service) in config.service {
let interval = service.interval_s.unwrap_or(default_interval); let interval = service.interval_s.unwrap_or(default_interval);
let db = db.clone(); let db = db.clone();
let sid = db.sid(&key).await?; let sid = db.sid(&key, true).await?;
tokio::spawn(async move { tokio::spawn(async move {
loop { loop {
@ -172,7 +172,7 @@ async fn api_status_service(
Query(q): Query<ServiceStatusQuery>, Query(q): Query<ServiceStatusQuery>,
) -> ApiResult<Vec<(i64, Option<i64>)>> { ) -> ApiResult<Vec<(i64, Option<i64>)>> {
let limit = q.limit.unwrap_or(50).min(250); let limit = q.limit.unwrap_or(50).min(250);
let sid = db.sid(&service).await?; let sid = db.sid(&service, false).await?;
Ok(Json(db.get(sid, Some(limit)).await?)) Ok(Json(db.get(sid, Some(limit)).await?))
} }
@ -257,7 +257,7 @@ impl Database {
} }
#[async_recursion::async_recursion] #[async_recursion::async_recursion]
async fn sid(&self, service: &str) -> rusqlite::Result<i64> { async fn sid(&self, service: &str, upsert: bool) -> rusqlite::Result<i64> {
let res = { let res = {
let db = self.0.lock().await; let db = self.0.lock().await;
let mut stmt = db.prepare("SELECT id FROM services WHERE name = ?")?; let mut stmt = db.prepare("SELECT id FROM services WHERE name = ?")?;
@ -267,8 +267,12 @@ impl Database {
match res { match res {
Some(sid) => Ok(sid), Some(sid) => Ok(sid),
None => { None => {
self.0.lock().await.execute("INSERT INTO services(name) VALUES (?)", params![service])?; if upsert {
self.sid(service).await self.0.lock().await.execute("INSERT INTO services(name) VALUES (?)", params![service])?;
self.sid(service, upsert).await
} else {
Err(rusqlite::Error::QueryReturnedNoRows)
}
} }
} }
} }