From b6445000fe6e92b7ac96bf38aeff222ec58f4cdc Mon Sep 17 00:00:00 2001 From: realaravinth Date: Thu, 12 May 2022 19:56:23 +0530 Subject: [PATCH] feat: migrate delete captcha to use db_* interface --- sqlx-data.json | 323 +++++++++++++++++++++++++++++----- src/api/v1/mcaptcha/delete.rs | 59 ++----- 2 files changed, 291 insertions(+), 91 deletions(-) diff --git a/sqlx-data.json b/sqlx-data.json index 7179fcf9..295d3dae 100644 --- a/sqlx-data.json +++ b/sqlx-data.json @@ -39,6 +39,19 @@ }, "query": "SELECT email, secret FROM mcaptcha_users WHERE name = ($1)" }, + "1e9fe69b23e4bfa7bb369455753100307e334e8dbaf02ff37cda08992fe95910": { + "describe": { + "columns": [], + "nullable": [], + "parameters": { + "Left": [ + "Varchar", + "Text" + ] + } + }, + "query": "UPDATE mcaptcha_users set name = $1\n WHERE name = $2" + }, "238569a64d7dbd252e3b27204f207e8a8548109717b89495ddf8f9a870c7c75d": { "describe": { "columns": [], @@ -67,6 +80,55 @@ }, "query": "-- mark a notification as read\nUPDATE mcaptcha_notifications\n SET read = TRUE\nWHERE \n mcaptcha_notifications.id = $1\nAND\n mcaptcha_notifications.rx = (\n SELECT\n id\n FROM\n mcaptcha_users\n WHERE\n name = $2\n );\n" }, + "307245aaf5b0d692448b80358d6916aa50c507b35e724d66c9b16a16b60e1b38": { + "describe": { + "columns": [], + "nullable": [], + "parameters": { + "Left": [ + "Varchar", + "Text", + "Int4", + "Varchar" + ] + } + }, + "query": "INSERT INTO mcaptcha_config\n (key, user_id, duration, name)\n VALUES ($1, (SELECT ID FROM mcaptcha_users WHERE name = $2), $3, $4)" + }, + "3b1c8128fc48b16d8e8ea6957dd4fbc0eb19ae64748fd7824e9f5e1901dd1726": { + "describe": { + "columns": [], + "nullable": [], + "parameters": { + "Left": [ + "Varchar", + "Text" + ] + } + }, + "query": "UPDATE mcaptcha_users set secret = $1\n WHERE name = $2" + }, + "3eb1c43ffd2378c4dd59975568c3a180b72d13008f294a91f3e76b785dba295b": { + "describe": { + "columns": [ + { + "name": "exists", + "ordinal": 0, + "type_info": "Bool" + } + ], + "nullable": [ + null + ], + "parameters": { + "Left": [ + "Text", + "Text" + ] + } + }, + "query": "SELECT EXISTS (\n SELECT 1 from mcaptcha_config WHERE key = $1 \n AND user_id = (SELECT ID FROM mcaptcha_users WHERE name = $2)\n )" + }, "3ebc2aab517b9a2db463b6ea64aee76da5d051817acba8d0fb55ad503acc6b63": { "describe": { "columns": [ @@ -108,6 +170,61 @@ }, "query": "SELECT time FROM mcaptcha_pow_confirmed_stats \n WHERE \n config_id = (\n SELECT config_id FROM mcaptcha_config \n WHERE \n key = $1\n AND\n user_id = (\n SELECT \n ID FROM mcaptcha_users WHERE name = $2))\n ORDER BY time DESC" }, + "45d9e9fb6344fe3a18c2529d50c935d3837bfe25c96595beb6970d6067720578": { + "describe": { + "columns": [], + "nullable": [], + "parameters": { + "Left": [ + "Varchar", + "Text", + "Varchar", + "Varchar" + ] + } + }, + "query": "insert into mcaptcha_users \n (name , password, email, secret) values ($1, $2, $3, $4)" + }, + "47fa50aecfb1499b0a18fa9299643017a1a8d69d4e9980032e0d8f745465d14f": { + "describe": { + "columns": [ + { + "name": "exists", + "ordinal": 0, + "type_info": "Bool" + } + ], + "nullable": [ + null + ], + "parameters": { + "Left": [ + "Text" + ] + } + }, + "query": "SELECT EXISTS (SELECT 1 from mcaptcha_users WHERE email = $1)" + }, + "4a5dfbc5aeb2bab290a09640cc25223d484fbc7549e5bc54f33bab8616725031": { + "describe": { + "columns": [ + { + "name": "exists", + "ordinal": 0, + "type_info": "Bool" + } + ], + "nullable": [ + null + ], + "parameters": { + "Left": [ + "Text" + ] + } + }, + "query": "SELECT EXISTS (SELECT 1 from mcaptcha_config WHERE key = $1)" + }, "4c3a9fe30a4c6bd49ab1cb8883c4495993aa05f2991483b4f04913b2e5043a63": { "describe": { "columns": [ @@ -258,6 +375,20 @@ }, "query": "DELETE FROM mcaptcha_levels \n WHERE config_id = (\n SELECT config_id FROM mcaptcha_config where key = ($1) \n AND user_id = (\n SELECT ID from mcaptcha_users WHERE name = $2\n )\n )" }, + "81c779ed4bb59f8b94dea730cbda31f7733ef16d509a3ed607388b5ddef74638": { + "describe": { + "columns": [], + "nullable": [], + "parameters": { + "Left": [ + "Varchar", + "Text", + "Varchar" + ] + } + }, + "query": "INSERT INTO mcaptcha_users \n (name , password, secret) VALUES ($1, $2, $3)" + }, "84484cb6892db29121816bc5bff5702b9e857e20aa14e79d080d78ae7593153b": { "describe": { "columns": [ @@ -279,32 +410,6 @@ }, "query": "SELECT time FROM mcaptcha_pow_solved_stats \n WHERE config_id = (\n SELECT config_id FROM mcaptcha_config \n WHERE \n key = $1\n AND\n user_id = (\n SELECT \n ID FROM mcaptcha_users WHERE name = $2)) \n ORDER BY time DESC" }, - "90608e874ec931db397dc7b357b60bc794fffec5e2eb59c0556808ea8dfef9e9": { - "describe": { - "columns": [ - { - "name": "id", - "ordinal": 0, - "type_info": "Int4" - }, - { - "name": "password", - "ordinal": 1, - "type_info": "Text" - } - ], - "nullable": [ - false, - false - ], - "parameters": { - "Left": [ - "Text" - ] - } - }, - "query": "SELECT ID, password FROM mcaptcha_users WHERE name = ($1)" - }, "9753721856a47438c5e72f28fd9d149db10c48e677b4613bf3f1e8487908aac8": { "describe": { "columns": [ @@ -344,19 +449,6 @@ }, "query": "DELETE FROM mcaptcha_sitekey_user_provided_avg_traffic \n WHERE config_id = (\n SELECT config_id \n FROM \n mcaptcha_config \n WHERE\n key = ($1) \n AND \n user_id = (SELECT ID FROM mcaptcha_users WHERE name = $2)\n );" }, - "9c7a654aefa0a1683d9b07ff00c8edb0ee292e003c13ec99a419e563591c15e4": { - "describe": { - "columns": [], - "nullable": [], - "parameters": { - "Left": [ - "Text", - "Int4" - ] - } - }, - "query": "DELETE FROM mcaptcha_config WHERE key = ($1) AND user_id = $2;" - }, "a1c49ee377d6ac57fb22c9eac0ef1927a97087abd58da092a91623d06fa7076e": { "describe": { "columns": [ @@ -378,6 +470,26 @@ }, "query": "SELECT name FROM mcaptcha_config \n WHERE key = $1 \n AND user_id = (\n SELECT user_id FROM mcaptcha_users WHERE NAME = $2)" }, + "ad23588ee4bcbb13e208460ce21e2fa9f1373893934b530b339fea10360b34a8": { + "describe": { + "columns": [ + { + "name": "exists", + "ordinal": 0, + "type_info": "Bool" + } + ], + "nullable": [ + null + ], + "parameters": { + "Left": [ + "Text" + ] + } + }, + "query": "SELECT EXISTS (SELECT 1 from mcaptcha_users WHERE name = $1)" + }, "ada91fac02c7bba9b13deebccda6f6fc45773b5a6e786c37c27b4a71a5cd29f2": { "describe": { "columns": [ @@ -411,6 +523,58 @@ }, "query": "SELECT config_id, duration, name from mcaptcha_config WHERE\n key = $1 AND\n user_id = (SELECT ID FROM mcaptcha_users WHERE name = $2) " }, + "b97d810814fbeb2df19f47bcfa381bc6fb7ac6832d040b377cf4fca2ca896cfb": { + "describe": { + "columns": [], + "nullable": [], + "parameters": { + "Left": [ + "Varchar", + "Text" + ] + } + }, + "query": "UPDATE mcaptcha_users set email = $1\n WHERE name = $2" + }, + "bb6443e1df704294abbbdb563f1bf46660d0f3462c0c35c10a533446fc7c53e8": { + "describe": { + "columns": [], + "nullable": [], + "parameters": { + "Left": [ + "Text", + "Text" + ] + } + }, + "query": "DELETE FROM mcaptcha_config WHERE key = ($1)\n AND\n user_id = (SELECT ID FROM mcaptcha_users WHERE name = $2)" + }, + "bdf2e2781bfa2e9c81c18ef8df7230809d3b20274685a35b1c544804f2a58241": { + "describe": { + "columns": [ + { + "name": "name", + "ordinal": 0, + "type_info": "Varchar" + }, + { + "name": "password", + "ordinal": 1, + "type_info": "Text" + } + ], + "nullable": [ + false, + false + ], + "parameters": { + "Left": [ + "Text" + ] + } + }, + "query": "SELECT name, password FROM mcaptcha_users WHERE email = ($1)" + }, "c2e167e56242de7e0a835e25004b15ca8340545fa0ca7ac8f3293157d2d03d98": { "describe": { "columns": [ @@ -465,18 +629,17 @@ }, "query": "SELECT time FROM mcaptcha_pow_fetched_stats\n WHERE \n config_id = (\n SELECT \n config_id FROM mcaptcha_config \n WHERE \n key = $1\n AND\n user_id = (\n SELECT \n ID FROM mcaptcha_users WHERE name = $2))\n ORDER BY time DESC" }, - "d85750d86bbafeaf6f52cec3d49d708bef1a9ef85bbd9c55d63c9c27cb93223c": { + "ca9d5241f1234d1825f7ead391ebe9099fca776e7101ac6e1761881606def5fa": { "describe": { "columns": [], "nullable": [], "parameters": { "Left": [ - "Text", - "Int4" + "Text" ] } }, - "query": "DELETE FROM mcaptcha_levels \n WHERE config_id = (\n SELECT config_id FROM mcaptcha_config \n WHERE key = $1 AND user_id = $2\n );" + "query": "DELETE FROM mcaptcha_users WHERE name = ($1)" }, "dbe4307651d94bc6db4f1d8b2c6d076fde6280983d59593216d7765cbbdd669c": { "describe": { @@ -534,5 +697,79 @@ } }, "query": "-- gets all unread notifications a user has\nSELECT \n mcaptcha_notifications.id,\n mcaptcha_notifications.heading,\n mcaptcha_notifications.message,\n mcaptcha_notifications.received,\n mcaptcha_users.name\nFROM\n mcaptcha_notifications \nINNER JOIN \n mcaptcha_users \nON \n mcaptcha_notifications.tx = mcaptcha_users.id\nWHERE \n mcaptcha_notifications.rx = (\n SELECT \n id \n FROM \n mcaptcha_users\n WHERE\n name = $1\n )\nAND \n mcaptcha_notifications.read IS NULL;\n" + }, + "e4c710d33b709aee262fa0704372ac216d98851447ef4fbe221740b7ae4ea422": { + "describe": { + "columns": [ + { + "name": "secret", + "ordinal": 0, + "type_info": "Varchar" + } + ], + "nullable": [ + false + ], + "parameters": { + "Left": [ + "Text" + ] + } + }, + "query": "SELECT secret FROM mcaptcha_users WHERE name = ($1)" + }, + "e9ed973dfd2bfef36d5a4724aef4993328e1d8d3ca397fe6d5408a780efc775a": { + "describe": { + "columns": [], + "nullable": [], + "parameters": { + "Left": [ + "Text", + "Text" + ] + } + }, + "query": "UPDATE mcaptcha_users set password = $1\n WHERE name = $2" + }, + "f330cb94c53d33495df94aacec7e4e91d8a920742b89a63d1c59a8ea8937c5c8": { + "describe": { + "columns": [], + "nullable": [], + "parameters": { + "Left": [ + "Int4", + "Int4", + "Text", + "Text" + ] + } + }, + "query": "INSERT INTO mcaptcha_levels (\n difficulty_factor, \n visitor_threshold,\n config_id) VALUES (\n $1, $2, (\n SELECT config_id FROM mcaptcha_config WHERE\n key = ($3) AND user_id = (\n SELECT ID FROM mcaptcha_users WHERE name = $4\n )));" + }, + "f3dee60b85be2ae861b6695286e387529dabf3d11202fb2eeb7e75a7bb3bd0a4": { + "describe": { + "columns": [ + { + "name": "name", + "ordinal": 0, + "type_info": "Varchar" + }, + { + "name": "password", + "ordinal": 1, + "type_info": "Text" + } + ], + "nullable": [ + false, + false + ], + "parameters": { + "Left": [ + "Text" + ] + } + }, + "query": "SELECT name, password FROM mcaptcha_users WHERE name = ($1)" } } \ No newline at end of file diff --git a/src/api/v1/mcaptcha/delete.rs b/src/api/v1/mcaptcha/delete.rs index 634dbe24..71abe5f2 100644 --- a/src/api/v1/mcaptcha/delete.rs +++ b/src/api/v1/mcaptcha/delete.rs @@ -19,6 +19,8 @@ use actix_web::{web, HttpResponse, Responder}; use libmcaptcha::master::messages::RemoveCaptcha; use serde::{Deserialize, Serialize}; +use db_core::Login; + use crate::errors::*; use crate::AppData; @@ -38,58 +40,19 @@ async fn delete( id: Identity, ) -> ServiceResult { use argon2_creds::Config; - use sqlx::Error::RowNotFound; let username = id.identity().unwrap(); - struct PasswordID { - password: String, - id: i32, + let hash = data.dblib.get_password(&Login::Username(&username)).await?; + + if !Config::verify(&hash.hash, &payload.password)? { + return Err(ServiceError::WrongPassword); } + let payload = payload.into_inner(); + data.dblib.delete_captcha(&username, &payload.key).await?; - let rec = sqlx::query_as!( - PasswordID, - r#"SELECT ID, password FROM mcaptcha_users WHERE name = ($1)"#, - &username, - ) - .fetch_one(&data.db) - .await; - - match rec { - Ok(rec) => { - if Config::verify(&rec.password, &payload.password)? { - let payload = payload.into_inner(); - sqlx::query!( - "DELETE FROM mcaptcha_levels - WHERE config_id = ( - SELECT config_id FROM mcaptcha_config - WHERE key = $1 AND user_id = $2 - );", - &payload.key, - &rec.id, - ) - .execute(&data.db) - .await?; - - sqlx::query!( - "DELETE FROM mcaptcha_config WHERE key = ($1) AND user_id = $2;", - &payload.key, - &rec.id, - ) - .execute(&data.db) - .await?; - if let Err(err) = data.captcha.remove(RemoveCaptcha(payload.key)).await { - log::error!( - "Error while trying to remove captcha from cache {}", - err - ); - } - Ok(HttpResponse::Ok()) - } else { - Err(ServiceError::WrongPassword) - } - } - Err(RowNotFound) => Err(ServiceError::UsernameNotFound), - Err(_) => Err(ServiceError::InternalServerError), + if let Err(err) = data.captcha.remove(RemoveCaptcha(payload.key)).await { + log::error!("Error while trying to remove captcha from cache {}", err); } + Ok(HttpResponse::Ok()) }