GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-08-23 05:27:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Check that sync.server.origin is a URL (#3361)

Browse source
This commit is contained in:
Dustin J. Mitchell 2024-04-15 22:11:55 -04:00 • committed by GitHub
parent 4d9bb20bdd
commit 10cec507cb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 18 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
taskchampion/integration-tests/src/bindings_tests/replica.c
View file

@ -186,7 +186,7 @@ static void test_replica_sync_local(void) {
static void test_replica_remote_server(void) {
TCString err;
TCServer *server = tc_server_new_sync(
tc_string_borrow("tc.freecinc.com"),
tc_string_borrow("http://tc.freecinc.com"),
tc_uuid_new_v4(),
tc_string_borrow("\xf0\x28\x8c\x28"), // NOTE: not utf-8
&err);

4
taskchampion/taskchampion/Cargo.toml
View file

@ -15,7 +15,7 @@ rust-version = "1.70.0"
default = ["server-sync", "server-gcp"]
# Support for sync to a server
server-sync = ["encryption", "dep:ureq"]
server-sync = ["encryption", "dep:ureq", "dep:url"]
# Support for sync to GCP
server-gcp = ["cloud", "encryption", "dep:google-cloud-storage", "dep:tokio"]
# (private) Support for sync protocol encryption
@ -43,10 +43,12 @@ byteorder.workspace = true
ring.workspace = true
google-cloud-storage.workspace = true
tokio.workspace = true
url.workspace = true
google-cloud-storage.optional = true
tokio.optional = true
ureq.optional = true
url.optional = true
ring.optional = true
[dev-dependencies]

11
taskchampion/taskchampion/src/server/sync/mod.rs
View file

@ -4,6 +4,7 @@ use crate::server::{
VersionId,
};
use std::time::Duration;
use url::Url;
use uuid::Uuid;
use super::encryption::{Cryptor, Sealed, Secret, Unsealed};
@ -28,8 +29,16 @@ impl SyncServer {
/// identify this client to the server. Multiple replicas synchronizing the same task history
/// should use the same client_id.
pub fn new(origin: String, client_id: Uuid, encryption_secret: Vec<u8>) -> Result<SyncServer> {
let origin = Url::parse(&origin)
.map_err(|_| Error::Server(format!("Could not parse {} as a URL", origin)))?;
if origin.path() != "/" {
return Err(Error::Server(format!(
"Server origin must have an empty path; got {}",
origin
)));
}
Ok(SyncServer {
origin,
origin: origin.to_string(),
client_id,
cryptor: Cryptor::new(client_id, &Secret(encryption_secret.to_vec()))?,
agent: ureq::AgentBuilder::new()