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.

Sign up for GitHub

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

Jump to bottom

fix: applying rate limiting middleware to all except push endpoints #328

Merged
merged 1 commit into from
May 16, 2024
Merged

fix: applying rate limiting middleware to all except push endpoints #328

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 28 additions & 25 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,62 +235,65 @@ pub async fn bootstap(mut shutdown: broadcast::Receiver<()>, config: Config) ->
),
);

let app = Router::new()
.route("/health", get(handlers::health::handler))
.nest("/tenants", tenancy_routes)
Router::new()
.route("/health", get(handlers::health::handler).layer(
axum::middleware::from_fn_with_state(state_arc.clone(), rate_limit_middleware),
))
.nest("/tenants", tenancy_routes.layer(
axum::middleware::from_fn_with_state(state_arc.clone(), rate_limit_middleware),
))
.route(
"/:tenant_id/clients",
post(handlers::register_client::handler),
post(handlers::register_client::handler).layer(
axum::middleware::from_fn_with_state(state_arc.clone(), rate_limit_middleware),
),
)
.route(
"/:tenant_id/clients/:id",
delete(handlers::delete_client::handler),
delete(handlers::delete_client::handler).layer(
axum::middleware::from_fn_with_state(state_arc.clone(), rate_limit_middleware),
),
)
// Rate limiting middleware is not applying to push_handler because it is used by the relay
.route(
"/:tenant_id/clients/:id",
post(handlers::push_message::handler),
)
.layer(global_middleware);

let app = if let Some(geoblock) = state_arc.geoblock.clone() {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removing this part as we are applying the geoblock and state later and not depending on the multitenant feature. This is a fix to double applying the geoblock and state.

app.layer(geoblock)
} else {
app
};
let app = app.route_layer(axum::middleware::from_fn_with_state(
state_arc.clone(),
rate_limit_middleware,
));
app.with_state(state_arc.clone())
.layer(global_middleware)
};

#[cfg(not(feature = "multitenant"))]
let app = Router::new()
.route("/health", get(handlers::health::handler))
.route("/health", get(handlers::health::handler).layer(
axum::middleware::from_fn_with_state(state_arc.clone(), rate_limit_middleware),
))
.route(
"/clients",
post(handlers::single_tenant_wrappers::register_handler),
post(handlers::single_tenant_wrappers::register_handler).layer(
axum::middleware::from_fn_with_state(state_arc.clone(), rate_limit_middleware),
),
)
.route(
"/clients/:id",
delete(handlers::single_tenant_wrappers::delete_handler),
delete(handlers::single_tenant_wrappers::delete_handler).layer(
axum::middleware::from_fn_with_state(state_arc.clone(), rate_limit_middleware),
),
)
// Rate limiting middleware is not applying to push_handler because it is used by the relay
.route(
"/clients/:id",
post(handlers::single_tenant_wrappers::push_handler),
)
.layer(global_middleware);

// If geoblock is enabled, add the geoblock middleware to the app
let app = if let Some(geoblock) = state_arc.geoblock.clone() {
app.layer(geoblock)
} else {
app
};
let app = app.route_layer(axum::middleware::from_fn_with_state(
state_arc.clone(),
rate_limit_middleware,
));
let app = app.with_state(state_arc.clone());

let app = app.with_state(state_arc.clone());
let private_app = Router::new()
.route("/metrics", get(handlers::metrics::handler))
.with_state(state_arc);
Expand Down
Loading