GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-07-07 20:06:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Modify ureq usage for new version

Browse source
This commit is contained in:
Dustin J. Mitchell 2021-03-28 17:40:39 -04:00
parent 1de0816661
commit 0f02b38fd8
1 changed files with 37 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

49
taskchampion/src/server/remote/mod.rs
View file

@ -1,5 +1,6 @@
use crate::server::{AddVersionResult, GetVersionResult, HistorySegment, Server, VersionId}; use crate::server::{AddVersionResult, GetVersionResult, HistorySegment, Server, VersionId};
use std::convert::TryInto; use std::convert::TryInto;
use std::time::Duration;
use uuid::Uuid; use uuid::Uuid;
mod crypto; mod crypto;
@ -24,21 +25,14 @@ impl RemoteServer {
origin, origin,
client_key, client_key,
encryption_secret: encryption_secret.into(), encryption_secret: encryption_secret.into(),
agent: ureq::agent(), agent: ureq::AgentBuilder::new()
.timeout_connect(Duration::from_secs(10))
.timeout_read(Duration::from_secs(60))
.build(),
} }
} }
} }
/// Convert a ureq::Response to an Error
fn resp_to_error(resp: ureq::Response) -> anyhow::Error {
return anyhow::anyhow!(
"error {}: {}",
resp.status(),
resp.into_string()
.unwrap_or_else(|e| format!("(could not read response: {})", e))
);
}
/// Read a UUID-bearing header or fail trying /// Read a UUID-bearing header or fail trying
fn get_uuid_header(resp: &ureq::Response, name: &str) -> anyhow::Result<Uuid> { fn get_uuid_header(resp: &ureq::Response, name: &str) -> anyhow::Result<Uuid> {
let value = resp let value = resp
@ -61,25 +55,25 @@ impl Server for RemoteServer {
history_segment, history_segment,
}; };
let history_ciphertext = history_cleartext.seal(&self.encryption_secret)?; let history_ciphertext = history_cleartext.seal(&self.encryption_secret)?;
let resp = self match self
.agent .agent
.post(&url) .post(&url)
.timeout_connect(10_000)
.timeout_read(60_000)
.set( .set(
"Content-Type", "Content-Type",
"application/vnd.taskchampion.history-segment", "application/vnd.taskchampion.history-segment",
) )
.set("X-Client-Key", &self.client_key.to_string()) .set("X-Client-Key", &self.client_key.to_string())
.send_bytes(history_ciphertext.as_ref()); .send_bytes(history_ciphertext.as_ref())
if resp.ok() { {
Ok(resp) => {
let version_id = get_uuid_header(&resp, "X-Version-Id")?; let version_id = get_uuid_header(&resp, "X-Version-Id")?;
Ok(AddVersionResult::Ok(version_id)) Ok(AddVersionResult::Ok(version_id))
} else if resp.status() == 409 { }
Err(ureq::Error::Status(status, resp)) if status == 409 => {
let parent_version_id = get_uuid_header(&resp, "X-Parent-Version-Id")?; let parent_version_id = get_uuid_header(&resp, "X-Parent-Version-Id")?;
Ok(AddVersionResult::ExpectedParentVersion(parent_version_id)) Ok(AddVersionResult::ExpectedParentVersion(parent_version_id))
} else { }
Err(resp_to_error(resp)) Err(err) => Err(err.into()),
} }
} }
@ -91,15 +85,13 @@ impl Server for RemoteServer {
"{}/client/get-child-version/{}", "{}/client/get-child-version/{}",
self.origin, parent_version_id self.origin, parent_version_id
); );
let resp = self match self
.agent .agent
.get(&url) .get(&url)
.timeout_connect(10_000)
.timeout_read(60_000)
.set("X-Client-Key", &self.client_key.to_string()) .set("X-Client-Key", &self.client_key.to_string())
.call(); .call()
{
if resp.ok() { Ok(resp) => {
let parent_version_id = get_uuid_header(&resp, "X-Parent-Version-Id")?; let parent_version_id = get_uuid_header(&resp, "X-Parent-Version-Id")?;
let version_id = get_uuid_header(&resp, "X-Version-Id")?; let version_id = get_uuid_header(&resp, "X-Version-Id")?;
let history_ciphertext: HistoryCiphertext = resp.try_into()?; let history_ciphertext: HistoryCiphertext = resp.try_into()?;
@ -111,10 +103,11 @@ impl Server for RemoteServer {
parent_version_id, parent_version_id,
history_segment, history_segment,
}) })
} else if resp.status() == 404 { }
Err(ureq::Error::Status(status, _)) if status == 404 => {
Ok(GetVersionResult::NoSuchVersion) Ok(GetVersionResult::NoSuchVersion)
} else { }
Err(resp_to_error(resp)) Err(err) => Err(err.into()),
} }
} }
} }