checkpoint; logins broken somehow, maybe just from remote host

This commit is contained in:
Joe Ardent 2023-07-04 12:22:17 -07:00
parent e93e43786f
commit f58106ee36
4 changed files with 27 additions and 8 deletions

View File

@ -46,7 +46,7 @@ pub async fn get_db_pool() -> SqlitePool {
let conn_opts = SqliteConnectOptions::new() let conn_opts = SqliteConnectOptions::new()
.foreign_keys(true) .foreign_keys(true)
//.auto_vacuum(sqlx::sqlite::SqliteAutoVacuum::Incremental) //.auto_vacuum(sqlx::sqlite::SqliteAutoVacuum::Incremental)
.journal_mode(SqliteJournalMode::Memory) .journal_mode(SqliteJournalMode::Wal)
.synchronous(sqlx::sqlite::SqliteSynchronous::Off) .synchronous(sqlx::sqlite::SqliteSynchronous::Off)
.filename(&db_filename) .filename(&db_filename)
.busy_timeout(Duration::from_secs(TIMEOUT)) .busy_timeout(Duration::from_secs(TIMEOUT))
@ -61,9 +61,9 @@ pub async fn get_db_pool() -> SqlitePool {
.await .await
.expect("can't connect to database"); .expect("can't connect to database");
let mut conn = pool.acquire().await.unwrap(); // let mut conn = pool.acquire().await.unwrap();
conn.execute("PRAGMA cache_size = 1000000;").await.unwrap(); // conn.execute("PRAGMA cache_size = 1000000;").await.unwrap();
conn.execute("PRAGMA temp_store = MEMORY;").await.unwrap(); // conn.execute("PRAGMA temp_store = MEMORY;").await.unwrap();
// let the filesystem settle before trying anything // let the filesystem settle before trying anything
// possibly not effective? // possibly not effective?

View File

@ -130,6 +130,22 @@ impl<'de> Visitor<'de> for DbIdVisitor {
} }
} }
fn visit_string<E>(self, v: String) -> Result<Self::Value, E>
where
E: serde::de::Error,
{
DbId::from_string(&v)
.map_err(|_| serde::de::Error::invalid_value(serde::de::Unexpected::Str(&v), &self))
}
fn visit_str<E>(self, v: &str) -> Result<Self::Value, E>
where
E: serde::de::Error,
{
DbId::from_string(v)
.map_err(|_| serde::de::Error::invalid_value(serde::de::Unexpected::Str(v), &self))
}
fn visit_byte_buf<E>(self, v: Vec<u8>) -> Result<Self::Value, E> fn visit_byte_buf<E>(self, v: Vec<u8>) -> Result<Self::Value, E>
where where
E: serde::de::Error, E: serde::de::Error,

View File

@ -70,9 +70,12 @@ pub async fn post_login(
let pw = &login.password; let pw = &login.password;
let pw = pw.trim(); let pw = pw.trim();
let user = User::try_get(username, &pool) let user = User::try_get(username, &pool).await.map_err(|e| {
.await tracing::debug!("{e}");
.map_err(|_| LoginErrorKind::Unknown)?; LoginErrorKind::Unknown
})?;
dbg!(&user);
let verifier = Argon2::default(); let verifier = Argon2::default();
let hash = PasswordHash::new(&user.pwhash).map_err(|_| LoginErrorKind::Internal)?; let hash = PasswordHash::new(&user.pwhash).map_err(|_| LoginErrorKind::Internal)?;

View File

@ -25,7 +25,7 @@ async fn main() {
let app = witch_watch::app(pool, &secret).await; let app = witch_watch::app(pool, &secret).await;
let addr: SocketAddr = ([127, 0, 0, 1], 3000).into(); let addr: SocketAddr = ([0, 0, 0, 0], 3000).into();
tracing::debug!("binding to {addr:?}"); tracing::debug!("binding to {addr:?}");
axum::Server::bind(&addr) axum::Server::bind(&addr)