Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Overhaul core Tracker: review whitelist functionality #1269

Prev Previous commit
Next Next commit
[#1268] move http services to http_tracker_core package
josecelano committed Feb 14, 2025

Verified

This commit was signed with the committer’s verified signature.
commit 73753e31f2626ff694bb0ea8994cce2877e2a637
1 change: 1 addition & 0 deletions src/packages/http_tracker_core/mod.rs
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
pub mod services;
pub mod statistics;
Original file line number Diff line number Diff line change
@@ -164,11 +164,11 @@ mod tests {

use super::{sample_peer_using_ipv4, sample_peer_using_ipv6};
use crate::packages::http_tracker_core;
use crate::servers::http::test_helpers::tests::sample_info_hash;
use crate::servers::http::v1::services::announce::invoke;
use crate::servers::http::v1::services::announce::tests::{
use crate::packages::http_tracker_core::services::announce::invoke;
use crate::packages::http_tracker_core::services::announce::tests::{
initialize_core_tracker_services, sample_peer, MockHttpStatsEventSender,
};
use crate::servers::http::test_helpers::tests::sample_info_hash;

fn initialize_announce_handler() -> Arc<AnnounceHandler> {
let config = configuration::ephemeral();
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -161,13 +161,13 @@ mod tests {
use torrust_tracker_primitives::core::ScrapeData;
use torrust_tracker_primitives::swarm_metadata::SwarmMetadata;

use crate::packages::{self, http_tracker_core};
use crate::servers::http::test_helpers::tests::sample_info_hash;
use crate::servers::http::v1::services::scrape::invoke;
use crate::servers::http::v1::services::scrape::tests::{
use crate::packages::http_tracker_core::services::scrape::invoke;
use crate::packages::http_tracker_core::services::scrape::tests::{
initialize_announce_and_scrape_handlers_for_public_tracker, initialize_scrape_handler, sample_info_hashes,
sample_peer, MockHttpStatsEventSender,
};
use crate::packages::{self, http_tracker_core};
use crate::servers::http::test_helpers::tests::sample_info_hash;

#[tokio::test]
async fn it_should_return_the_scrape_data_for_a_torrent() {
@@ -247,12 +247,12 @@ mod tests {
use mockall::predicate::eq;
use torrust_tracker_primitives::core::ScrapeData;

use crate::packages::{self, http_tracker_core};
use crate::servers::http::test_helpers::tests::sample_info_hash;
use crate::servers::http::v1::services::scrape::fake;
use crate::servers::http::v1::services::scrape::tests::{
use crate::packages::http_tracker_core::services::scrape::fake;
use crate::packages::http_tracker_core::services::scrape::tests::{
initialize_announce_and_scrape_handlers_for_public_tracker, sample_info_hashes, sample_peer, MockHttpStatsEventSender,
};
use crate::packages::{self, http_tracker_core};
use crate::servers::http::test_helpers::tests::sample_info_hash;

#[tokio::test]
async fn it_should_always_return_the_zeroed_scrape_data_for_a_torrent() {
2 changes: 1 addition & 1 deletion src/servers/http/v1/handlers/announce.rs
Original file line number Diff line number Diff line change
@@ -28,11 +28,11 @@ use torrust_tracker_primitives::peer;

use super::common::auth::map_auth_error_to_error_response;
use crate::packages::http_tracker_core;
use crate::packages::http_tracker_core::services::{self};
use crate::servers::http::v1::extractors::announce_request::ExtractRequest;
use crate::servers::http::v1::extractors::authentication_key::Extract as ExtractKey;
use crate::servers::http::v1::extractors::client_ip_sources::Extract as ExtractClientIpSources;
use crate::servers::http::v1::handlers::common::auth;
use crate::servers::http::v1::services::{self};
use crate::CurrentClock;

/// It handles the `announce` request when the HTTP tracker does not require
2 changes: 1 addition & 1 deletion src/servers/http/v1/handlers/scrape.rs
Original file line number Diff line number Diff line change
@@ -20,10 +20,10 @@ use torrust_tracker_configuration::Core;
use torrust_tracker_primitives::core::ScrapeData;

use crate::packages::http_tracker_core;
use crate::packages::http_tracker_core::services;
use crate::servers::http::v1::extractors::authentication_key::Extract as ExtractKey;
use crate::servers::http::v1::extractors::client_ip_sources::Extract as ExtractClientIpSources;
use crate::servers::http::v1::extractors::scrape_request::ExtractRequest;
use crate::servers::http::v1::services;

/// It handles the `scrape` request when the HTTP tracker is configured
/// to run in `public` mode.
1 change: 0 additions & 1 deletion src/servers/http/v1/mod.rs
Original file line number Diff line number Diff line change
@@ -5,4 +5,3 @@
pub mod extractors;
pub mod handlers;
pub mod routes;
pub mod services;