malice

public

Star0

Fork 0

Watch0

33 commits 2 branches 0 tags 0 releases4.4 MiB

Commit `35a820422568`

tarball

atagen <boss@atagen.co>2026-10-24 10:27 UTC

6 files changed+88-19

core: match macltok enums without wildcards

A new macltok variant is now a compile error here, not a silent Upstream or no-op. Spelling out the arms exposed that restore_error sent network, server and rate-limit failures to RestoreError::Stale, which removes the session with Retain::Nothing, so a homeserver blip during restore wiped the login and its crypto store. Those now report Unavailable. RecoveryRejected maps to BadRequest, InteractiveAuthRequired to Forbidden, and VerificationUnsupported and NoCrossSigningIdentity to Conflict, none of which were upstream faults.

Modified file: crates/malice-core/src/error.rs+12 additions−2 deletions@@ -60,8 +60,18 @@ impl From<macltok::Error> for CoreError {
             ErrorKind::Invalid | ErrorKind::EmptyBody => Failure::BadRequest,
             ErrorKind::RoomNotOpen
             | ErrorKind::TimelineNotOpen
-            | ErrorKind::VerificationInactive => Failure::Conflict,
-            _ => Failure::Upstream,
+            | ErrorKind::VerificationInactive
+            | ErrorKind::VerificationUnsupported
+            | ErrorKind::NoCrossSigningIdentity => Failure::Conflict,
+            ErrorKind::RecoveryRejected => Failure::BadRequest,
+            ErrorKind::InteractiveAuthRequired => Failure::Forbidden,
+            ErrorKind::Unauthenticated
+            | ErrorKind::Network
+            | ErrorKind::Server
+            | ErrorKind::Store
+            | ErrorKind::Timeline
+            | ErrorKind::Encryption
+            | ErrorKind::Other => Failure::Upstream,
         };
         Self::new(kind, error.message)
     }

Modified file: crates/malice-core/src/feed.rs+11 additions−7 deletions@@ -89,7 +89,7 @@ pub fn snapshot_event(state: &State) -> WireEvent {
             TimelineId::Room(room_id) => {
                 Some((room_id.as_str().to_owned(), timeline.items.clone()))
             }
-            _ => None,
+            TimelineId::Thread { .. } | TimelineId::Pinned(_) => None,
         })
         .collect();
     let pinned = state
@@ -99,7 +99,7 @@ pub fn snapshot_event(state: &State) -> WireEvent {
             TimelineId::Pinned(room_id) => {
                 Some((room_id.as_str().to_owned(), timeline.items.clone()))
             }
-            _ => None,
+            TimelineId::Room(_) | TimelineId::Thread { .. } => None,
         })
         .collect();
     WireEvent::Snapshot {
@@ -146,7 +146,7 @@ pub fn wire_events(change: &StateChange) -> Vec<WireEvent> {
             TimelineChange::Closed => vec![WireEvent::TimelineClosed {
                 room_id: room_id.as_str().to_owned(),
             }],
-            _ => vec![],
+            TimelineChange::Diverged => vec![],
         },
         StateChange::Timeline {
             timeline_id: TimelineId::Pinned(room_id),
@@ -161,7 +161,7 @@ pub fn wire_events(change: &StateChange) -> Vec<WireEvent> {
             TimelineChange::Closed => vec![WireEvent::PinnedClosed {
                 room_id: room_id.as_str().to_owned(),
             }],
-            _ => vec![],
+            TimelineChange::Diverged => vec![],
         },
         StateChange::Timeline { .. } => vec![],
         StateChange::Connection(state) => vec![WireEvent::Connection {
@@ -192,13 +192,18 @@ pub fn wire_events(change: &StateChange) -> Vec<WireEvent> {
             UploadOutcome::Cancelled => vec![error("upload cancelled")],
             UploadOutcome::RoomForgotten => vec![error("upload cancelled, room forgotten")],
             UploadOutcome::Missed => vec![error("upload status unknown")],
-            _ => vec![error("upload did not complete")],
         },
         StateChange::Upload { upload, .. } => match &upload.failure {
             Some(failure) if !failure.will_retry => vec![error("upload failed")],
             _ => vec![],
         },
-        _ => vec![],
+        StateChange::Authenticated(_)
+        | StateChange::Session(_)
+        | StateChange::SessionSaved
+        | StateChange::VerificationTarget(_)
+        | StateChange::NotificationSettings
+        | StateChange::History { .. }
+        | StateChange::Typing(_) => vec![],
     }
 }
 
@@ -216,7 +221,6 @@ pub fn connection_label(state: &ConnectionState) -> String {
         ConnectionState::Online => "online",
         ConnectionState::Offline => "offline",
         ConnectionState::Stopped => "stopped",
-        _ => "unknown",
     }
     .to_owned()
 }

Modified file: crates/malice-core/src/login.rs+10 additions−2 deletions@@ -34,8 +34,16 @@ pub fn login_error(error: &AccountError, password: &str) -> CoreError {
     let (kind, message) = match error {
         AccountError::InvalidHomeserver(_) => (Failure::BadRequest, error.to_string()),
         AccountError::AlreadyLoggedIn(_) => (Failure::Conflict, error.to_string()),
-        AccountError::StoreInUse => (Failure::Busy, error.to_string()),
-        error => match error.server() {
+        AccountError::StoreInUse | AccountError::StoreDeletePending => {
+            (Failure::Busy, error.to_string())
+        }
+        error @ (AccountError::Operation { .. }
+        | AccountError::MissingSession
+        | AccountError::UnsupportedAuthentication
+        | AccountError::OAuthCallbackAlreadySubmitted
+        | AccountError::NoPendingOAuth
+        | AccountError::Unsaved { .. }
+        | AccountError::Engine(_)) => match error.server() {
             Some(server) if matches!(server.status, 401 | 403) => {
                 (Failure::Unauthorized, server.message.clone())
             }

Modified file: crates/malice-server/src/state.rs+35 additions−5 deletions@@ -7,9 +7,9 @@ use std::{
 
 use futures_util::StreamExt;
 use macltok::{
-    AccountError, ClientHandle, EncryptedSessionStore, EngineConfig, EngineError, Mirror,
-    MirrorHandle, PasswordLogin, Restore, Retain, Session, SessionStatus, SessionStore, SoftLogout,
-    StateChange, StoreConfig, Termination,
+    AccountError, ClientHandle, EncryptedSessionStore, EngineConfig, EngineError, ErrorKind,
+    Mirror, MirrorHandle, PasswordLogin, Restore, Retain, Session, SessionStatus, SessionStore,
+    SoftLogout, StateChange, StoreConfig, Termination,
 };
 use rand_core::{OsRng, RngCore};
 use sha2::{Digest, Sha256};
@@ -340,7 +340,22 @@ fn restore_error(error: AccountError) -> RestoreError {
         AccountError::StoreInUse => {
             RestoreError::Unavailable("another connection is using this session".to_owned())
         }
-        error => RestoreError::Stale(format!("restoring persisted session failed: {error}")),
+        AccountError::Operation {
+            kind: ErrorKind::Network | ErrorKind::Server | ErrorKind::RateLimited,
+            ..
+        } => RestoreError::Unavailable(format!("restoring persisted session failed: {error}")),
+        error @ (AccountError::Operation { .. }
+        | AccountError::MissingSession
+        | AccountError::UnsupportedAuthentication
+        | AccountError::OAuthCallbackAlreadySubmitted
+        | AccountError::NoPendingOAuth
+        | AccountError::InvalidHomeserver(_)
+        | AccountError::AlreadyLoggedIn(_)
+        | AccountError::StoreDeletePending
+        | AccountError::Unsaved { .. }
+        | AccountError::Engine(_)) => {
+            RestoreError::Stale(format!("restoring persisted session failed: {error}"))
+        }
     }
 }
 
@@ -382,7 +397,22 @@ async fn wait_authenticated(mirror: &MirrorHandle) -> Option<String> {
                 }
                 StateChange::Authenticated(user_id) => return Some(user_id.to_string()),
                 StateChange::Session(status) if status != SessionStatus::Active => return None,
-                _ => {}
+                StateChange::Session(_)
+                | StateChange::SessionSaveFailed(_)
+                | StateChange::SessionSaved
+                | StateChange::Connection(_)
+                | StateChange::Encryption(_)
+                | StateChange::Verification(_)
+                | StateChange::VerificationTarget(_)
+                | StateChange::NotificationSettings
+                | StateChange::Rooms(_)
+                | StateChange::ImagePacks(_)
+                | StateChange::Timeline { .. }
+                | StateChange::History { .. }
+                | StateChange::Typing(_)
+                | StateChange::Upload { .. }
+                | StateChange::UploadFinished { .. }
+                | StateChange::Failed(_) => {}
             }
         }
     })

Modified file: crates/malice-worker/src/account.rs+16 additions−1 deletions@@ -98,7 +98,22 @@ async fn wait_authenticated(mirror: &MirrorHandle) -> Option<String> {
             }
             StateChange::Authenticated(user_id) => return Some(user_id.to_string()),
             StateChange::Session(status) if status != SessionStatus::Active => return None,
-            _ => {}
+            StateChange::Session(_)
+            | StateChange::SessionSaveFailed(_)
+            | StateChange::SessionSaved
+            | StateChange::Connection(_)
+            | StateChange::Encryption(_)
+            | StateChange::Verification(_)
+            | StateChange::VerificationTarget(_)
+            | StateChange::NotificationSettings
+            | StateChange::Rooms(_)
+            | StateChange::ImagePacks(_)
+            | StateChange::Timeline { .. }
+            | StateChange::History { .. }
+            | StateChange::Typing(_)
+            | StateChange::Upload { .. }
+            | StateChange::UploadFinished { .. }
+            | StateChange::Failed(_) => {}
         }
     }
 }

Modified file: crates/malice-worker/src/lib.rs+4 additions−2 deletions@@ -79,7 +79,9 @@ impl Host {
             StoreConfig::indexeddb(store_name(&account), passphrase),
         ));
         match Session::restore(sessions.clone()).await {
-            Ok(None | Some(Restore::OAuthPending)) => Ok(to_js_value(&serde_json::json!({ "status": "none" }))),
+            Ok(None | Some(Restore::OAuthPending)) => {
+                Ok(to_js_value(&serde_json::json!({ "status": "none" })))
+            }
             Ok(Some(Restore::SoftLoggedOut(soft))) => Ok(to_js_value(&serde_json::json!({
                 "status": "soft_logged_out",
                 "user_id": soft.user_id.to_string(),
@@ -218,7 +220,7 @@ impl Host {
             .map_err(|error| core_error_value(CoreError::from(error)))?;
         let token = match &location {
             MediaLocation::Local => None,
-            _ => handle.access_token(),
+            MediaLocation::File(_) | MediaLocation::ServerThumbnail { .. } => handle.access_token(),
         };
         let location = serde_json::to_value(&location)
             .map_err(|error| error_value("upstream", error.to_string()))?;

malice

Commit 35a820422568

Commit `35a820422568`