database: added totp codes migrations, get/add/use token
This commit is contained in:
parent
f891d2f940
commit
8658966b41
10 changed files with 229 additions and 0 deletions
|
|
@ -0,0 +1 @@
|
||||||
|
drop table if exists totp_login_requests;
|
||||||
|
|
@ -0,0 +1,11 @@
|
||||||
|
create table if not exists totp_login_requests
|
||||||
|
(
|
||||||
|
-- info
|
||||||
|
token TEXT not null primary key,
|
||||||
|
user TEXT not null references users (id),
|
||||||
|
|
||||||
|
-- timings
|
||||||
|
created_at TEXT not null default CURRENT_TIMESTAMP,
|
||||||
|
expires_at TEXT not null,
|
||||||
|
used_at TEXT
|
||||||
|
);
|
||||||
12
crates/database/queries/totp_login_requests/get_one.sql
Normal file
12
crates/database/queries/totp_login_requests/get_one.sql
Normal file
|
|
@ -0,0 +1,12 @@
|
||||||
|
select
|
||||||
|
-- info
|
||||||
|
token,
|
||||||
|
user,
|
||||||
|
|
||||||
|
-- timings
|
||||||
|
created_at as "created_at: DateTime<Utc>",
|
||||||
|
expires_at as "expires_at: DateTime<Utc>",
|
||||||
|
used_at as "used_at: DateTime<Utc>"
|
||||||
|
from totp_login_requests
|
||||||
|
|
||||||
|
where token is (?)
|
||||||
2
crates/database/queries/totp_login_requests/insert.sql
Normal file
2
crates/database/queries/totp_login_requests/insert.sql
Normal file
|
|
@ -0,0 +1,2 @@
|
||||||
|
insert into totp_login_requests (token, user, expires_at)
|
||||||
|
values (?, ?, datetime(?, 'unixepoch'))
|
||||||
|
|
@ -0,0 +1,5 @@
|
||||||
|
update totp_login_requests
|
||||||
|
|
||||||
|
set used_at = CURRENT_TIMESTAMP
|
||||||
|
|
||||||
|
where token is ?
|
||||||
|
|
@ -506,6 +506,16 @@
|
||||||
},
|
},
|
||||||
"query": "insert or ignore into settings(id)\nvalues (0);"
|
"query": "insert or ignore into settings(id)\nvalues (0);"
|
||||||
},
|
},
|
||||||
|
"645f583812c4d71570d1e84b866e85c5a012d71cd745494049a8d9bebab3ed61": {
|
||||||
|
"describe": {
|
||||||
|
"columns": [],
|
||||||
|
"nullable": [],
|
||||||
|
"parameters": {
|
||||||
|
"Right": 1
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"query": "update totp_login_requests\n\nset used_at = CURRENT_TIMESTAMP\n\nwhere token is ?"
|
||||||
|
},
|
||||||
"64cf880633d3ee5c18f6e7c2a865470442f1ba4b1019806a580ec384329dc32e": {
|
"64cf880633d3ee5c18f6e7c2a865470442f1ba4b1019806a580ec384329dc32e": {
|
||||||
"describe": {
|
"describe": {
|
||||||
"columns": [
|
"columns": [
|
||||||
|
|
@ -922,6 +932,58 @@
|
||||||
},
|
},
|
||||||
"query": "update refresh_tokens\n\nset revoked_at = CURRENT_TIMESTAMP\n\nwhere revoked_at is null"
|
"query": "update refresh_tokens\n\nset revoked_at = CURRENT_TIMESTAMP\n\nwhere revoked_at is null"
|
||||||
},
|
},
|
||||||
|
"a0dd1ddcc7d58fad78ed6c5027a9559428be9d0d59df6409ca9ec7cd728f6001": {
|
||||||
|
"describe": {
|
||||||
|
"columns": [
|
||||||
|
{
|
||||||
|
"name": "token",
|
||||||
|
"ordinal": 0,
|
||||||
|
"type_info": "Text"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "user",
|
||||||
|
"ordinal": 1,
|
||||||
|
"type_info": "Text"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "created_at: DateTime<Utc>",
|
||||||
|
"ordinal": 2,
|
||||||
|
"type_info": "Text"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "expires_at: DateTime<Utc>",
|
||||||
|
"ordinal": 3,
|
||||||
|
"type_info": "Text"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "used_at: DateTime<Utc>",
|
||||||
|
"ordinal": 4,
|
||||||
|
"type_info": "Text"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"nullable": [
|
||||||
|
false,
|
||||||
|
false,
|
||||||
|
false,
|
||||||
|
false,
|
||||||
|
true
|
||||||
|
],
|
||||||
|
"parameters": {
|
||||||
|
"Right": 1
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"query": "select\n -- info\n token,\n user,\n\n -- timings\n created_at as \"created_at: DateTime<Utc>\",\n expires_at as \"expires_at: DateTime<Utc>\",\n used_at as \"used_at: DateTime<Utc>\"\nfrom totp_login_requests\n\nwhere token is (?)"
|
||||||
|
},
|
||||||
|
"a2bf546b2cf6a53a3a127c08fbb7f3dfcf0fe7a30364b1fb57c3e6b757093578": {
|
||||||
|
"describe": {
|
||||||
|
"columns": [],
|
||||||
|
"nullable": [],
|
||||||
|
"parameters": {
|
||||||
|
"Right": 3
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"query": "insert into totp_login_requests (token, user, expires_at)\nvalues (?, ?, datetime(?, 'unixepoch'))\n"
|
||||||
|
},
|
||||||
"a55b17a3a70e6445517f19536220f0dafc78a0e8b69221dee4715f84841839da": {
|
"a55b17a3a70e6445517f19536220f0dafc78a0e8b69221dee4715f84841839da": {
|
||||||
"describe": {
|
"describe": {
|
||||||
"columns": [],
|
"columns": [],
|
||||||
|
|
|
||||||
|
|
@ -3,6 +3,7 @@ mod authorization_codes;
|
||||||
mod keys;
|
mod keys;
|
||||||
mod refresh_tokens;
|
mod refresh_tokens;
|
||||||
mod settings;
|
mod settings;
|
||||||
|
mod totp_login_requests;
|
||||||
mod users;
|
mod users;
|
||||||
|
|
||||||
pub use apps::Apps;
|
pub use apps::Apps;
|
||||||
|
|
@ -10,4 +11,5 @@ pub use authorization_codes::AuthorizationCodes;
|
||||||
pub use keys::Keys;
|
pub use keys::Keys;
|
||||||
pub use refresh_tokens::RefreshTokens;
|
pub use refresh_tokens::RefreshTokens;
|
||||||
pub use settings::Settings;
|
pub use settings::Settings;
|
||||||
|
pub use totp_login_requests::TotpLoginRequests;
|
||||||
pub use users::Users;
|
pub use users::Users;
|
||||||
|
|
|
||||||
60
crates/database/src/tables/totp_login_requests.rs
Normal file
60
crates/database/src/tables/totp_login_requests.rs
Normal file
|
|
@ -0,0 +1,60 @@
|
||||||
|
use crate::error::{handle_error, Error};
|
||||||
|
use sqlx::sqlite::SqliteQueryResult;
|
||||||
|
use sqlx::types::chrono::{DateTime, Utc};
|
||||||
|
use sqlx::{FromRow, SqliteExecutor};
|
||||||
|
|
||||||
|
#[derive(FromRow)]
|
||||||
|
pub struct TotpLoginRequests {
|
||||||
|
// Info
|
||||||
|
pub token: String,
|
||||||
|
pub user: String,
|
||||||
|
|
||||||
|
// Timings
|
||||||
|
pub created_at: DateTime<Utc>,
|
||||||
|
pub expires_at: DateTime<Utc>,
|
||||||
|
pub used_at: Option<DateTime<Utc>>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl TotpLoginRequests {
|
||||||
|
pub async fn insert(
|
||||||
|
conn: impl SqliteExecutor<'_>,
|
||||||
|
token: &str,
|
||||||
|
user: &str,
|
||||||
|
expires_at: i64,
|
||||||
|
) -> Result<Option<()>, Error> {
|
||||||
|
let query: SqliteQueryResult = sqlx::query_file!(
|
||||||
|
"queries/totp_login_requests/insert.sql",
|
||||||
|
token,
|
||||||
|
user,
|
||||||
|
expires_at
|
||||||
|
)
|
||||||
|
.execute(conn)
|
||||||
|
.await
|
||||||
|
.map_err(handle_error)?;
|
||||||
|
|
||||||
|
Ok((query.rows_affected() == 1).then_some(()))
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn get_one(
|
||||||
|
conn: impl SqliteExecutor<'_>,
|
||||||
|
token: &str,
|
||||||
|
) -> Result<Option<Self>, Error> {
|
||||||
|
sqlx::query_file_as!(Self, "queries/totp_login_requests/get_one.sql", token)
|
||||||
|
.fetch_optional(conn)
|
||||||
|
.await
|
||||||
|
.map_err(handle_error)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn use_token(
|
||||||
|
conn: impl SqliteExecutor<'_>,
|
||||||
|
token: &str,
|
||||||
|
) -> Result<Option<()>, Error> {
|
||||||
|
let query: SqliteQueryResult =
|
||||||
|
sqlx::query_file!("queries/totp_login_requests/use_token.sql", token)
|
||||||
|
.execute(conn)
|
||||||
|
.await
|
||||||
|
.map_err(handle_error)?;
|
||||||
|
|
||||||
|
Ok((query.rows_affected() == 1).then_some(()))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
mod database;
|
mod database;
|
||||||
mod error;
|
mod error;
|
||||||
pub mod password_reset;
|
pub mod password_reset;
|
||||||
|
pub mod totp_login_request;
|
||||||
|
|
||||||
use chrono::{DateTime, Utc};
|
use chrono::{DateTime, Utc};
|
||||||
use id::UserID;
|
use id::UserID;
|
||||||
|
|
|
||||||
73
crates/users/src/totp_login_request.rs
Normal file
73
crates/users/src/totp_login_request.rs
Normal file
|
|
@ -0,0 +1,73 @@
|
||||||
|
use crate::Error;
|
||||||
|
use chrono::{DateTime, Duration, Utc};
|
||||||
|
use database::sqlx::SqliteExecutor;
|
||||||
|
use database::TotpLoginRequests as DatabaseTotpLoginRequests;
|
||||||
|
use id::UserID;
|
||||||
|
|
||||||
|
pub const TOTP_REQUEST_COOKIE_NAME: &str = "totp_request";
|
||||||
|
pub const TOTP_REQUEST_LEN: usize = 25;
|
||||||
|
|
||||||
|
pub struct TotpLoginRequest {
|
||||||
|
// Info
|
||||||
|
token: String,
|
||||||
|
user: UserID,
|
||||||
|
|
||||||
|
// Timings
|
||||||
|
created_at: DateTime<Utc>,
|
||||||
|
expires_at: DateTime<Utc>,
|
||||||
|
used_at: Option<DateTime<Utc>>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl TotpLoginRequest {
|
||||||
|
pub fn token(&self) -> &str {
|
||||||
|
&self.token
|
||||||
|
}
|
||||||
|
pub fn user(&self) -> &UserID {
|
||||||
|
&self.user
|
||||||
|
}
|
||||||
|
pub fn has_expired(&self) -> bool {
|
||||||
|
self.expires_at < Utc::now()
|
||||||
|
}
|
||||||
|
pub fn used_at(&self) -> Option<DateTime<Utc>> {
|
||||||
|
self.used_at
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl From<DatabaseTotpLoginRequests> for TotpLoginRequest {
|
||||||
|
fn from(db: DatabaseTotpLoginRequests) -> Self {
|
||||||
|
Self {
|
||||||
|
token: db.token,
|
||||||
|
user: UserID(db.user),
|
||||||
|
created_at: db.created_at,
|
||||||
|
expires_at: db.expires_at,
|
||||||
|
used_at: db.used_at,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl TotpLoginRequest {
|
||||||
|
pub async fn insert(
|
||||||
|
conn: impl SqliteExecutor<'_>,
|
||||||
|
token: &str,
|
||||||
|
user: &UserID,
|
||||||
|
validity_minutes: i64,
|
||||||
|
) -> Result<Option<()>, Error> {
|
||||||
|
let expires_at = Utc::now() + Duration::minutes(validity_minutes);
|
||||||
|
|
||||||
|
Ok(DatabaseTotpLoginRequests::insert(conn, token, &user.0, expires_at.timestamp()).await?)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn get_one(
|
||||||
|
conn: impl SqliteExecutor<'_>,
|
||||||
|
token: &str,
|
||||||
|
) -> Result<Option<Self>, Error> {
|
||||||
|
Ok(DatabaseTotpLoginRequests::get_one(conn, token)
|
||||||
|
.await?
|
||||||
|
.map(Self::from))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Consume and mark as used
|
||||||
|
pub async fn use_code(self, conn: impl SqliteExecutor<'_>) -> Result<Option<()>, Error> {
|
||||||
|
Ok(DatabaseTotpLoginRequests::use_token(conn, &self.token).await?)
|
||||||
|
}
|
||||||
|
}
|
||||||
Loading…
Add table
Add a link
Reference in a new issue