add sentry

Author: foltik

.github/workflows/deploy.yaml

@@ -49,6 +49,7 @@ jobs:
           EMAIL_NEWSLETTER_REPLY_TO: ${{ secrets.EMAIL_NEWSLETTER_REPLY_TO }}
           CF_TURNSTILE_SITE_KEY: ${{ secrets.CF_TURNSTILE_SITE_KEY }}
           CF_TURNSTILE_SECRET_KEY: ${{ secrets.CF_TURNSTILE_SECRET_KEY }}
+          SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
 
       - name: Generate content hashes
         run: |

Cargo.toml

@@ -21,8 +21,9 @@ tower = "0.5"
 tower-http = { version = "0.6", features = ["fs", "set-header", "compression-br", "request-id", "trace", "util"] }
 tower-serve-static = "0.1"
 reqwest = { version = "0.12", default-features = false, features = ["http2", "charset", "json", "multipart", "rustls-tls"] }
+sentry = { version = "0.46", default-features = false, features = ["tracing", "backtrace", "contexts", "debug-images", "panic", "release-health", "tower-axum-matched-path", "reqwest", "rustls"]}
+backtrace = "0.3"
 
-anyhow = "1"
 thiserror = "2"
 chrono-tz = { version = "0.10", features = ["serde"] }
 chrono = { version = "0.4", features = ["serde"] }

config/prod.toml

@@ -34,3 +34,6 @@ webhook_key = "$STRIPE_WEBHOOK_KEY"
 [cloudflare]
 turnstile_site_key = "$CF_TURNSTILE_SITE_KEY"
 turnstile_secret_key = "$CF_TURNSTILE_SECRET_KEY"
+
+[sentry]
+dsn = "$SENTRY_DSN"

frontend/styles/error.css

@@ -0,0 +1,21 @@
+#error {
+  h1 {
+    @apply mb-2 text-2xl italic;
+  }
+  p {
+    @apply text-lsd-gray text-sm;
+  }
+  a {
+    @apply decoration-lsd-blue hover:text-lsd-blue underline;
+  }
+}
+
+#error-extra {
+  max-width: 800px;
+  .section {
+    @apply mb-6;
+  }
+  pre {
+    font-size: 10px;
+  }
+}

frontend/styles/events/rsvp_selection.css

@@ -25,7 +25,7 @@
         }
         svg {
           @apply cursor-pointer touch-manipulation select-none;
-          transition: color 0.1s linear;
+          transition: color 0.05s linear;
           &.disabled {
             @apply cursor-default;
             color: var(--color-lsd-charcoal);

frontend/styles/main.css

@@ -9,6 +9,7 @@
 /* Home */
 @import "./home.css";
 @import "./dashboard.css";
+@import "./error.css";
 
 /* Events */
 @import "./events/edit.css";

frontend/templates/error.html

@@ -2,10 +2,25 @@
 
 {% block title %}light and sound{% endblock title %}
 {% block content %}
-  <section class="ext/layout thin">
-    <header>
-      <h1>Error</h1>
-    </header>
-    <p>{{ message }}</p>
+  <section id="error" class="ext/layout thin">
+    <h1>{{ title }}</h1>
+    <p>{{ message | safe }}</p>
   </section>
+  {% if context.is_some() || backtrace.is_some() %}
+    <section id="error-extra">
+      {% if let Some(context) = context %}
+        <div class="section">
+          <h2>Context</h2>
+          <pre>{{ context }}</pre>
+        </div>
+      {% endif %}
+
+      {% if let Some(backtrace) = backtrace %}
+        <div class="section">
+          <h2>Backtrace</h2>
+          <pre>{{ backtrace }}</pre>
+        </div>
+      {% endif %}
+    </section>
+  {% endif %}
 {% endblock content %}

frontend/templates/error_simple.html

@@ -0,0 +1,9 @@
+{% extends "layout.html" %}
+
+{% block title %}light and sound{% endblock title %}
+{% block content %}
+  <section id="error" class="ext/layout thin">
+    <h1>Error</h1>
+    <p>{{ message | safe }}</p>
+  </section>
+{% endblock content %}

src/app/auth.rs

@@ -37,7 +37,7 @@ pub fn add_middleware(router: AxumRouter, state: SharedAppState) -> AxumRouter {
     /// Middleware layer to lookup add a `User` to the request if a session token is present.
     pub async fn session_middleware(
         State(state): State<SharedAppState>, mut cookies: CookieJar, mut request: Request, next: Next,
-    ) -> AppResult<(CookieJar, Response)> {
+    ) -> HtmlResult {
         if let Some(token) = cookies.get("session") {
             match User::lookup_by_session_token(&state.db, token.value()).await? {
                 Some(user) => {
@@ -47,7 +47,7 @@ pub fn add_middleware(router: AxumRouter, state: SharedAppState) -> AxumRouter {
             }
         }
         let response = next.run(request).await;
-        Ok((cookies, response))
+        Ok((cookies, response).into_response())
     }
     router.layer(axum::middleware::from_fn_with_state(state, session_middleware))
 }
@@ -60,22 +60,20 @@ impl<S: Send + Sync> axum::extract::OptionalFromRequestParts<S> for User {
 }
 /// Enable extracting a `User` in a handler, returning UNAUTHORIZED if not logged in.
 impl<S: Send + Sync> axum::extract::FromRequestParts<S> for User {
-    type Rejection = AppError;
+    type Rejection = HtmlError;
     async fn from_request_parts(parts: &mut Parts, _state: &S) -> Result<Self, Self::Rejection> {
         match parts.extensions.get::<User>().cloned() {
             Some(user) => Ok(user),
-            None => Err(AppError::Unauthorized),
+            None => bail_unauthorized!(),
         }
     }
 }
 
 /// Process a login form and send either a login or registration link via email.
-async fn login_form(
-    State(state): State<SharedAppState>, Form(form): Form<LoginForm>,
-) -> AppResult<impl IntoResponse> {
+async fn login_form(State(state): State<SharedAppState>, Form(form): Form<LoginForm>) -> HtmlResult {
     let email = form.email.email.to_string();
     let Some(user) = User::lookup_by_email(&state.db, &email).await? else {
-        return Err(AppError::Unauthorized);
+        bail_unauthorized!()
     };
 
     let email_id = Email::create_login(&state.db, &user).await?;
@@ -99,11 +97,11 @@ async fn login_form(
     match state.mailer.send(&msg).await {
         Ok(_) => {
             Email::mark_sent(&state.db, email_id).await?;
-            Ok("Check your email!")
+            Ok("Check your email!".into_response())
         }
         Err(e) => {
-            Email::mark_error(&state.db, email_id, &e.to_string()).await?;
-            Err(e)
+            Email::mark_error(&state.db, email_id, e.message()).await?;
+            Err(e.into())
         }
     }
 }
@@ -129,7 +127,7 @@ impl LoginQuery {
 }
 async fn login_link(
     user: Option<User>, State(state): State<SharedAppState>, Query(query): Query<LoginQuery>,
-) -> AppResult<Response> {
+) -> HtmlResult {
     // If user is already logged in for some reason, just follow the redirect
     if user.is_some() {
         return Ok(query.redirect().into_response());
@@ -149,7 +147,7 @@ async fn login_link(
 
     // Otherwise we're handling a login link. Valdiate the login token and create a new session.
     let Some(user) = User::lookup_by_login_token(&state.db, token).await? else {
-        return Err(AppError::Unauthorized);
+        bail_unauthorized!();
     };
     let token = SessionToken::create(&state.db, &user).await?;
     let cookie = session_cookie(&state.config, token);

src/app/contact.rs

@@ -9,9 +9,7 @@ pub fn add_routes(router: AppRouter) -> AppRouter {
     router.public_routes(|r| r.route("/contact", get(contact_page).post(contact_form)))
 }
 
-async fn contact_page(
-    user: Option<User>, State(state): State<SharedAppState>,
-) -> AppResult<impl IntoResponse> {
+async fn contact_page(user: Option<User>, State(state): State<SharedAppState>) -> HtmlResult {
     #[derive(Template, WebTemplate)]
     #[template(path = "contact/send.html")]
     struct Html {
@@ -21,7 +19,8 @@ async fn contact_page(
     Ok(Html {
         user,
         turnstile_site_key: state.config.cloudflare.turnstile_site_key.clone(),
-    })
+    }
+    .into_response())
 }
 
 #[derive(serde::Deserialize, Debug)]
@@ -36,9 +35,9 @@ struct ContactForm {
 async fn contact_form(
     user: Option<User>, State(state): State<SharedAppState>, ConnectInfo(client): ConnectInfo<SocketAddr>,
     Form(form): Form<ContactForm>,
-) -> AppResult<impl IntoResponse> {
+) -> HtmlResult {
     if !state.cloudflare.validate_turnstile(client.ip(), &form.turnstile_token).await? {
-        return Err(AppError::BadRequest);
+        bail_invalid!();
     }
 
     let name = Some(form.name).filter(|n| !n.is_empty());
@@ -51,7 +50,7 @@ async fn contact_form(
         None => format!("[Anonymous]: {}", form.subject),
     };
     let reply_to = match email {
-        Some(e) => Some(Mailbox::new(name, e.parse().map_err(|_| AppError::BadRequest)?)),
+        Some(e) => Some(Mailbox::new(name, e.parse().map_err(|_| invalid())?)),
         None => None,
     };
 
@@ -68,5 +67,5 @@ async fn contact_form(
     struct Html {
         user: Option<User>,
     };
-    Ok(Html { user })
+    Ok(Html { user }.into_response())
 }