buzzert/Kordophone
Private
Public Access
1
0
Fork 0
Code Packages Activity

kordophone: better handling of url decoding errors

Browse Source
This commit is contained in:
James Magahern
2025-08-29 22:08:56 -06:00
parent 0128723765
commit 92d5b99853
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
kordophone/src/api/http_client.rs
View File

@@ -49,6 +49,7 @@ pub enum Error {
SerdeError(serde_json::Error), SerdeError(serde_json::Error),
DecodeError(String), DecodeError(String),
PongError(tungstenite::Error), PongError(tungstenite::Error),
URLError,
Unauthorized, Unauthorized,
} }
@@ -392,7 +393,8 @@ impl<K: AuthenticationStore + Send + Sync> APIInterface for HTTPAPIClient<K> {
None => "updates".to_string(), None => "updates".to_string(),
}; };
let uri = self.uri_for_endpoint(&endpoint, Some(self.websocket_scheme())); let uri = self
.uri_for_endpoint(&endpoint, Some(self.websocket_scheme()))?;
log::debug!("Connecting to websocket: {:?}", uri); log::debug!("Connecting to websocket: {:?}", uri);
@@ -463,17 +465,23 @@ impl<K: AuthenticationStore + Send + Sync> HTTPAPIClient<K> {
} }
} }
fn uri_for_endpoint(&self, endpoint: &str, scheme: Option<&str>) -> Uri { fn uri_for_endpoint(&self, endpoint: &str, scheme: Option<&str>) -> Result<Uri, Error> {
let mut parts = self.base_url.clone().into_parts(); let mut parts = self.base_url.clone().into_parts();
let root_path: PathBuf = parts.path_and_query.unwrap().path().into(); let root_path: PathBuf = parts
.path_and_query
.ok_or(Error::URLError)?
.path()
.into();
let path = root_path.join(endpoint); let path = root_path.join(endpoint);
parts.path_and_query = Some(path.to_str().unwrap().parse().unwrap()); let path_str = path.to_str().ok_or(Error::URLError)?;
parts.path_and_query = Some(path_str.parse().map_err(|_| Error::URLError)?);
if let Some(scheme) = scheme { if let Some(scheme) = scheme {
parts.scheme = Some(scheme.parse().unwrap()); parts.scheme = Some(scheme.parse().map_err(|_| Error::URLError)?);
} }
Uri::try_from(parts).unwrap() Uri::try_from(parts).map_err(|_| Error::URLError)
} }
fn websocket_scheme(&self) -> &str { fn websocket_scheme(&self) -> &str {
@@ -547,14 +555,14 @@ impl<K: AuthenticationStore + Send + Sync> HTTPAPIClient<K> {
) -> Result<hyper::Response<Body>, Error> { ) -> Result<hyper::Response<Body>, Error> {
use hyper::StatusCode; use hyper::StatusCode;
let uri = self.uri_for_endpoint(endpoint, None); let uri = self.uri_for_endpoint(endpoint, None)?;
log::debug!("Requesting {:?} {:?}", method, uri); log::debug!("Requesting {:?} {:?}", method, uri);
let mut build_request = |auth: &Option<String>| { let mut build_request = |auth: &Option<String>| {
let body = body_fn(); let body = body_fn();
Request::builder() Request::builder()
.method(&method) .method(&method)
.uri(&uri) .uri(uri.clone())
.with_auth_string(auth) .with_auth_string(auth)
.body(body) .body(body)
.expect("Unable to build request") .expect("Unable to build request")