alemi/upub
alemi/upub
1
0
Fork 1
Code Issues 4 Pull requests Projects Releases Packages 1 Wiki Activity Actions

chore: simplified cloak proxy route

Browse source
This commit is contained in:
əlemi 2024-07-15 03:05:27 +02:00
parent e5748860e7
commit b9b49df009
Signed by: alemi
GPG key ID: A4895B84D311642C
2 changed files with 5 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
upub/routes/src/activitypub/application.rs
View file

@ -1,9 +1,7 @@
use apb::{LD, ActorMut, BaseMut, ObjectMut, PublicKeyMut}; use apb::{LD, ActorMut, BaseMut, ObjectMut, PublicKeyMut};
use axum::{extract::{Path, Query, State}, http::HeaderMap, response::{IntoResponse, Redirect, Response}, Form}; use axum::{extract::{Path, Query, State}, http::HeaderMap, response::{IntoResponse, Redirect, Response}, Form};
use hmac::{Hmac, Mac};
use reqwest::Method; use reqwest::Method;
use base64::{engine::general_purpose::URL_SAFE, Engine as _}; use upub::{traits::{Cloaker, Fetcher}, Context};
use upub::{traits::Fetcher, Context};
use crate::{builders::JsonLD, ApiError, AuthIdentity, Identity}; use crate::{builders::JsonLD, ApiError, AuthIdentity, Identity};
@ -72,28 +70,14 @@ pub async fn proxy_form(
proxy(ctx, query, auth).await proxy(ctx, query, auth).await
} }
pub async fn proxy_hmac( pub async fn proxy_cloak(
State(ctx): State<Context>, State(ctx): State<Context>,
AuthIdentity(auth): AuthIdentity, AuthIdentity(auth): AuthIdentity,
Path(hmac): Path<String>, Path(hmac): Path<String>,
Path(uri): Path<String>, Path(uri): Path<String>,
) -> crate::ApiResult<impl IntoResponse> { ) -> crate::ApiResult<impl IntoResponse> {
let bytes = URL_SAFE.decode(hmac).map_err(|_| ApiError::bad_request())?; let uri = ctx.uncloak(&hmac, &uri)
let uri = .ok_or_else(ApiError::unauthorized)?;
std::str::from_utf8(
&URL_SAFE.decode(uri).map_err(|_| ApiError::bad_request())?
)
.map_err(|_| ApiError::bad_request())?
.to_string();
type HmacSha256 = Hmac<sha2::Sha256>;
let mut mac = HmacSha256::new_from_slice(ctx.cfg().security.proxy_secret.as_bytes())
.map_err(|_| ApiError::internal_server_error())?;
mac.update(uri.as_bytes());
mac.verify_slice(&bytes)
.map_err(|_| ApiError::forbidden())?;
proxy(ctx, uri, auth).await proxy(ctx, uri, auth).await
} }

2
upub/routes/src/activitypub/mod.rs
View file

@ -25,7 +25,7 @@ impl ActivityPubRouter for Router<upub::Context> {
.route("/proxy", post(ap::application::proxy_form)) .route("/proxy", post(ap::application::proxy_form))
.route("/proxy", get(ap::application::proxy_get)) .route("/proxy", get(ap::application::proxy_get))
.route("/proxy/:uri", get(ap::application::proxy_path)) .route("/proxy/:uri", get(ap::application::proxy_path))
.route("/proxy/:hmac/:uri", get(ap::application::proxy_hmac)) .route("/proxy/:hmac/:uri", get(ap::application::proxy_cloak))
.route("/inbox", post(ap::inbox::post)) .route("/inbox", post(ap::inbox::post))
.route("/inbox", get(ap::inbox::get)) .route("/inbox", get(ap::inbox::get))
.route("/inbox/page", get(ap::inbox::page)) .route("/inbox/page", get(ap::inbox::page))