Redirect to frontend if actor or object is requested using web browser

This commit is contained in:
silverpill 2021-11-13 23:56:15 +00:00
parent cc252d1349
commit 6d0505e93f
3 changed files with 42 additions and 0 deletions

View file

@ -8,6 +8,7 @@ use uuid::Uuid;
use crate::config::Config; use crate::config::Config;
use crate::database::{Pool, get_database_client}; use crate::database::{Pool, get_database_client};
use crate::errors::HttpError; use crate::errors::HttpError;
use crate::frontend::{get_post_page_url, get_profile_page_url};
use crate::http_signatures::verify::verify_http_signature; use crate::http_signatures::verify::verify_http_signature;
use crate::models::posts::queries::get_thread; use crate::models::posts::queries::get_thread;
use crate::models::users::queries::get_user_by_name; use crate::models::users::queries::get_user_by_name;
@ -40,14 +41,35 @@ pub fn get_object_url(instance_url: &str, object_uuid: &Uuid) -> String {
format!("{}/objects/{}", instance_url, object_uuid) format!("{}/objects/{}", instance_url, object_uuid)
} }
fn is_activitypub_request(request: &HttpRequest) -> bool {
const CONTENT_TYPES: [&str; 3] = [
ACTIVITY_CONTENT_TYPE,
"application/ld+json",
"application/json",
];
if let Some(content_type) = request.headers().get("Accept") {
let content_type_str = content_type.to_str().unwrap_or("");
return CONTENT_TYPES.contains(&content_type_str);
};
false
}
#[get("")] #[get("")]
async fn get_actor( async fn get_actor(
config: web::Data<Config>, config: web::Data<Config>,
db_pool: web::Data<Pool>, db_pool: web::Data<Pool>,
request: HttpRequest,
web::Path(username): web::Path<String>, web::Path(username): web::Path<String>,
) -> Result<HttpResponse, HttpError> { ) -> Result<HttpResponse, HttpError> {
let db_client = &**get_database_client(&db_pool).await?; let db_client = &**get_database_client(&db_pool).await?;
let user = get_user_by_name(db_client, &username).await?; let user = get_user_by_name(db_client, &username).await?;
if !is_activitypub_request(&request) {
let page_url = get_profile_page_url(&user.id, &config.instance_url());
let response = HttpResponse::Found()
.header("Location", page_url)
.finish();
return Ok(response);
};
let actor = get_local_actor(&user, &config.instance_url()) let actor = get_local_actor(&user, &config.instance_url())
.map_err(|_| HttpError::InternalError)?; .map_err(|_| HttpError::InternalError)?;
let response = HttpResponse::Ok() let response = HttpResponse::Ok()
@ -125,6 +147,7 @@ pub fn activitypub_scope() -> Scope {
pub async fn get_object( pub async fn get_object(
config: web::Data<Config>, config: web::Data<Config>,
db_pool: web::Data<Pool>, db_pool: web::Data<Pool>,
request: HttpRequest,
web::Path(object_id): web::Path<Uuid>, web::Path(object_id): web::Path<Uuid>,
) -> Result<HttpResponse, HttpError> { ) -> Result<HttpResponse, HttpError> {
let db_client = &**get_database_client(&db_pool).await?; let db_client = &**get_database_client(&db_pool).await?;
@ -133,6 +156,13 @@ pub async fn get_object(
let post = thread.iter() let post = thread.iter()
.find(|post| post.id == object_id && post.author.is_local()) .find(|post| post.id == object_id && post.author.is_local())
.ok_or(HttpError::NotFoundError("post"))?; .ok_or(HttpError::NotFoundError("post"))?;
if !is_activitypub_request(&request) {
let page_url = get_post_page_url(&post.id, &config.instance_url());
let response = HttpResponse::Found()
.header("Location", page_url)
.finish();
return Ok(response);
};
let in_reply_to = match post.in_reply_to_id { let in_reply_to = match post.in_reply_to_id {
Some(in_reply_to_id) => { Some(in_reply_to_id) => {
thread.iter().find(|post| post.id == in_reply_to_id) thread.iter().find(|post| post.id == in_reply_to_id)

11
src/frontend.rs Normal file
View file

@ -0,0 +1,11 @@
/// URL builders for default frontend
use uuid::Uuid;
// Assuming frontend is on the same host as backend
pub fn get_profile_page_url(profile_id: &Uuid, instance_url: &str) -> String {
format!("{}/profile/{}", instance_url, profile_id)
}
pub fn get_post_page_url(post_id: &Uuid, instance_url: &str) -> String {
format!("{}/post/{}", instance_url, post_id)
}

View file

@ -3,6 +3,7 @@ pub mod config;
pub mod database; pub mod database;
mod errors; mod errors;
pub mod ethereum; pub mod ethereum;
mod frontend;
mod http_signatures; mod http_signatures;
mod ipfs; mod ipfs;
pub mod logger; pub mod logger;