wathiede/letterbox
1
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Releases Wiki Activity

server: set content type when viewing original to prevent download.

Browse Source
This commit is contained in:
Bill Thiede 2021-11-04 19:27:43 -07:00
parent b8a622dba5
commit db0e7c2005
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
server/src/main.rs
View File

@ -3,7 +3,11 @@ extern crate rocket;
use std::{error::Error, process::Command, str::FromStr}; use std::{error::Error, process::Command, str::FromStr};
use rocket::{response::Debug, serde::json::Json, State}; use rocket::{
response::{content::Plain, Debug},
serde::json::Json,
State,
};
use rocket_cors::{AllowedHeaders, AllowedOrigins}; use rocket_cors::{AllowedHeaders, AllowedOrigins};
use notmuch::{MessageId, Notmuch, NotmuchError, SearchSummary, ThreadSet}; use notmuch::{MessageId, Notmuch, NotmuchError, SearchSummary, ThreadSet};
@ -29,14 +33,14 @@ async fn show(nm: &State<Notmuch>, query: &str) -> Result<Json<ThreadSet>, Debug
} }
#[get("/original/<id>")] #[get("/original/<id>")]
async fn original(nm: &State<Notmuch>, id: &str) -> Result<Vec<u8>, Debug<NotmuchError>> { async fn original(nm: &State<Notmuch>, id: &str) -> Result<Plain<Vec<u8>>, Debug<NotmuchError>> {
let mid = if id.starts_with("id:") { let mid = if id.starts_with("id:") {
id.to_string() id.to_string()
} else { } else {
format!("id:{}", id) format!("id:{}", id)
}; };
let res = nm.show_original(&mid)?; let res = nm.show_original(&mid)?;
Ok(res) Ok(Plain(res))
} }
#[rocket::main] #[rocket::main]