Merge pull request #158 from ZeusWPI/feature/registration-hook

Basic webhook functionality on registration

Cargo.toml

@@ -19,6 +19,7 @@ urlencoding = "2.1"
 toml = "0.5"
 rand = "0.8"
 regex = "1.0"
+reqwest = { version = "0.11.0", features = [ "json" ] }
 rocket = { version = "0.5.0-rc.1", features = [ "json", "secrets" ] }
 serde = "1.0"
 serde_json = "1.0"

Rocket.toml

@@ -17,6 +17,7 @@ maximum_pending_users = 25
 secret_key = "1vwCFFPSdQya895gNiO556SzmfShG6MokstgttLvwjw="
 bcrypt_cost = 4
 seed_database = true
+webhook_url = "http://localhost:8080/hook"
 
 [debug.databases.postgresql_database]
 url = "postgresql://zauth:zauth@localhost/zauth"
@@ -30,6 +31,7 @@ port = 8000
 # base_url =    # URL where the application is hosten (e.g. https://auth.zeus.gent)
 # mail_from =   # From header to set when sending emails (e.g. [email protected])
 # mail_server = # domain of the SMTP server used to send mail (e.g. smtp.zeus.gent)
+# webhook_url = # hook to post new (approved) user's details to
 
 # See src/config.rs for all the possible config values and their defaults
 

flake.nix

@@ -22,7 +22,7 @@
   {
     devShell = mkShell {
       buildInputs = [
-        rust-bin.nightly.latest.default
+        (rust-bin.nightly.latest.default.override { extensions = [ "rust-analyzer-preview" "rust-src" ]; })
         openssl.dev
         pkg-config
         docker-compose

src/config.rs

@@ -19,6 +19,7 @@ pub struct Config {
 	pub mail_from: String,
 	pub mail_server: String,
 	pub maximum_pending_users: usize,
+	pub webhook_url: Option<String>,
 }
 
 impl Config {

src/controllers/users_controller.rs

@@ -13,6 +13,7 @@ use crate::ephemeral::session::{
 };
 use crate::errors::Either::{self, Left, Right};
 use crate::errors::{InternalError, OneOf, Result, ZauthError};
+use crate::hooker::Hooker;
 use crate::mailer::Mailer;
 use crate::models::user::*;
 use crate::views::accepter::Accepter;
@@ -219,6 +220,7 @@ pub async fn set_approved<'r>(
 	username: String,
 	_session: AdminSession,
 	mailer: &'r State<Mailer>,
+	hooker: &'r State<Hooker>,
 	conf: &'r State<Config>,
 	db: DbConn,
 ) -> Result<impl Responder<'r, 'static>> {
@@ -227,6 +229,7 @@ pub async fn set_approved<'r>(
 
 	let login_url = uri!(conf.base_url(), new_session);
 
+	hooker.user_approved(&user).await?;
 	mailer
 		.create(
 			&user,

src/errors.rs

@@ -10,6 +10,7 @@ use rocket::tokio::sync::mpsc::error::{SendError, TrySendError};
 use std::convert::Infallible;
 use validator::ValidationErrors;
 
+use crate::models::user::User;
 use crate::views::accepter::Accepter;
 
 #[derive(Error, Debug)]
@@ -203,6 +204,8 @@ pub enum InternalError {
 	InvalidEmail(#[from] lettre::address::AddressError),
 	#[error("Mailer error")]
 	MailError(#[from] lettre::error::Error),
+	#[error("Hooker stopped processing items")]
+	HookerStopped(#[from] SendError<User>),
 	#[error("Mailer stopped processing items")]
 	MailerStopped(#[from] SendError<Message>),
 	#[error("Mail queue full")]