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

URL decode queries.

Browse Source
This commit is contained in:
Bill Thiede 2023-09-05 09:49:59 -07:00
parent 042d475c75
commit 01e5ea14ab
4 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Cargo.lock generated
View File

@ -2444,6 +2444,7 @@ dependencies = [
"shared", "shared",
"thiserror", "thiserror",
"tokio", "tokio",
"urlencoding",
] ]
[[package]] [[package]]
@ -3037,6 +3038,12 @@ dependencies = [
"percent-encoding 2.3.0", "percent-encoding 2.3.0",
] ]
[[package]]
name = "urlencoding"
version = "2.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da"
[[package]] [[package]]
name = "utf-8" name = "utf-8"
version = "0.7.6" version = "0.7.6"

2
notmuch/src/lib.rs
View File

@ -454,6 +454,8 @@ pub enum NotmuchError {
SerdeJson(#[from] serde_json::Error), SerdeJson(#[from] serde_json::Error),
#[error("failed to parse bytes as str")] #[error("failed to parse bytes as str")]
Utf8Error(#[from] std::str::Utf8Error), Utf8Error(#[from] std::str::Utf8Error),
#[error("failed to parse bytes as String")]
StringUtf8Error(#[from] std::string::FromUtf8Error),
#[error("failed to parse str as int")] #[error("failed to parse str as int")]
ParseIntError(#[from] std::num::ParseIntError), ParseIntError(#[from] std::num::ParseIntError),
} }

1
server/Cargo.toml
View File

@ -16,6 +16,7 @@ serde = { version = "1.0.147", features = ["derive"] }
log = "0.4.17" log = "0.4.17"
tokio = "1.26.0" tokio = "1.26.0"
glog = "0.1.0" glog = "0.1.0"
urlencoding = "2.1.3"
[dependencies.rocket_contrib] [dependencies.rocket_contrib]
version = "0.4.11" version = "0.4.11"

13
server/src/main.rs
View File

@ -4,7 +4,7 @@ extern crate rocket;
use std::{error::Error, io::Cursor, str::FromStr}; use std::{error::Error, io::Cursor, str::FromStr};
use glog::Flags; use glog::Flags;
use notmuch::{Notmuch, NotmuchError, SearchSummary, ThreadSet}; use notmuch::{Notmuch, NotmuchError, ThreadSet};
use rocket::{ use rocket::{
http::{ContentType, Header}, http::{ContentType, Header},
request::Request, request::Request,
@ -40,13 +40,14 @@ async fn search(
) -> Result<Json<shared::SearchResult>, Debug<NotmuchError>> { ) -> Result<Json<shared::SearchResult>, Debug<NotmuchError>> {
let page = page.unwrap_or(0); let page = page.unwrap_or(0);
let results_per_page = results_per_page.unwrap_or(10); let results_per_page = results_per_page.unwrap_or(10);
let query = urlencoding::decode(query).map_err(NotmuchError::from)?;
info!(" search '{query}'"); info!(" search '{query}'");
let res = shared::SearchResult { let res = shared::SearchResult {
summary: nm.search(query, page * results_per_page, results_per_page)?, summary: nm.search(&query, page * results_per_page, results_per_page)?,
query: query.to_string(), query: query.to_string(),
page, page,
results_per_page, results_per_page,
total: nm.count(query)?, total: nm.count(&query)?,
}; };
Ok(Json(res)) Ok(Json(res))
} }
@ -56,13 +57,15 @@ async fn show_pretty(
nm: &State<Notmuch>, nm: &State<Notmuch>,
query: &str, query: &str,
) -> Result<Json<ThreadSet>, Debug<NotmuchError>> { ) -> Result<Json<ThreadSet>, Debug<NotmuchError>> {
let res = nm.show(query)?; let query = urlencoding::decode(query).map_err(NotmuchError::from)?;
let res = nm.show(&query)?;
Ok(Json(res)) Ok(Json(res))
} }
#[get("/show/<query>")] #[get("/show/<query>")]
async fn show(nm: &State<Notmuch>, query: &str) -> Result<Json<ThreadSet>, Debug<NotmuchError>> { async fn show(nm: &State<Notmuch>, query: &str) -> Result<Json<ThreadSet>, Debug<NotmuchError>> {
let res = nm.show(query)?; let query = urlencoding::decode(query).map_err(NotmuchError::from)?;
let res = nm.show(&query)?;
Ok(Json(res)) Ok(Json(res))
} }