mirror of
https://git.verdigado.com/NB-Public/simple-wkd.git
synced 2024-12-05 03:32:49 +01:00
Add a webpage
This commit is contained in:
Delta1925
parent
e621a735f5
commit
a91b213dbf
9 changed files with 107 additions and 47 deletions
1
assets/webpage/_astro/delete.6228aab6.css
Normal file
1
assets/webpage/_astro/delete.6228aab6.css
Normal file
File diff suppressed because one or more lines are too long
20
assets/webpage/delete/index.html
Normal file
20
assets/webpage/delete/index.html
Normal file
|
|
@ -0,0 +1,20 @@
|
|||
<!DOCTYPE html><html lang="en" class="h-full"><head>
|
||||
<meta charset="UTF-8">
|
||||
<meta name="viewport" content="width=device-width">
|
||||
<link rel="icon" type="image/svg+xml" href="/favicon.svg">
|
||||
<meta name="generator" content="Astro v2.3.0">
|
||||
<title>Submit a key</title>
|
||||
<style>*,:before,:after{box-sizing:border-box;border-width:0;border-style:solid;border-color:#e5e7eb}:before,:after{--tw-content:""}html{line-height:1.5;-webkit-text-size-adjust:100%;-moz-tab-size:4;-o-tab-size:4;tab-size:4;font-family:ui-sans-serif,system-ui,-apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Helvetica Neue,Arial,Noto Sans,sans-serif,"Apple Color Emoji","Segoe UI Emoji",Segoe UI Symbol,"Noto Color Emoji";font-feature-settings:normal;font-variation-settings:normal}body{margin:0;line-height:inherit}button,input{font-family:inherit;font-size:100%;font-weight:inherit;line-height:inherit;color:inherit;margin:0;padding:0}button{text-transform:none}button,[type=submit]{-webkit-appearance:button;background-color:transparent;background-image:none}input::-moz-placeholder{opacity:1;color:#9ca3af}input::placeholder{opacity:1;color:#9ca3af}button{cursor:pointer}[type=email]{-webkit-appearance:none;-moz-appearance:none;appearance:none;background-color:#fff;border-color:#6b7280;border-width:1px;border-radius:0;padding:.5rem .75rem;font-size:1rem;line-height:1.5rem;--tw-shadow:0 0 #0000}[type=email]:focus{outline:2px solid transparent;outline-offset:2px;--tw-ring-inset:var(--tw-empty, );--tw-ring-offset-width:0px;--tw-ring-offset-color:#fff;--tw-ring-color:#2563eb;--tw-ring-offset-shadow:var(--tw-ring-inset) 0 0 0 var(--tw-ring-offset-width) var(--tw-ring-offset-color);--tw-ring-shadow:var(--tw-ring-inset) 0 0 0 calc(1px + var(--tw-ring-offset-width)) var(--tw-ring-color);box-shadow:var(--tw-ring-offset-shadow),var(--tw-ring-shadow),var(--tw-shadow);border-color:#2563eb}input::-moz-placeholder{color:#6b7280;opacity:1}input::placeholder{color:#6b7280;opacity:1}*,:before,:after{--tw-border-spacing-x:0;--tw-border-spacing-y:0;--tw-translate-x:0;--tw-translate-y:0;--tw-rotate:0;--tw-skew-x:0;--tw-skew-y:0;--tw-scale-x:1;--tw-scale-y:1;--tw-pan-x: ;--tw-pan-y: ;--tw-pinch-zoom: ;--tw-scroll-snap-strictness:proximity;--tw-ordinal: ;--tw-slashed-zero: ;--tw-numeric-figure: ;--tw-numeric-spacing: ;--tw-numeric-fraction: ;--tw-ring-inset: ;--tw-ring-offset-width:0px;--tw-ring-offset-color:#fff;--tw-ring-color:rgb(59 130 246 / .5);--tw-ring-offset-shadow:0 0 #0000;--tw-ring-shadow:0 0 #0000;--tw-shadow:0 0 #0000;--tw-shadow-colored:0 0 #0000;--tw-blur: ;--tw-brightness: ;--tw-contrast: ;--tw-grayscale: ;--tw-hue-rotate: ;--tw-invert: ;--tw-saturate: ;--tw-sepia: ;--tw-drop-shadow: ;--tw-backdrop-blur: ;--tw-backdrop-brightness: ;--tw-backdrop-contrast: ;--tw-backdrop-grayscale: ;--tw-backdrop-hue-rotate: ;--tw-backdrop-invert: ;--tw-backdrop-opacity: ;--tw-backdrop-saturate: ;--tw-backdrop-sepia: }.mt-3{margin-top:.75rem}.mt-4{margin-top:1rem}.flex{display:flex}.h-full{height:100%}.w-full{width:100%}.max-w-full{max-width:100%}.flex-row{flex-direction:row}.flex-col{flex-direction:column}.items-center{align-items:center}.self-end{align-self:flex-end}.px-8{padding-left:2rem;padding-right:2rem}.py-4{padding-top:1rem;padding-bottom:1rem}.font-mono{font-family:ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,Liberation Mono,Courier New,monospace}.text-xl{font-size:1.25rem;line-height:1.75rem}.font-bold{font-weight:700}.focus\:rounded-lg:focus{border-radius:.5rem}.button{--tw-bg-opacity:1;background-color:rgb(240 253 250 / var(--tw-bg-opacity));padding:1rem}.button:hover{--tw-drop-shadow:drop-shadow(0 4px 3px rgb(0 0 0 / .07)) drop-shadow(0 2px 2px rgb(0 0 0 / .06));filter:var(--tw-blur) var(--tw-brightness) var(--tw-contrast) var(--tw-grayscale) var(--tw-hue-rotate) var(--tw-invert) var(--tw-saturate) var(--tw-sepia) var(--tw-drop-shadow);border-radius:.5rem}.round,.button{--tw-border-opacity:1;border-color:rgb(0 0 0 / var(--tw-border-opacity));border-width:1px;border-top-right-radius:.5rem;border-bottom-left-radius:.5rem;transition-property:all;transition-timing-function:cubic-bezier(.4,0,.2,1);transition-duration:.15s}</style><link rel="preload" href="/_astro/delete.6228aab6.css" as="style" onload="this.rel='stylesheet'"><noscript><link rel="stylesheet" href="/_astro/delete.6228aab6.css"></noscript></head>
|
||||
<body class="h-full">
|
||||
|
||||
<div class="flex flex-row items-center h-full font-mono px-8 py-4">
|
||||
<div class="flex flex-col items-center w-full">
|
||||
<form action="{{%u}}/api/delete" method="get" class="flex flex-col max-w-full">
|
||||
<label for="email" class="font-bold text-xl mt-3">Request key deletion:</label>
|
||||
<input type="email" name="email" id="email-input" placeholder="e-mail" size="65" class="round focus:rounded-lg mt-3" required="">
|
||||
<button type="submit" class="button mt-4 self-end">Delete</button>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</body></html>
|
||||
20
assets/webpage/index.html
Normal file
20
assets/webpage/index.html
Normal file
|
|
@ -0,0 +1,20 @@
|
|||
<!DOCTYPE html><html lang="en" class="h-full"><head>
|
||||
<meta charset="UTF-8">
|
||||
<meta name="viewport" content="width=device-width">
|
||||
<link rel="icon" type="image/svg+xml" href="/favicon.svg">
|
||||
<meta name="generator" content="Astro v2.3.0">
|
||||
<title>Manage keys</title>
|
||||
<style>*,:before,:after{box-sizing:border-box;border-width:0;border-style:solid;border-color:#e5e7eb}:before,:after{--tw-content:""}html{line-height:1.5;-webkit-text-size-adjust:100%;-moz-tab-size:4;-o-tab-size:4;tab-size:4;font-family:ui-sans-serif,system-ui,-apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Helvetica Neue,Arial,Noto Sans,sans-serif,"Apple Color Emoji","Segoe UI Emoji",Segoe UI Symbol,"Noto Color Emoji";font-feature-settings:normal;font-variation-settings:normal}body{margin:0;line-height:inherit}h1{font-size:inherit;font-weight:inherit}a{color:inherit;text-decoration:inherit}h1{margin:0}*,:before,:after{--tw-border-spacing-x:0;--tw-border-spacing-y:0;--tw-translate-x:0;--tw-translate-y:0;--tw-rotate:0;--tw-skew-x:0;--tw-skew-y:0;--tw-scale-x:1;--tw-scale-y:1;--tw-pan-x: ;--tw-pan-y: ;--tw-pinch-zoom: ;--tw-scroll-snap-strictness:proximity;--tw-ordinal: ;--tw-slashed-zero: ;--tw-numeric-figure: ;--tw-numeric-spacing: ;--tw-numeric-fraction: ;--tw-ring-inset: ;--tw-ring-offset-width:0px;--tw-ring-offset-color:#fff;--tw-ring-color:rgb(59 130 246 / .5);--tw-ring-offset-shadow:0 0 #0000;--tw-ring-shadow:0 0 #0000;--tw-shadow:0 0 #0000;--tw-shadow-colored:0 0 #0000;--tw-blur: ;--tw-brightness: ;--tw-contrast: ;--tw-grayscale: ;--tw-hue-rotate: ;--tw-invert: ;--tw-saturate: ;--tw-sepia: ;--tw-drop-shadow: ;--tw-backdrop-blur: ;--tw-backdrop-brightness: ;--tw-backdrop-contrast: ;--tw-backdrop-grayscale: ;--tw-backdrop-hue-rotate: ;--tw-backdrop-invert: ;--tw-backdrop-opacity: ;--tw-backdrop-saturate: ;--tw-backdrop-sepia: }.flex{display:flex}.h-full{height:100%}.w-full{width:100%}.flex-row{flex-direction:row}.flex-col{flex-direction:column}.items-center{align-items:center}.space-x-6>:not([hidden])~:not([hidden]){--tw-space-x-reverse:0;margin-right:calc(1.5rem * var(--tw-space-x-reverse));margin-left:calc(1.5rem * calc(1 - var(--tw-space-x-reverse)))}.px-8{padding-left:2rem;padding-right:2rem}.py-4{padding-top:1rem;padding-bottom:1rem}.font-mono{font-family:ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,Liberation Mono,Courier New,monospace}.text-lg{font-size:1.125rem;line-height:1.75rem}.font-bold{font-weight:700}.button{--tw-bg-opacity:1;background-color:rgb(240 253 250 / var(--tw-bg-opacity));padding:1rem}.button:hover{--tw-drop-shadow:drop-shadow(0 4px 3px rgb(0 0 0 / .07)) drop-shadow(0 2px 2px rgb(0 0 0 / .06));filter:var(--tw-blur) var(--tw-brightness) var(--tw-contrast) var(--tw-grayscale) var(--tw-hue-rotate) var(--tw-invert) var(--tw-saturate) var(--tw-sepia) var(--tw-drop-shadow);border-radius:.5rem}.button{--tw-border-opacity:1;border-color:rgb(0 0 0 / var(--tw-border-opacity));border-width:1px;border-top-right-radius:.5rem;border-bottom-left-radius:.5rem;transition-property:all;transition-timing-function:cubic-bezier(.4,0,.2,1);transition-duration:.15s}</style><link rel="preload" href="/_astro/delete.6228aab6.css" as="style" onload="this.rel='stylesheet'"><noscript><link rel="stylesheet" href="/_astro/delete.6228aab6.css"></noscript></head>
|
||||
<body class="h-full">
|
||||
|
||||
<div class="flex flex-row items-center h-full font-mono px-8 py-4">
|
||||
<div class="flex flex-col items-center w-full">
|
||||
<h1 class="font-bold text-lg">What would you like to do?</h1>
|
||||
<div class="flex flex-row space-x-6">
|
||||
<a href="/submit" class="button">Submit a key</a>
|
||||
<a href="/delete" class="button">Delete a key</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</body></html>
|
||||
20
assets/webpage/submit/index.html
Normal file
20
assets/webpage/submit/index.html
Normal file
|
|
@ -0,0 +1,20 @@
|
|||
<!DOCTYPE html><html lang="en" class="h-full"><head>
|
||||
<meta charset="UTF-8">
|
||||
<meta name="viewport" content="width=device-width">
|
||||
<link rel="icon" type="image/svg+xml" href="/favicon.svg">
|
||||
<meta name="generator" content="Astro v2.3.0">
|
||||
<title>Submit a key</title>
|
||||
<style>*,:before,:after{box-sizing:border-box;border-width:0;border-style:solid;border-color:#e5e7eb}:before,:after{--tw-content:""}html{line-height:1.5;-webkit-text-size-adjust:100%;-moz-tab-size:4;-o-tab-size:4;tab-size:4;font-family:ui-sans-serif,system-ui,-apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Helvetica Neue,Arial,Noto Sans,sans-serif,"Apple Color Emoji","Segoe UI Emoji",Segoe UI Symbol,"Noto Color Emoji";font-feature-settings:normal;font-variation-settings:normal}body{margin:0;line-height:inherit}button,textarea{font-family:inherit;font-size:100%;font-weight:inherit;line-height:inherit;color:inherit;margin:0;padding:0}button{text-transform:none}button,[type=submit]{-webkit-appearance:button;background-color:transparent;background-image:none}textarea{resize:vertical}textarea::-moz-placeholder{opacity:1;color:#9ca3af}textarea::placeholder{opacity:1;color:#9ca3af}button{cursor:pointer}textarea{-webkit-appearance:none;-moz-appearance:none;appearance:none;background-color:#fff;border-color:#6b7280;border-width:1px;border-radius:0;padding:.5rem .75rem;font-size:1rem;line-height:1.5rem;--tw-shadow:0 0 #0000}textarea:focus{outline:2px solid transparent;outline-offset:2px;--tw-ring-inset:var(--tw-empty, );--tw-ring-offset-width:0px;--tw-ring-offset-color:#fff;--tw-ring-color:#2563eb;--tw-ring-offset-shadow:var(--tw-ring-inset) 0 0 0 var(--tw-ring-offset-width) var(--tw-ring-offset-color);--tw-ring-shadow:var(--tw-ring-inset) 0 0 0 calc(1px + var(--tw-ring-offset-width)) var(--tw-ring-color);box-shadow:var(--tw-ring-offset-shadow),var(--tw-ring-shadow),var(--tw-shadow);border-color:#2563eb}textarea::-moz-placeholder{color:#6b7280;opacity:1}textarea::placeholder{color:#6b7280;opacity:1}*,:before,:after{--tw-border-spacing-x:0;--tw-border-spacing-y:0;--tw-translate-x:0;--tw-translate-y:0;--tw-rotate:0;--tw-skew-x:0;--tw-skew-y:0;--tw-scale-x:1;--tw-scale-y:1;--tw-pan-x: ;--tw-pan-y: ;--tw-pinch-zoom: ;--tw-scroll-snap-strictness:proximity;--tw-ordinal: ;--tw-slashed-zero: ;--tw-numeric-figure: ;--tw-numeric-spacing: ;--tw-numeric-fraction: ;--tw-ring-inset: ;--tw-ring-offset-width:0px;--tw-ring-offset-color:#fff;--tw-ring-color:rgb(59 130 246 / .5);--tw-ring-offset-shadow:0 0 #0000;--tw-ring-shadow:0 0 #0000;--tw-shadow:0 0 #0000;--tw-shadow-colored:0 0 #0000;--tw-blur: ;--tw-brightness: ;--tw-contrast: ;--tw-grayscale: ;--tw-hue-rotate: ;--tw-invert: ;--tw-saturate: ;--tw-sepia: ;--tw-drop-shadow: ;--tw-backdrop-blur: ;--tw-backdrop-brightness: ;--tw-backdrop-contrast: ;--tw-backdrop-grayscale: ;--tw-backdrop-hue-rotate: ;--tw-backdrop-invert: ;--tw-backdrop-opacity: ;--tw-backdrop-saturate: ;--tw-backdrop-sepia: }.mt-3{margin-top:.75rem}.mt-6{margin-top:1.5rem}.flex{display:flex}.h-full{height:100%}.w-full{width:100%}.max-w-full{max-width:100%}.resize-none{resize:none}.flex-row{flex-direction:row}.flex-col{flex-direction:column}.items-center{align-items:center}.self-end{align-self:flex-end}.px-8{padding-left:2rem;padding-right:2rem}.py-4{padding-top:1rem;padding-bottom:1rem}.font-mono{font-family:ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,Liberation Mono,Courier New,monospace}.text-xl{font-size:1.25rem;line-height:1.75rem}.font-bold{font-weight:700}.focus\:rounded-lg:focus{border-radius:.5rem}.button{--tw-bg-opacity:1;background-color:rgb(240 253 250 / var(--tw-bg-opacity));padding:1rem}.button:hover{--tw-drop-shadow:drop-shadow(0 4px 3px rgb(0 0 0 / .07)) drop-shadow(0 2px 2px rgb(0 0 0 / .06));filter:var(--tw-blur) var(--tw-brightness) var(--tw-contrast) var(--tw-grayscale) var(--tw-hue-rotate) var(--tw-invert) var(--tw-saturate) var(--tw-sepia) var(--tw-drop-shadow);border-radius:.5rem}.round,.button{--tw-border-opacity:1;border-color:rgb(0 0 0 / var(--tw-border-opacity));border-width:1px;border-top-right-radius:.5rem;border-bottom-left-radius:.5rem;transition-property:all;transition-timing-function:cubic-bezier(.4,0,.2,1);transition-duration:.15s}</style><link rel="preload" href="/_astro/delete.6228aab6.css" as="style" onload="this.rel='stylesheet'"><noscript><link rel="stylesheet" href="/_astro/delete.6228aab6.css"></noscript></head>
|
||||
<body class="h-full">
|
||||
|
||||
<div class="flex flex-row items-center h-full font-mono px-8 py-4">
|
||||
<div class="flex flex-col items-center w-full">
|
||||
<form action="{{%u}}/api/submit" method="post" class="flex flex-col max-w-full">
|
||||
<label for="key" class="font-bold text-xl">Paste your pgp keyblock here:</label>
|
||||
<textarea name="key" id="key-input" cols="65" rows="20" class="round focus:rounded-lg mt-3 resize-none" placeholder="-----BEGIN PGP PUBLIC KEY BLOCK-----" required=""></textarea>
|
||||
<button type="submit" class="button mt-6 self-end">Submit</button>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</body></html>
|
||||
|
|
@ -13,4 +13,4 @@ smtp_password = "verysecurepassword"
|
|||
smtp_port = 465
|
||||
smtp_tls = "Tls"
|
||||
mail_from = "key-submission@example.org"
|
||||
mail_subject = "Confirm this action"
|
||||
mail_subject = "Please confirm to %a your public key"
|
||||
|
|
@ -105,6 +105,13 @@ pub fn confirm_action(token: &str) -> Result<(Action, String), Error> {
|
|||
pub fn send_confirmation_email(address: &str, action: &Action, token: &str) -> Result<(), Error> {
|
||||
debug!("Sending email to {}", address);
|
||||
let template = fs::read_to_string(Path::new("assets").join("mail-template.html")).unwrap();
|
||||
let mut url = SETTINGS
|
||||
.external_url
|
||||
.join("api/")
|
||||
.unwrap()
|
||||
.join("confirm")
|
||||
.unwrap();
|
||||
url.set_query(Some(&format!("token={}", token)));
|
||||
let email = Message::builder()
|
||||
.from(match SETTINGS.mail_settings.mail_from.parse() {
|
||||
Ok(mailbox) => mailbox,
|
||||
|
|
@ -129,18 +136,7 @@ pub fn send_confirmation_email(address: &str, action: &Action, token: &str) -> R
|
|||
.header(ContentType::TEXT_HTML)
|
||||
.body(
|
||||
template
|
||||
.replace(
|
||||
"{{%u}}",
|
||||
SETTINGS
|
||||
.external_url
|
||||
.join("api/")
|
||||
.unwrap()
|
||||
.join("confirm/")
|
||||
.unwrap()
|
||||
.join(token)
|
||||
.unwrap()
|
||||
.as_ref(),
|
||||
)
|
||||
.replace("{{%u}}", url.as_ref())
|
||||
.replace("{{%a}}", &action.to_string().to_lowercase()),
|
||||
);
|
||||
|
||||
|
|
|
|||
|
|
@ -3,33 +3,33 @@ use thiserror::Error;
|
|||
|
||||
#[derive(Error, Debug, Clone, Copy)]
|
||||
pub enum Error {
|
||||
#[error("(0x00) Cert is invalid")]
|
||||
#[error("(0x01) Cert is invalid")]
|
||||
InvalidCert,
|
||||
#[error("(0x01) Error while parsing cert")]
|
||||
#[error("(0x02) Error while parsing cert")]
|
||||
ParseCert,
|
||||
#[error("(0x02) Error while parsing an E-Mail address")]
|
||||
#[error("(0x03) Error while parsing an E-Mail address")]
|
||||
ParseEmail,
|
||||
#[error("(0x03) There is no pending request associated to this token")]
|
||||
#[error("(0x04) There is no pending request associated to this token")]
|
||||
MissingPending,
|
||||
#[error("(0x04) Requested key does not exist")]
|
||||
#[error("(0x05) Requested key does not exist")]
|
||||
MissingKey,
|
||||
#[error("(0x05) No E-Mail found in the certificate")]
|
||||
#[error("(0x06) No E-Mail found in the certificate")]
|
||||
MissingMail,
|
||||
#[error("(0x06) Error while sending the E-Mail")]
|
||||
#[error("(0x07) Error while sending the E-Mail")]
|
||||
SendMail,
|
||||
#[error("(0x07) rror while serializing data")]
|
||||
#[error("(0x08) rror while serializing data")]
|
||||
SerializeData,
|
||||
#[error("(0x08) Error while deserializing data")]
|
||||
#[error("(0x09) Error while deserializing data")]
|
||||
DeserializeData,
|
||||
#[error("(0x09) The file is inaccessible")]
|
||||
#[error("(0x0A) The file is inaccessible")]
|
||||
Inaccessible,
|
||||
#[error("(0x0A) Error while adding a key to the wkd")]
|
||||
#[error("(0x0B) Error while adding a key to the wkd")]
|
||||
AddingKey,
|
||||
#[error("(0x0B) Error while generating the wkd path")]
|
||||
#[error("(0x0C) Error while generating the wkd path")]
|
||||
PathGeneration,
|
||||
#[error("(0x0C) Error while generating the email")]
|
||||
#[error("(0x0D) Error while generating the email")]
|
||||
MailGeneration,
|
||||
#[error("(0x0D) Wrong email domain")]
|
||||
#[error("(0x0E) Wrong email domain")]
|
||||
WrongDomain,
|
||||
}
|
||||
|
||||
|
|
|
|||
30
src/main.rs
30
src/main.rs
|
|
@ -23,18 +23,18 @@ use utils::init_logger;
|
|||
const PENDING_FOLDER: &str = "pending";
|
||||
|
||||
#[derive(Deserialize, Debug)]
|
||||
struct Pem {
|
||||
struct Key {
|
||||
key: String,
|
||||
}
|
||||
|
||||
#[derive(Deserialize, Debug)]
|
||||
struct Token {
|
||||
value: String,
|
||||
token: String,
|
||||
}
|
||||
|
||||
#[derive(Deserialize, Debug)]
|
||||
struct Email {
|
||||
address: String,
|
||||
email: String,
|
||||
}
|
||||
|
||||
#[actix_web::main]
|
||||
|
|
@ -67,7 +67,7 @@ async fn main() -> std::io::Result<()> {
|
|||
}
|
||||
|
||||
#[post("/api/submit")]
|
||||
async fn submit(pem: web::Form<Pem>) -> Result<String> {
|
||||
async fn submit(pem: web::Form<Key>) -> Result<String> {
|
||||
let cert = parse_pem(&pem.key)?;
|
||||
let email = get_email_from_cert(&cert)?;
|
||||
is_email_allowed(&email)?;
|
||||
|
|
@ -75,24 +75,24 @@ async fn submit(pem: web::Form<Pem>) -> Result<String> {
|
|||
store_pending_addition(pem.key.clone(), &email, &token)?;
|
||||
send_confirmation_email(&email, &Action::Add, &token)?;
|
||||
info!("User {} submitted a key!", &email);
|
||||
Ok(String::from("Key submitted successfully!"))
|
||||
Ok(String::from("(0x00) Key submitted successfully!"))
|
||||
}
|
||||
|
||||
#[get("/api/confirm/{value}")]
|
||||
async fn confirm(token: web::Path<Token>) -> Result<String> {
|
||||
let (action, email) = confirm_action(&token.value)?;
|
||||
#[get("/api/confirm")]
|
||||
async fn confirm(token: web::Query<Token>) -> Result<String> {
|
||||
let (action, email) = confirm_action(&token.token)?;
|
||||
match action {
|
||||
Action::Add => info!("Key for user {} was added successfully!", email),
|
||||
Action::Delete => info!("Key for user {} was deleted successfully!", email),
|
||||
}
|
||||
Ok(String::from("Confirmation successful!"))
|
||||
Ok(String::from("(0x00) Confirmation successful!"))
|
||||
}
|
||||
|
||||
#[get("/api/delete/{address}")]
|
||||
async fn delete(email: web::Path<Email>) -> Result<String> {
|
||||
#[get("/api/delete")]
|
||||
async fn delete(email: web::Query<Email>) -> Result<String> {
|
||||
let token = gen_random_token();
|
||||
store_pending_deletion(email.address.clone(), &token)?;
|
||||
send_confirmation_email(&email.address, &Action::Delete, &token)?;
|
||||
info!("User {} requested the deletion of his key!", email.address);
|
||||
Ok(String::from("Deletion request submitted successfully!"))
|
||||
store_pending_deletion(email.email.clone(), &token)?;
|
||||
send_confirmation_email(&email.email, &Action::Delete, &token)?;
|
||||
info!("User {} requested the deletion of his key!", email.email);
|
||||
Ok(String::from("(0x00) Deletion request submitted successfully!"))
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ use crate::PENDING_FOLDER;
|
|||
use crate::{errors::Error, utils::get_filename};
|
||||
|
||||
use chrono::Utc;
|
||||
use log::{debug, warn};
|
||||
use log::{debug, error, warn};
|
||||
use serde::{Deserialize, Serialize};
|
||||
use std::{fmt::Display, fs, path::Path};
|
||||
|
||||
|
|
@ -74,10 +74,13 @@ pub fn store_pending_addition(pem: String, email: &str, token: &str) -> Result<(
|
|||
}
|
||||
|
||||
pub fn store_pending_deletion(email: String, token: &str) -> Result<(), Error> {
|
||||
match key_exists(&email) {
|
||||
Err(Error::PathGeneration) => debug!("Error while generating path for user {}", email),
|
||||
Err(Error::MissingKey) => debug!("There is no key for user {}", email),
|
||||
_ => (),
|
||||
if let Err(error) = key_exists(&email) {
|
||||
match error {
|
||||
Error::PathGeneration => debug!("Error while generating path for user {}", email),
|
||||
Error::MissingKey => debug!("There is no key for user {}", email),
|
||||
_ => error!("An unexpected error occoured!"),
|
||||
}
|
||||
return Err(error);
|
||||
}
|
||||
let pending = Pending::build_delete(email.clone());
|
||||
store_pending(&pending, token)?;
|
||||
|
|
|
|||
Loading…
Reference in a new issue