thm
/
upend
1
0
Fork 0
Code Issues 73 Pull Requests Packages Projects Releases 5 Wiki Activity

open dir instead of 403 on native executable

feat/vaults
Tomáš Mládek 2021-12-21 17:43:29 +01:00
parent 165d5c0e7f
commit 057ac8e35f
No known key found for this signature in database
GPG Key ID: ED21612889E75EC5
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/routes.rs
View File

@ -12,7 +12,7 @@ use actix_web::error::{ErrorBadRequest, ErrorInternalServerError, ErrorNotFound}
use actix_web::{delete, error, get, post, put, web, Either, Error, HttpResponse};
use anyhow::Result;
use futures_util::StreamExt;
use log::{debug, info, trace, error};
use log::{debug, info, trace};
use serde::Deserialize;
use serde_json::json;
use std::collections::HashMap;
@ -59,14 +59,22 @@ pub async fn get_raw(
#[cfg(feature = "desktop")]
{
info!("Opening {:?}...", file_path);
if !file_path.is_executable() {
opener::open(file_path).map_err(error::ErrorServiceUnavailable)?;
return Ok(Either::B(HttpResponse::NoContent().finish()));
let path = if !file_path.is_executable() {
file_path
} else {
error!("Attempted to natively open {:?}, which is executable!", file_path);
}
file_path
.parent()
.ok_or_else(|| {
ErrorInternalServerError("No parent to open as fallback.")
})?
.to_path_buf()
};
opener::open(path).map_err(error::ErrorServiceUnavailable)?;
return Ok(Either::B(HttpResponse::NoContent().finish()));
}
Err(error::ErrorForbidden(""))
#[cfg(not(feature = "desktop"))]
!unreachable()
} else {
Err(error::ErrorBadRequest("Desktop features not enabled."))
}