Modify Endpoint enum to allow absolute URLs (necessary for CDN2)

src/account_manager.rs

@@ -225,8 +225,7 @@ impl AccountManager {
             .service
             .request(
                 Method::GET,
-                Endpoint::Service,
-                "/v1/devices/provisioning/code",
+                Endpoint::service("/v1/devices/provisioning/code"),
                 HttpAuthOverride::NoOverride,
             )?
             .send()
@@ -254,8 +253,7 @@ impl AccountManager {
         self.service
             .request(
                 Method::PUT,
-                Endpoint::Service,
-                format!("/v1/provisioning/{}", destination),
+                Endpoint::service(format!("/v1/provisioning/{}", destination)),
                 HttpAuthOverride::NoOverride,
             )?
             .json(&ProvisioningMessage {
@@ -594,8 +592,7 @@ impl AccountManager {
         self.service
             .request(
                 Method::PUT,
-                Endpoint::Service,
-                "/v1/accounts/name",
+                Endpoint::service("/v1/accounts/name"),
                 HttpAuthOverride::NoOverride,
             )?
             .json(&Data {
@@ -623,8 +620,7 @@ impl AccountManager {
         self.service
             .request(
                 Method::PUT,
-                Endpoint::Service,
-                "/v1/challenge",
+                Endpoint::service("/v1/challenge"),
                 HttpAuthOverride::NoOverride,
             )?
             .json(&RecaptchaAttributes {

src/configuration.rs

@@ -1,5 +1,5 @@
 use core::fmt;
-use std::{collections::HashMap, str::FromStr};
+use std::{borrow::Cow, collections::HashMap, str::FromStr};
 
 use crate::utils::BASE64_RELAXED;
 use base64::prelude::*;
@@ -74,11 +74,50 @@ pub enum SignalServers {
 }
 
 #[derive(Debug)]
-pub enum Endpoint {
-    Service,
-    Storage,
-    Cdn(u32),
-    ContactDiscovery,
+pub enum Endpoint<'a> {
+    Absolute(Url),
+    Service { path: Cow<'a, str> },
+    Storage { path: Cow<'a, str> },
+    Cdn { path: Cow<'a, str>, cdn_id: u32 },
+    ContactDiscovery { path: Cow<'a, str> },
+}
+
+impl<'a> Endpoint<'a> {
+    pub fn service(path: impl Into<Cow<'a, str>>) -> Self {
+        Self::Service { path: path.into() }
+    }
+
+    pub fn cdn(cdn_id: u32, path: impl Into<Cow<'a, str>>) -> Self {
+        Self::Cdn {
+            path: path.into(),
+            cdn_id,
+        }
+    }
+
+    pub fn storage(path: impl Into<Cow<'a, str>>) -> Self {
+        Self::Storage { path: path.into() }
+    }
+
+    pub fn into_url(
+        self,
+        service_configuration: &ServiceConfiguration,
+    ) -> Result<Url, url::ParseError> {
+        match self {
+            Endpoint::Service { path } => {
+                service_configuration.service_url.join(&path)
+            },
+            Endpoint::Storage { path } => {
+                service_configuration.storage_url.join(&path)
+            },
+            Endpoint::Cdn { path, ref cdn_id } => {
+                service_configuration.cdn_urls[cdn_id].join(&path)
+            },
+            Endpoint::ContactDiscovery { path } => {
+                service_configuration.contact_discovery_url.join(&path)
+            },
+            Endpoint::Absolute(url) => Ok(url),
+        }
+    }
 }
 
 impl FromStr for SignalServers {
@@ -144,6 +183,7 @@ impl From<&SignalServers> for ServiceConfiguration {
                     let mut map = HashMap::new();
                     map.insert(0, "https://cdn.signal.org".parse().unwrap());
                     map.insert(2, "https://cdn2.signal.org".parse().unwrap());
+                    map.insert(3, "https://cdn3.signal.org".parse().unwrap());
                     map
                 },
                 contact_discovery_url: "https://api.directory.signal.org".parse().unwrap(),
@@ -156,14 +196,3 @@ impl From<&SignalServers> for ServiceConfiguration {
         }
     }
 }
-
-impl ServiceConfiguration {
-    pub fn base_url(&self, endpoint: Endpoint) -> &Url {
-        match endpoint {
-            Endpoint::Service => &self.service_url,
-            Endpoint::Storage => &self.storage_url,
-            Endpoint::Cdn(ref n) => &self.cdn_urls[n],
-            Endpoint::ContactDiscovery => &self.contact_discovery_url,
-        }
-    }
-}

src/digeststream.rs

@@ -1,4 +1,4 @@
-use std::io::Read;
+use std::io::{self, Read, Seek, SeekFrom};
 
 use sha2::{Digest, Sha256};
 
@@ -7,22 +7,26 @@ pub struct DigestingReader<'r, R> {
     digest: Sha256,
 }
 
-impl<'r, R: Read> Read for DigestingReader<'r, R> {
+impl<'r, R: Read + Seek> Read for DigestingReader<'r, R> {
     fn read(&mut self, tgt: &mut [u8]) -> Result<usize, std::io::Error> {
         let amount = self.inner.read(tgt)?;
         self.digest.update(&tgt[..amount]);
         Ok(amount)
     }
 }
 
-impl<'r, R: Read> DigestingReader<'r, R> {
+impl<'r, R: Read + Seek> DigestingReader<'r, R> {
     pub fn new(inner: &'r mut R) -> Self {
         Self {
             inner,
             digest: Sha256::new(),
         }
     }
 
+    pub fn seek(&mut self, from: SeekFrom) -> io::Result<u64> {
+        self.inner.seek(from)
+    }
+
     pub fn finalize(self) -> Vec<u8> {
         // XXX representation is not ideal, but this leaks to the public interface and I don't
         // really like exposing the GenericArray.

src/groups_v2/manager.rs

@@ -170,8 +170,7 @@ impl<C: CredentialsCache> GroupsManager<C> {
                 .push_service
                 .request(
                     Method::GET,
-                    Endpoint::Service,
-                    &path,
+                    Endpoint::service(path),
                     HttpAuthOverride::NoOverride,
                 )?
                 .send()

src/profile_service.rs

@@ -41,8 +41,7 @@ impl ProfileService {
         self.push_service
             .request(
                 Method::GET,
-                Endpoint::Service,
-                path,
+                Endpoint::service(path),
                 HttpAuthOverride::NoOverride,
             )?
             .send()

src/push_service/account.rs

@@ -132,8 +132,7 @@ impl PushService {
     pub async fn whoami(&mut self) -> Result<WhoAmIResponse, ServiceError> {
         self.request(
             Method::GET,
-            Endpoint::Service,
-            "/v1/accounts/whoami",
+            Endpoint::service("/v1/accounts/whoami"),
             HttpAuthOverride::NoOverride,
         )?
         .send()
@@ -157,8 +156,7 @@ impl PushService {
         let devices: DeviceInfoList = self
             .request(
                 Method::GET,
-                Endpoint::Service,
-                "/v1/devices/",
+                Endpoint::service("/v1/devices/"),
                 HttpAuthOverride::NoOverride,
             )?
             .send()
@@ -182,8 +180,7 @@ impl PushService {
 
         self.request(
             Method::PUT,
-            Endpoint::Service,
-            "/v1/accounts/attributes/",
+            Endpoint::service("/v1/accounts/attributes/"),
             HttpAuthOverride::NoOverride,
         )?
         .json(&attributes)