forked from gorb/backend
feat: switch to headers for auth
This commit is contained in:
parent
6c706d973e
commit
cbf0131d14
6 changed files with 96 additions and 159 deletions
|
@ -1,7 +1,6 @@
|
|||
use actix_web::{Error, HttpResponse, error, post, web};
|
||||
use futures::StreamExt;
|
||||
use actix_web::{post, web, Error, HttpRequest, HttpResponse};
|
||||
use log::error;
|
||||
use serde::{Deserialize, Serialize};
|
||||
use serde::Serialize;
|
||||
use std::time::{SystemTime, UNIX_EPOCH};
|
||||
|
||||
use crate::{
|
||||
|
@ -9,32 +8,21 @@ use crate::{
|
|||
crypto::{generate_access_token, generate_refresh_token},
|
||||
};
|
||||
|
||||
#[derive(Deserialize)]
|
||||
struct RefreshRequest {
|
||||
refresh_token: String,
|
||||
}
|
||||
|
||||
#[derive(Serialize)]
|
||||
struct Response {
|
||||
refresh_token: String,
|
||||
access_token: String,
|
||||
}
|
||||
|
||||
const MAX_SIZE: usize = 262_144;
|
||||
|
||||
#[post("/refresh")]
|
||||
pub async fn res(mut payload: web::Payload, data: web::Data<Data>) -> Result<HttpResponse, Error> {
|
||||
let mut body = web::BytesMut::new();
|
||||
while let Some(chunk) = payload.next().await {
|
||||
let chunk = chunk?;
|
||||
// limit max size of in-memory payload
|
||||
if (body.len() + chunk.len()) > MAX_SIZE {
|
||||
return Err(error::ErrorBadRequest("overflow"));
|
||||
}
|
||||
body.extend_from_slice(&chunk);
|
||||
pub async fn res(req: HttpRequest, data: web::Data<Data>) -> Result<HttpResponse, Error> {
|
||||
let refresh_token_cookie = req.cookie("refresh_token");
|
||||
|
||||
if let None = refresh_token_cookie {
|
||||
return Ok(HttpResponse::Unauthorized().finish())
|
||||
}
|
||||
|
||||
let refresh_request = serde_json::from_slice::<RefreshRequest>(&body)?;
|
||||
let mut refresh_token = String::from(refresh_token_cookie.unwrap().value());
|
||||
|
||||
let current_time = SystemTime::now()
|
||||
.duration_since(UNIX_EPOCH)
|
||||
|
@ -42,26 +30,18 @@ pub async fn res(mut payload: web::Payload, data: web::Data<Data>) -> Result<Htt
|
|||
.as_secs() as i64;
|
||||
|
||||
if let Ok(row) =
|
||||
sqlx::query_as("SELECT CAST(uuid as VARCHAR), created FROM refresh_tokens WHERE token = $1")
|
||||
.bind(&refresh_request.refresh_token)
|
||||
sqlx::query_scalar("SELECT created_at FROM refresh_tokens WHERE token = $1")
|
||||
.bind(&refresh_token)
|
||||
.fetch_one(&data.pool)
|
||||
.await
|
||||
{
|
||||
let (uuid, created): (String, i64) = row;
|
||||
let created_at: i64 = row;
|
||||
|
||||
if let Err(error) = sqlx::query("DELETE FROM access_tokens WHERE refresh_token = $1")
|
||||
.bind(&refresh_request.refresh_token)
|
||||
.execute(&data.pool)
|
||||
.await
|
||||
{
|
||||
error!("{}", error);
|
||||
}
|
||||
|
||||
let lifetime = current_time - created;
|
||||
let lifetime = current_time - created_at;
|
||||
|
||||
if lifetime > 2592000 {
|
||||
if let Err(error) = sqlx::query("DELETE FROM refresh_tokens WHERE token = $1")
|
||||
.bind(&refresh_request.refresh_token)
|
||||
.bind(&refresh_token)
|
||||
.execute(&data.pool)
|
||||
.await
|
||||
{
|
||||
|
@ -76,8 +56,6 @@ pub async fn res(mut payload: web::Payload, data: web::Data<Data>) -> Result<Htt
|
|||
.unwrap()
|
||||
.as_secs() as i64;
|
||||
|
||||
let mut refresh_token = refresh_request.refresh_token;
|
||||
|
||||
if lifetime > 1987200 {
|
||||
let new_refresh_token = generate_refresh_token();
|
||||
|
||||
|
@ -88,7 +66,7 @@ pub async fn res(mut payload: web::Payload, data: web::Data<Data>) -> Result<Htt
|
|||
|
||||
let new_refresh_token = new_refresh_token.unwrap();
|
||||
|
||||
match sqlx::query("UPDATE refresh_tokens SET token = $1, created = $2 WHERE token = $3")
|
||||
match sqlx::query("UPDATE refresh_tokens SET token = $1, created_at = $2 WHERE token = $3")
|
||||
.bind(&new_refresh_token)
|
||||
.bind(current_time)
|
||||
.bind(&refresh_token)
|
||||
|
@ -113,10 +91,10 @@ pub async fn res(mut payload: web::Payload, data: web::Data<Data>) -> Result<Htt
|
|||
|
||||
let access_token = access_token.unwrap();
|
||||
|
||||
if let Err(error) = sqlx::query(&format!("INSERT INTO access_tokens (token, refresh_token, uuid, created) VALUES ($1, $2, '{}', $3 )", uuid))
|
||||
if let Err(error) = sqlx::query("UPDATE access_tokens SET token = $1, created_at = $2 WHERE refresh_token = $3")
|
||||
.bind(&access_token)
|
||||
.bind(&refresh_token)
|
||||
.bind(current_time)
|
||||
.bind(&refresh_token)
|
||||
.execute(&data.pool)
|
||||
.await {
|
||||
error!("{}", error);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue