Mirrors/continuwuity
1
0
Fork 0
mirror of https://forgejo.ellis.link/continuwuation/continuwuity.git synced 2026-05-26 20:49:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: Update policy server implementation to be closer to latest spec

Browse Source 
Untested

chore: Add news fragment

feat: Support stable policy servers

feat: Don't attempt erroneous loopback federation for policy server checks

refactor: Update PS upgrade to use new ruma

fix: Only check loopback via after attempting incoming verification
This commit is contained in:
timedout
2026-03-04 05:36:19 +00:00
parent c1a6e649da
commit 47051af392
7 changed files with 341 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/error/mod.rs
+16 -4
View File
@@ -6,7 +6,10 @@ mod serde;
use std::{any::Any, borrow::Cow, convert::Infallible, error::Error as _, sync::PoisonError};
use ruma::api::error::{ErrorKind, RetryAfter::Delay};
pub use self::{err::visit, log::*};
use crate::Error::BadRequest;
#[derive(thiserror::Error)]
pub enum Error {
@@ -89,7 +92,7 @@ pub enum Error {
#[error("Arithmetic operation failed: {0}")]
Arithmetic(Cow<'static, str>),
#[error("{0:?}: {1}")]
BadRequest(ruma::api::error::ErrorKind, &'static str), //TODO: remove
BadRequest(ErrorKind, &'static str), //TODO: remove
#[error("{0}")]
BadServerResponse(Cow<'static, str>),
#[error(transparent)]
@@ -117,7 +120,7 @@ pub enum Error {
#[error("from {0}: {1}")]
Redaction(ruma::OwnedServerName, ruma::canonical_json::RedactionError),
#[error("{0:?}: {1}")]
Request(ruma::api::error::ErrorKind, Cow<'static, str>, http::StatusCode),
Request(ErrorKind, Cow<'static, str>, http::StatusCode),
#[error(transparent)]
Ruma(#[from] ruma::api::error::Error),
#[error(transparent)]
@@ -164,13 +167,13 @@ impl Error {
/// Returns the Matrix error code / error kind
#[inline]
pub fn kind(&self) -> ruma::api::error::ErrorKind {
pub fn kind(&self) -> ErrorKind {
use ruma::api::error::ErrorKind::{Unknown, Unrecognized};
match self {
| Self::Federation(_, error) | Self::Ruma(error) =>
response::ruma_error_kind(error).clone(),
| Self::BadRequest(kind, ..) | Self::Request(kind, ..) => kind.clone(),
| BadRequest(kind, ..) | Self::Request(kind, ..) => kind.clone(),
| Self::FeatureDisabled(..) => Unrecognized,
| _ => Unknown,
}
@@ -200,6 +203,15 @@ impl Error {
/// Result where Ok(None) is instead Err(e) if e.is_not_found().
#[inline]
pub fn is_not_found(&self) -> bool { self.status_code() == http::StatusCode::NOT_FOUND }
pub fn retry_after(&self) -> Option<std::time::Duration> {
if let BadRequest(ErrorKind::LimitExceeded(limit_data), ..) = self {
if let Some(Delay(after)) = limit_data.retry_after {
return Some(after);
}
}
None
}
}
impl std::fmt::Debug for Error {