+
+
\ No newline at end of file
diff --git a/example.config.toml b/example.config.toml
index d0d98cc..e12b8f9 100644
--- a/example.config.toml
+++ b/example.config.toml
@@ -13,4 +13,4 @@ smtp_password = "verysecurepassword"
smtp_port = 465
smtp_tls = "Tls"
mail_from = "key-submission@example.org"
-mail_subject = "Confirm this action"
\ No newline at end of file
+mail_subject = "Please confirm to %a your public key"
\ No newline at end of file
diff --git a/src/confirmation.rs b/src/confirmation.rs
index b0e3466..8eeb2fb 100644
--- a/src/confirmation.rs
+++ b/src/confirmation.rs
@@ -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()),
);
diff --git a/src/errors.rs b/src/errors.rs
index 059eb31..4e323e8 100644
--- a/src/errors.rs
+++ b/src/errors.rs
@@ -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,
}
diff --git a/src/main.rs b/src/main.rs
index 427c032..69e072c 100644
--- a/src/main.rs
+++ b/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