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

Fix web UI index path http security headers #4517

Merged
merged 3 commits into from
Jun 25, 2024
Merged

Fix web UI index path http security headers #4517

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fa0e17d
Draft: web-ui root endpoint x-frame-options: deny header
Rendez Jun 20, 2024
836ced3
Switch to async
Rendez Jun 24, 2024
34ff8a1
Simplify setting frame options header by using DefaultHeaders
timvisee Jun 25, 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
Prev Previous commit
Simplify setting frame options header by using DefaultHeaders
  • Loading branch information
@timvisee
timvisee committed Jun 25, 2024
commit 34ff8a1c0970e421534c04402fc4fb8fb15e139c
50 changes: 7 additions & 43 deletions src/actix/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,10 @@ use std::sync::Arc;

use ::api::grpc::models::{ApiResponse, ApiStatus, VersionInfo};
use actix_cors::Cors;
use actix_files::NamedFile;
use actix_multipart::form::tempfile::TempFileConfig;
use actix_multipart::form::MultipartFormConfig;
use actix_web::http::header::{self, HeaderValue};
use actix_web::middleware::{Compress, Condition, Logger};
use actix_web::http::header::HeaderValue;
use actix_web::middleware::{Compress, Condition, DefaultHeaders, Logger};
use actix_web::{error, get, web, App, HttpRequest, HttpResponse, HttpServer, Responder};
use actix_web_extras::middleware::Condition as ConditionEx;
use collection::operations::validation;
Expand Down Expand Up @@ -49,34 +48,6 @@ use crate::tracing::LoggerHandle;
const DEFAULT_STATIC_DIR: &str = "./static";
const WEB_UI_PATH: &str = "/dashboard";

struct WebUISettings {
static_folder: String,
}

impl WebUISettings {
pub fn new(static_folder: String) -> Self {
Self { static_folder }
}
}

async fn web_ui_index(
req: HttpRequest,
web_ui_settings: web::Data<WebUISettings>,
) -> impl Responder {
let path = Path::new(&web_ui_settings.static_folder).join("index.html");

match NamedFile::open_async(path).await {
Ok(file) => {
let mut res = file.respond_to(&req);
res.headers_mut()
.insert(header::X_FRAME_OPTIONS, HeaderValue::from_static("DENY"));

res
}
Err(err) => HttpResponse::from_error(err),
}
}

#[get("/")]
pub async fn index() -> impl Responder {
HttpResponse::Ok().json(VersionInfo::default())
Expand Down Expand Up @@ -214,20 +185,13 @@ pub fn init(
if web_ui_available {
app = app.service(
actix_web::web::scope(WEB_UI_PATH)
.app_data(actix_web::web::Data::new(WebUISettings::new(
static_folder.to_owned(),
)))
.service(
actix_web::web::resource("")
.route(actix_web::web::get().to(web_ui_index)),
)
.service(
actix_web::web::resource("/")
.route(actix_web::web::get().to(web_ui_index)),
// For security reasons, deny embedding the web UI in an iframe
.wrap(
DefaultHeaders::new()
.add(("X-Frame-Options", HeaderValue::from_static("DENY"))),
)
.service(
actix_files::Files::new("/", &static_folder)
.path_filter(|path, _| Path::new("index.html").ne(path)),
actix_files::Files::new("/", &static_folder).index_file("index.html"),
),
)
}
Expand Down