rodolphe/opensmtpd-filter-dkimout
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Move SQL queries to the db module

Browse source
This commit is contained in:
Rodolphe Bréard 2023-04-10 11:21:53 +02:00
parent 4164274ad2
commit ad6eed4f02
2 changed files with 32 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/db.rs
View file

@ -2,6 +2,36 @@ use crate::config::Config;
use sqlx::sqlite::{SqliteConnectOptions, SqlitePoolOptions};
use sqlx::{ConnectOptions, SqlitePool};
pub const INSERT_KEY: &str = "INSERT INTO key_db (
selector,
sdid,
algorithm,
creation,
not_after,
revocation,
published,
private_key,
public_key
) VALUES (
$1,
$2,
$3,
$4,
$5,
$6,
FALSE,
$7,
$8
)";
pub const SELECT_LATEST_KEY: &str = "SELECT not_after
FROM key_db
WHERE
sdid = $1
AND algorithm = $2
AND published IS FALSE
ORDER BY not_after DESC
LIMIT 1";
pub async fn init(cnf: &Config) -> Result<SqlitePool, String> {
do_init(cnf).await.map_err(|e| e.to_string())
}

34
src/key.rs
View file

@ -5,36 +5,6 @@ use sqlx::SqlitePool;
use tokio::time::Duration;
use uuid::Uuid;
const INSERT_KEY: &str = "INSERT INTO key_db (
selector,
sdid,
algorithm,
creation,
not_after,
revocation,
published,
private_key,
public_key
) VALUES (
$1,
$2,
$3,
$4,
$5,
$6,
FALSE,
$7,
$8
)";
const SELECT_LATEST_KEY: &str = "SELECT not_after
FROM key_db
WHERE
sdid = $1
AND algorithm = $2
AND published IS FALSE
ORDER BY not_after DESC
LIMIT 1";
pub async fn key_rotation(db: &SqlitePool, cnf: &Config) -> Duration {
let mut durations = Vec::with_capacity(cnf.domains().len());
let expiration = cnf
@ -58,7 +28,7 @@ async fn renew_key_if_expired(
algorithm: Algorithm,
expiration: Duration,
) -> Result<Duration, ()> {
let res: Option<(i64,)> = sqlx::query_as(SELECT_LATEST_KEY)
let res: Option<(i64,)> = sqlx::query_as(crate::db::SELECT_LATEST_KEY)
.bind(domain)
.bind(algorithm.to_string())
.fetch_optional(db)
@ -91,7 +61,7 @@ async fn generate_key(
let not_after = now + Duration::from_secs(cnf.cryptoperiod().get());
let revocation = not_after + Duration::from_secs(cnf.revocation());
let (priv_key, pub_key) = algorithm.gen_keys();
sqlx::query(INSERT_KEY)
sqlx::query(crate::db::INSERT_KEY)
.bind(selector)
.bind(domain)
.bind(algorithm.to_string())