* [pbs-devel] [PATCH proxmox] rest: remove full static file path from error messages
@ 2023-06-20 10:39 Fabian Grünbichler
2023-06-23 9:48 ` [pbs-devel] applied: " Wolfgang Bumiller
0 siblings, 1 reply; 2+ messages in thread
From: Fabian Grünbichler @ 2023-06-20 10:39 UTC (permalink / raw)
To: pbs-devel
this triggers certain security scanners, and having the requested path instead
gives basically the same information anyhow.
reported on the forum: https://forum.proxmox.com/threads/404-path-disclosure-vulnerability.129187/
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
---
with EPERM for example, this would return
File open failed for 'foobar': permission denied
instead of
File open failed: Permission denied (os error 13)
and for missing files it would return
no such file: 'foobar'
instead of
no such file: "/usr/share/javascript/proxmox-backup/foobar"
proxmox-rest-server/src/rest.rs | 39 +++++++++++++++++++--------------
1 file changed, 23 insertions(+), 16 deletions(-)
diff --git a/proxmox-rest-server/src/rest.rs b/proxmox-rest-server/src/rest.rs
index 100c93c..d22a35e 100644
--- a/proxmox-rest-server/src/rest.rs
+++ b/proxmox-rest-server/src/rest.rs
@@ -620,16 +620,12 @@ fn extension_to_content_type(filename: &Path) -> (&'static str, bool) {
}
async fn simple_static_file_download(
- filename: PathBuf,
+ mut file: File,
content_type: &'static str,
compression: Option<CompressionMethod>,
) -> Result<Response<Body>, Error> {
use tokio::io::AsyncReadExt;
- let mut file = File::open(filename)
- .await
- .map_err(|err| http_err!(BAD_REQUEST, "File open failed: {}", err))?;
-
let mut data: Vec<u8> = Vec::new();
let mut response = match compression {
@@ -660,8 +656,8 @@ async fn simple_static_file_download(
Ok(response)
}
-async fn chuncked_static_file_download(
- filename: PathBuf,
+async fn chunked_static_file_download(
+ file: File,
content_type: &'static str,
compression: Option<CompressionMethod>,
) -> Result<Response<Body>, Error> {
@@ -669,10 +665,6 @@ async fn chuncked_static_file_download(
.status(StatusCode::OK)
.header(header::CONTENT_TYPE, content_type);
- let file = File::open(filename)
- .await
- .map_err(|err| http_err!(BAD_REQUEST, "File open failed: {}", err))?;
-
let body = match compression {
Some(CompressionMethod::Deflate) => {
resp = resp.header(
@@ -691,24 +683,39 @@ async fn chuncked_static_file_download(
}
async fn handle_static_file_download(
+ components: &[&str],
filename: PathBuf,
compression: Option<CompressionMethod>,
) -> Result<Response<Body>, Error> {
let metadata = match tokio::fs::metadata(filename.clone()).await {
Ok(metadata) => metadata,
Err(err) if err.kind() == io::ErrorKind::NotFound => {
- http_bail!(NOT_FOUND, "no such file: {filename:?}")
+ http_bail!(NOT_FOUND, "no such file: '{}'", components.join("/"))
}
- Err(err) => http_bail!(BAD_REQUEST, "File access problems: {}", err),
+ Err(err) => http_bail!(
+ BAD_REQUEST,
+ "File access problem on '{}': {}",
+ components.join("/"),
+ err.kind()
+ ),
};
let (content_type, nocomp) = extension_to_content_type(&filename);
let compression = if nocomp { None } else { compression };
+ let file = File::open(filename).await.map_err(|err| {
+ http_err!(
+ BAD_REQUEST,
+ "File open failed for '{}': {}",
+ components.join("/"),
+ err.kind()
+ )
+ })?;
+
if metadata.len() < CHUNK_SIZE_LIMIT {
- simple_static_file_download(filename, content_type, compression).await
+ simple_static_file_download(file, content_type, compression).await
} else {
- chuncked_static_file_download(filename, content_type, compression).await
+ chunked_static_file_download(file, content_type, compression).await
}
}
@@ -782,7 +789,7 @@ impl ApiConfig {
} else {
let filename = self.find_alias(&components);
let compression = extract_compression_method(&parts.headers);
- return handle_static_file_download(filename, compression).await;
+ return handle_static_file_download(&components, filename, compression).await;
}
}
}
--
2.39.2
^ permalink raw reply [flat|nested] 2+ messages in thread
* [pbs-devel] applied: [PATCH proxmox] rest: remove full static file path from error messages
2023-06-20 10:39 [pbs-devel] [PATCH proxmox] rest: remove full static file path from error messages Fabian Grünbichler
@ 2023-06-23 9:48 ` Wolfgang Bumiller
0 siblings, 0 replies; 2+ messages in thread
From: Wolfgang Bumiller @ 2023-06-23 9:48 UTC (permalink / raw)
To: Fabian Grünbichler; +Cc: pbs-devel
applied, thanks
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-06-23 9:48 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-06-20 10:39 [pbs-devel] [PATCH proxmox] rest: remove full static file path from error messages Fabian Grünbichler
2023-06-23 9:48 ` [pbs-devel] applied: " Wolfgang Bumiller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.