commit f9cb8cda799f73f2f11d9577b6e04eb17ca23c88
author heartsucker <heartsucker@autistici.org> Sat Jul 15 10:48:27 2017 +0200
committer heartsucker <heartsucker@autistici.org> Sat Jul 15 10:48:27 2017 +0200
tree 88d9b2351918f9e3bcb8b88ea2d650f0fc449e72
parent 977f266fd4aefbe230748c259e7202329dad93cf

added optional metadata prefix to http repos

fixes #69

src/lib.rs

diff --git a/src/lib.rs b/src/lib.rs
index 50da159..dd4a2fc 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -41,7 +41,8 @@
 //!     let mut remote = HttpRepository::new(
 //!         Url::parse("https://static.rust-lang.org/").unwrap(),
 //!         HttpClient::new(),
-//!         Some("rustup/1.4.0".into()));
+//!         Some("rustup/1.4.0".into()),
+//!         None);
 //!
 //!     let config = Config::build().finish().unwrap();
 //!

src/repository.rs

diff --git a/src/repository.rs b/src/repository.rs
index 6e5808f..d604956 100644
--- a/src/repository.rs
+++ b/src/repository.rs
@@ -299,6 +299,7 @@
     url: Url,
     client: Client,
     user_agent: String,
+    metadata_prefix: Option<Vec<String>>,
     _interchange: PhantomData<D>,
 }
 
@@ -306,10 +307,17 @@
 where
     D: DataInterchange,
 {
-    /// Create a new repository with the given `Url` and `Client`. Callers *should* include a
-    /// custom User-Agent prefix to help maintainers of TUF repositories keep track of which client
-    /// versions exist in the field.
-    pub fn new(url: Url, client: Client, user_agent_prefix: Option<String>) -> Self {
+    /// Create a new repository with the given `Url` and `Client`.
+    ///
+    /// Callers *should* include a custom User-Agent prefix to help maintainers of TUF repositories
+    /// keep track of which client versions exist in the field.
+    ///
+    /// The argument `metadata_prefix` is used provide an alternate path where metadata is stored on
+    /// the repository. If `None`, this defaults to `/`. For example, if there is a TUF repository
+    /// at `https://tuf.example.comi/`, but all metadata is stored at `/meta/`, then passing the
+    /// arg `Some("meta".into())` would cause `root.json` to be fetched from
+    /// `https://tuf.example.com/meta/root.json`.
+    pub fn new(url: Url, client: Client, user_agent_prefix: Option<String>, metadata_prefix: Option<Vec<String>>) -> Self {
         let user_agent = match user_agent_prefix {
             Some(ua) => format!("{} (rust-tuf/{})", ua, env!("CARGO_PKG_VERSION")),
             None => format!("rust-tuf/{}", env!("CARGO_PKG_VERSION")),
@@ -319,20 +327,26 @@
             url: url,
             client: client,
             user_agent: user_agent,
+            metadata_prefix: metadata_prefix,
             _interchange: PhantomData,
         }
     }
 
-    fn get(&self, components: &[String]) -> Result<Response> {
+    fn get(&self, prefix: &Option<Vec<String>>, components: &[String]) -> Result<Response> {
         let mut headers = Headers::new();
         headers.set(UserAgent(self.user_agent.clone()));
 
         let mut url = self.url.clone();
-        url.path_segments_mut()
-            .map_err(|_| {
-                Error::IllegalArgument(format!("URL was 'cannot-be-a-base': {:?}", self.url))
-            })?
-            .extend(components);
+        {
+            let mut segments = url.path_segments_mut()
+                .map_err(|_| {
+                    Error::IllegalArgument(format!("URL was 'cannot-be-a-base': {:?}", self.url))
+                })?;
+            if let &Some(ref prefix) = prefix {
+                segments.extend(prefix);
+            }
+            segments.extend(components);
+        }
 
         let req = self.client.get(url.clone()).headers(headers);
         let resp = req.send()?;
@@ -390,7 +404,7 @@
     {
         Self::check::<M>(role, meta_path)?;
 
-        let mut resp = self.get(&meta_path.components::<D>(&version))?;
+        let mut resp = self.get(&self.metadata_prefix, &meta_path.components::<D>(&version))?;
         let mut out = Vec::new();
         Self::safe_read(&mut resp, &mut out, max_size.map(|x| x as u64), hash_data)?;
         Ok(D::from_reader(&*out)?)
@@ -407,7 +421,7 @@
     }
 
     fn fetch_target(&mut self, target_path: &TargetPath) -> Result<Self::TargetRead> {
-        let resp = self.get(&target_path.components())?;
+        let resp = self.get(&None, &target_path.components())?;
         Ok(resp)
     }
 }