Remove federation functionality and related tests
- Deleted the `federation.rs` module and its associated functionality for federating thoughts to followers. - Removed the `well_known.rs` module and its WebFinger discovery functionality. - Eliminated references to federation in the `thought.rs` router and removed the spawning of background tasks for federating thoughts. - Deleted tests related to WebFinger and user inbox interactions in `activitypub.rs`. - Updated `Cargo.toml` to remove the `activitypub_federation` dependency.
This commit is contained in:
698
thoughts-backend/Cargo.lock
generated
698
thoughts-backend/Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
@@ -38,6 +38,5 @@ tower-http = { version = "0.6.6", features = ["fs", "cors"] }
|
|||||||
tower-cookies = "0.11.0"
|
tower-cookies = "0.11.0"
|
||||||
anyhow = "1.0.98"
|
anyhow = "1.0.98"
|
||||||
dotenvy = "0.15.7"
|
dotenvy = "0.15.7"
|
||||||
activitypub_federation = "0.6.5"
|
|
||||||
url = "2.5.7"
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
|
@@ -1,70 +0,0 @@
|
|||||||
use app::{
|
|
||||||
persistence::{follow, user},
|
|
||||||
state::AppState,
|
|
||||||
};
|
|
||||||
use models::domains::thought;
|
|
||||||
use serde_json::json;
|
|
||||||
|
|
||||||
// This function handles pushing a new thought to all followers.
|
|
||||||
pub async fn federate_thought(
|
|
||||||
state: AppState,
|
|
||||||
thought: thought::Model,
|
|
||||||
author: models::domains::user::Model,
|
|
||||||
) {
|
|
||||||
// Find all followers of the author
|
|
||||||
let follower_ids = match follow::get_follower_ids(&state.conn, author.id).await {
|
|
||||||
Ok(ids) => ids,
|
|
||||||
Err(e) => {
|
|
||||||
tracing::error!("Failed to get followers for federation: {}", e);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
if follower_ids.is_empty() {
|
|
||||||
println!("No followers to federate to for user {}", author.username);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
let thought_url = format!("{}/thoughts/{}", &state.base_url, thought.id);
|
|
||||||
let author_url = format!("{}/users/{}", &state.base_url, author.username);
|
|
||||||
|
|
||||||
// Construct the "Create" activity containing the "Note" object
|
|
||||||
let activity = json!({
|
|
||||||
"@context": "https://www.w3.org/ns/activitystreams",
|
|
||||||
"id": format!("{}/activity", thought_url),
|
|
||||||
"type": "Create",
|
|
||||||
"actor": author_url,
|
|
||||||
"object": {
|
|
||||||
"id": thought_url,
|
|
||||||
"type": "Note",
|
|
||||||
"attributedTo": author_url,
|
|
||||||
"content": thought.content,
|
|
||||||
"published": thought.created_at.to_rfc3339(),
|
|
||||||
"to": ["https://www.w3.org/ns/activitystreams#Public"],
|
|
||||||
"cc": [format!("{}/followers", author_url)]
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
// Get the inbox URLs for all followers
|
|
||||||
// In a real federated app, you would store remote users' full inbox URLs.
|
|
||||||
// For now, we assume followers are local and construct their inbox URLs.
|
|
||||||
let followers = match user::get_users_by_ids(&state.conn, follower_ids).await {
|
|
||||||
Ok(users) => users,
|
|
||||||
Err(e) => {
|
|
||||||
tracing::error!("Failed to get follower user objects: {}", e);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
let client = reqwest::Client::new();
|
|
||||||
for follower in followers {
|
|
||||||
let inbox_url = format!("{}/users/{}/inbox", &state.base_url, follower.username);
|
|
||||||
tracing::info!("Federating post {} to {}", thought.id, inbox_url);
|
|
||||||
|
|
||||||
let res = client.post(&inbox_url).json(&activity).send().await;
|
|
||||||
|
|
||||||
if let Err(e) = res {
|
|
||||||
tracing::error!("Failed to federate to {}: {}", inbox_url, e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
@@ -1,6 +1,5 @@
|
|||||||
mod error;
|
mod error;
|
||||||
mod extractor;
|
mod extractor;
|
||||||
mod federation;
|
|
||||||
mod init;
|
mod init;
|
||||||
mod validation;
|
mod validation;
|
||||||
|
|
||||||
|
@@ -9,9 +9,8 @@ pub mod search;
|
|||||||
pub mod tag;
|
pub mod tag;
|
||||||
pub mod thought;
|
pub mod thought;
|
||||||
pub mod user;
|
pub mod user;
|
||||||
pub mod well_known;
|
|
||||||
|
|
||||||
use crate::routers::{auth::create_auth_router, well_known::create_well_known_router};
|
use crate::routers::auth::create_auth_router;
|
||||||
use app::state::AppState;
|
use app::state::AppState;
|
||||||
use root::create_root_router;
|
use root::create_root_router;
|
||||||
use tower_http::cors::CorsLayer;
|
use tower_http::cors::CorsLayer;
|
||||||
@@ -24,7 +23,6 @@ pub fn create_router(state: AppState) -> Router {
|
|||||||
|
|
||||||
Router::new()
|
Router::new()
|
||||||
.merge(create_root_router())
|
.merge(create_root_router())
|
||||||
.nest("/.well-known", create_well_known_router())
|
|
||||||
.nest("/auth", create_auth_router())
|
.nest("/auth", create_auth_router())
|
||||||
.nest("/users", create_user_router())
|
.nest("/users", create_user_router())
|
||||||
.nest("/thoughts", create_thought_router())
|
.nest("/thoughts", create_thought_router())
|
||||||
|
@@ -20,7 +20,6 @@ use sea_orm::prelude::Uuid;
|
|||||||
use crate::{
|
use crate::{
|
||||||
error::ApiError,
|
error::ApiError,
|
||||||
extractor::{AuthUser, Json, OptionalAuthUser, Valid},
|
extractor::{AuthUser, Json, OptionalAuthUser, Valid},
|
||||||
federation,
|
|
||||||
models::{ApiErrorResponse, ParamsErrorResponse},
|
models::{ApiErrorResponse, ParamsErrorResponse},
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -77,13 +76,6 @@ async fn thoughts_post(
|
|||||||
.await?
|
.await?
|
||||||
.ok_or(UserError::NotFound)?; // Should not happen if auth is valid
|
.ok_or(UserError::NotFound)?; // Should not happen if auth is valid
|
||||||
|
|
||||||
// Spawn a background task to handle federation without blocking the response
|
|
||||||
tokio::spawn(federation::federate_thought(
|
|
||||||
state.clone(),
|
|
||||||
thought.clone(),
|
|
||||||
author.clone(),
|
|
||||||
));
|
|
||||||
|
|
||||||
let schema = ThoughtSchema::from_models(&thought, &author);
|
let schema = ThoughtSchema::from_models(&thought, &author);
|
||||||
Ok((StatusCode::CREATED, Json(schema)))
|
Ok((StatusCode::CREATED, Json(schema)))
|
||||||
}
|
}
|
||||||
|
@@ -1,70 +0,0 @@
|
|||||||
use app::state::AppState;
|
|
||||||
use axum::{
|
|
||||||
extract::{Query, State},
|
|
||||||
response::{IntoResponse, Json},
|
|
||||||
};
|
|
||||||
use serde::{Deserialize, Serialize};
|
|
||||||
use url::Url;
|
|
||||||
|
|
||||||
#[derive(Deserialize)]
|
|
||||||
pub struct WebFingerQuery {
|
|
||||||
resource: String,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Serialize)]
|
|
||||||
pub struct WebFingerLink {
|
|
||||||
rel: String,
|
|
||||||
#[serde(rename = "type")]
|
|
||||||
type_: String,
|
|
||||||
href: Url,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Serialize)]
|
|
||||||
pub struct WebFingerResponse {
|
|
||||||
subject: String,
|
|
||||||
links: Vec<WebFingerLink>,
|
|
||||||
}
|
|
||||||
|
|
||||||
pub async fn webfinger(
|
|
||||||
State(state): State<AppState>,
|
|
||||||
Query(query): Query<WebFingerQuery>,
|
|
||||||
) -> Result<impl IntoResponse, impl IntoResponse> {
|
|
||||||
if let Some((scheme, account_info)) = query.resource.split_once(':') {
|
|
||||||
if scheme != "acct" {
|
|
||||||
return Err((
|
|
||||||
axum::http::StatusCode::BAD_REQUEST,
|
|
||||||
"Invalid resource scheme",
|
|
||||||
));
|
|
||||||
}
|
|
||||||
|
|
||||||
let account_parts: Vec<&str> = account_info.split('@').collect();
|
|
||||||
let username = account_parts[0];
|
|
||||||
|
|
||||||
let user = match app::persistence::user::get_user_by_username(&state.conn, username).await {
|
|
||||||
Ok(Some(user)) => user,
|
|
||||||
_ => return Err((axum::http::StatusCode::NOT_FOUND, "User not found")),
|
|
||||||
};
|
|
||||||
|
|
||||||
let user_url = Url::parse(&format!("{}/users/{}", &state.base_url, user.username)).unwrap();
|
|
||||||
|
|
||||||
let response = WebFingerResponse {
|
|
||||||
subject: query.resource,
|
|
||||||
links: vec![WebFingerLink {
|
|
||||||
rel: "self".to_string(),
|
|
||||||
type_: "application/activity+json".to_string(),
|
|
||||||
href: user_url,
|
|
||||||
}],
|
|
||||||
};
|
|
||||||
|
|
||||||
Ok(Json(response))
|
|
||||||
} else {
|
|
||||||
Err((
|
|
||||||
axum::http::StatusCode::BAD_REQUEST,
|
|
||||||
"Invalid resource format",
|
|
||||||
))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn create_well_known_router() -> axum::Router<AppState> {
|
|
||||||
axum::Router::new().route("/webfinger", axum::routing::get(webfinger))
|
|
||||||
}
|
|
@@ -1,151 +0,0 @@
|
|||||||
use crate::api::main::{create_user_with_password, setup};
|
|
||||||
use axum::http::{header, StatusCode};
|
|
||||||
use http_body_util::BodyExt;
|
|
||||||
use serde_json::{json, Value};
|
|
||||||
use utils::testing::{
|
|
||||||
make_get_request, make_jwt_request, make_post_request, make_request_with_headers,
|
|
||||||
};
|
|
||||||
|
|
||||||
#[tokio::test]
|
|
||||||
async fn test_webfinger_discovery() {
|
|
||||||
let app = setup().await;
|
|
||||||
create_user_with_password(&app.db, "testuser", "password123", "testuser@example.com").await;
|
|
||||||
|
|
||||||
// 1. Valid WebFinger lookup for existing user
|
|
||||||
let url = "/.well-known/webfinger?resource=acct:testuser@localhost:3000";
|
|
||||||
let response = make_get_request(app.router.clone(), url, None).await;
|
|
||||||
assert_eq!(response.status(), StatusCode::OK);
|
|
||||||
let body = response.into_body().collect().await.unwrap().to_bytes();
|
|
||||||
let v: Value = serde_json::from_slice(&body).unwrap();
|
|
||||||
assert_eq!(v["subject"], "acct:testuser@localhost:3000");
|
|
||||||
assert_eq!(
|
|
||||||
v["links"][0]["href"],
|
|
||||||
"http://localhost:3000/users/testuser"
|
|
||||||
);
|
|
||||||
|
|
||||||
// 2. WebFinger lookup for a non-existent user
|
|
||||||
let response = make_get_request(
|
|
||||||
app.router.clone(),
|
|
||||||
"/.well-known/webfinger?resource=acct:nobody@localhost:3000",
|
|
||||||
None,
|
|
||||||
)
|
|
||||||
.await;
|
|
||||||
assert_eq!(response.status(), StatusCode::NOT_FOUND);
|
|
||||||
}
|
|
||||||
|
|
||||||
#[tokio::test]
|
|
||||||
async fn test_user_actor_endpoint() {
|
|
||||||
let app = setup().await;
|
|
||||||
create_user_with_password(&app.db, "testuser", "password123", "testuser@example.com").await;
|
|
||||||
|
|
||||||
let response = make_request_with_headers(
|
|
||||||
app.router.clone(),
|
|
||||||
"/users/testuser",
|
|
||||||
"GET",
|
|
||||||
None,
|
|
||||||
vec![(
|
|
||||||
header::ACCEPT,
|
|
||||||
"application/activity+json, application/ld+json; profile=\"https://www.w3.org/ns/activitystreams\"",
|
|
||||||
)],
|
|
||||||
).await;
|
|
||||||
|
|
||||||
assert_eq!(response.status(), StatusCode::OK);
|
|
||||||
let content_type = response.headers().get(header::CONTENT_TYPE).unwrap();
|
|
||||||
assert_eq!(content_type, "application/activity+json");
|
|
||||||
|
|
||||||
let body = response.into_body().collect().await.unwrap().to_bytes();
|
|
||||||
let v: Value = serde_json::from_slice(&body).unwrap();
|
|
||||||
assert_eq!(v["type"], "Person");
|
|
||||||
assert_eq!(v["preferredUsername"], "testuser");
|
|
||||||
assert_eq!(v["id"], "http://localhost:3000/users/testuser");
|
|
||||||
}
|
|
||||||
|
|
||||||
#[tokio::test]
|
|
||||||
async fn test_user_inbox_follow() {
|
|
||||||
let app = setup().await;
|
|
||||||
// user1 will be followed
|
|
||||||
let user1 =
|
|
||||||
create_user_with_password(&app.db, "user1", "password123", "user1@example.com").await;
|
|
||||||
// user2 will be the follower
|
|
||||||
let user2 =
|
|
||||||
create_user_with_password(&app.db, "user2", "password123", "user2@example.com").await;
|
|
||||||
|
|
||||||
// Construct a follow activity from user2, targeting user1
|
|
||||||
let follow_activity = json!({
|
|
||||||
"@context": "https://www.w3.org/ns/activitystreams",
|
|
||||||
"id": "http://localhost:3000/some-unique-id",
|
|
||||||
"type": "Follow",
|
|
||||||
"actor": "http://localhost:3000/users/user2", // The actor is user2
|
|
||||||
"object": "http://localhost:3000/users/user1"
|
|
||||||
})
|
|
||||||
.to_string();
|
|
||||||
|
|
||||||
// POST the activity to user1's inbox
|
|
||||||
let response = make_post_request(
|
|
||||||
app.router.clone(),
|
|
||||||
"/users/user1/inbox",
|
|
||||||
follow_activity,
|
|
||||||
None,
|
|
||||||
)
|
|
||||||
.await;
|
|
||||||
|
|
||||||
assert_eq!(response.status(), StatusCode::ACCEPTED);
|
|
||||||
|
|
||||||
// Verify that user2 is now following user1 in the database
|
|
||||||
let followers = app::persistence::follow::get_following_ids(&app.db, user2.id)
|
|
||||||
.await
|
|
||||||
.unwrap();
|
|
||||||
assert!(
|
|
||||||
followers.contains(&user1.id),
|
|
||||||
"User2 should be following user1"
|
|
||||||
);
|
|
||||||
|
|
||||||
let following = app::persistence::follow::get_following_ids(&app.db, user1.id)
|
|
||||||
.await
|
|
||||||
.unwrap();
|
|
||||||
assert!(
|
|
||||||
!following.contains(&user2.id),
|
|
||||||
"User1 should now be followed by user2"
|
|
||||||
);
|
|
||||||
assert!(following.is_empty(), "User1 should not be following anyone");
|
|
||||||
}
|
|
||||||
|
|
||||||
#[tokio::test]
|
|
||||||
async fn test_user_outbox_get() {
|
|
||||||
let app = setup().await;
|
|
||||||
create_user_with_password(&app.db, "testuser", "password123", "testuser@example.com").await;
|
|
||||||
let token = super::main::login_user(app.router.clone(), "testuser", "password123").await;
|
|
||||||
|
|
||||||
// Create a thought first
|
|
||||||
let thought_body = json!({ "content": "This is a federated thought!" }).to_string();
|
|
||||||
make_jwt_request(
|
|
||||||
app.router.clone(),
|
|
||||||
"/thoughts",
|
|
||||||
"POST",
|
|
||||||
Some(thought_body),
|
|
||||||
&token,
|
|
||||||
)
|
|
||||||
.await;
|
|
||||||
|
|
||||||
// Now, fetch the outbox
|
|
||||||
let response = make_request_with_headers(
|
|
||||||
app.router.clone(),
|
|
||||||
"/users/testuser/outbox",
|
|
||||||
"GET",
|
|
||||||
None,
|
|
||||||
vec![(header::ACCEPT, "application/activity+json")],
|
|
||||||
)
|
|
||||||
.await;
|
|
||||||
|
|
||||||
assert_eq!(response.status(), StatusCode::OK);
|
|
||||||
let body = response.into_body().collect().await.unwrap().to_bytes();
|
|
||||||
let v: Value = serde_json::from_slice(&body).unwrap();
|
|
||||||
|
|
||||||
assert_eq!(v["type"], "OrderedCollection");
|
|
||||||
assert_eq!(v["totalItems"], 1);
|
|
||||||
assert_eq!(v["orderedItems"][0]["type"], "Create");
|
|
||||||
assert_eq!(
|
|
||||||
v["orderedItems"][0]["object"]["content"],
|
|
||||||
"This is a federated thought!"
|
|
||||||
);
|
|
||||||
}
|
|
@@ -1,4 +1,3 @@
|
|||||||
mod activitypub;
|
|
||||||
mod api_key;
|
mod api_key;
|
||||||
mod auth;
|
mod auth;
|
||||||
mod feed;
|
mod feed;
|
||||||
|
Reference in New Issue
Block a user