Skip to content

Commit

Permalink
Forbid outgoing requests in activitypub tests (fixes #2289) (#2294)
Browse files Browse the repository at this point in the history
  • Loading branch information
Nutomic authored Jun 3, 2022
1 parent 339eab0 commit 5387c26
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 3 deletions.
1 change: 1 addition & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions crates/apub/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -49,3 +49,4 @@ parking_lot = "0.12.0"
serial_test = "0.6.0"
assert-json-diff = "2.0.1"
reqwest-middleware = "0.1.5"
task-local-extensions = "0.1.1"
23 changes: 20 additions & 3 deletions crates/apub/src/objects/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ pub(crate) fn verify_is_remote_object(id: &Url) -> Result<(), LemmyError> {
#[cfg(test)]
pub(crate) mod tests {
use actix::Actor;
use anyhow::anyhow;
use diesel::{
r2d2::{ConnectionManager, Pool},
PgConnection,
Expand All @@ -71,9 +72,25 @@ pub(crate) mod tests {
};
use lemmy_websocket::{chat_server::ChatServer, LemmyContext};
use parking_lot::Mutex;
use reqwest::Client;
use reqwest_middleware::ClientBuilder;
use reqwest::{Client, Request, Response};
use reqwest_middleware::{ClientBuilder, Middleware, Next};
use std::sync::Arc;
use task_local_extensions::Extensions;

struct BlockedMiddleware;

/// A reqwest middleware which blocks all requests
#[async_trait::async_trait]
impl Middleware for BlockedMiddleware {
async fn handle(
&self,
_req: Request,
_extensions: &mut Extensions,
_next: Next<'_>,
) -> reqwest_middleware::Result<Response> {
Err(anyhow!("Network requests not allowed").into())
}
}

// TODO: would be nice if we didnt have to use a full context for tests.
pub(crate) fn init_context() -> LemmyContext {
Expand All @@ -89,7 +106,7 @@ pub(crate) mod tests {
.build()
.unwrap();

let client = ClientBuilder::new(client).build();
let client = ClientBuilder::new(client).with(BlockedMiddleware).build();
let secret = Secret {
id: 0,
jwt_secret: "".to_string(),
Expand Down

0 comments on commit 5387c26

Please sign in to comment.