Skip to content

Update Error Message #643

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

Merged
merged 2 commits into from
Jan 30, 2024
Merged

Update Error Message #643

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d9db303
Update Error Message
Eshanatnight Jan 30, 2024
1313283
Update: In Query Mode only GET /logstream is allowed
Eshanatnight Jan 30, 2024
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
16 changes: 12 additions & 4 deletions server/src/handlers/http/middleware.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,15 +299,23 @@ where
fn call(&self, req: ServiceRequest) -> Self::Future {
let path = req.path();
let mode = &CONFIG.parseable.mode;

// change error messages based on mode
match mode {
Mode::Query => {
let cond = path.split('/').any(|x| x == "ingest");
if cond {
// In Query mode, only allows /ingest endpoint, and /logstream endpoint with GET method
let base_cond = path.split('/').any(|x| x == "ingest");
let logstream_cond =
!(path.split('/').any(|x| x == "logstream") && req.method() == "GET");
if base_cond {
Box::pin(async {
Err(actix_web::error::ErrorUnauthorized(
"Ingestion API cannot be accessed in Query Mode",
))
})
} else if logstream_cond {
Box::pin(async {
Err(actix_web::error::ErrorUnauthorized(
"Ingest API cannot be accessed in Query Mode",
"Logstream cannot be changed in Query Mode",
))
})
} else {
Expand Down