Registry index URLs resolved relative to config path.

Author: Alex Helfet

src/cargo/ops/registry.rs

@@ -324,9 +324,9 @@ pub fn registry_configuration(
             )
         }
         None => {
-            // Checking out for default index and token
+            // Checking for default index and token
             (
-                config.get_string("registry.index")?.map(|p| p.val),
+                config.get_default_registry_index()?.map(|url| url.to_string()),
                 config.get_string("registry.token")?.map(|p| p.val),
             )
         }

src/cargo/util/config.rs

@@ -29,7 +29,7 @@ use crate::util::errors::{self, internal, CargoResult, CargoResultExt};
 use crate::util::toml as cargo_toml;
 use crate::util::Filesystem;
 use crate::util::Rustc;
-use crate::util::ToUrl;
+use crate::util::ToUrlWithBase;
 use crate::util::{paths, validate_package_name};
 
 /// Configuration information for cargo. This is not specific to a build, it is information
@@ -667,18 +667,31 @@ impl Config {
         validate_package_name(registry, "registry name", "")?;
         Ok(
             match self.get_string(&format!("registries.{}.index", registry))? {
-                Some(index) => {
-                    let url = index.val.to_url()?;
-                    if url.password().is_some() {
-                        failure::bail!("Registry URLs may not contain passwords");
-                    }
-                    url
-                }
+                Some(index) => self.resolve_registry_index(index)?,
                 None => failure::bail!("No index found for registry: `{}`", registry),
             },
         )
     }
 
+    /// Gets the index for the default registry.
+    pub fn get_default_registry_index(&self) -> CargoResult<Option<Url>> {
+        Ok(
+            match self.get_string("registry.index")? {
+                Some(index) => Some(self.resolve_registry_index(index)?),
+                None => None,
+            },
+        )
+    }
+
+    fn resolve_registry_index(&self, index: Value<String>) -> CargoResult<Url> {
+        let base = index.definition.root(&self);
+        let url = index.val.to_url_with_base(Some(base))?;
+        if url.password().is_some() {
+            failure::bail!("Registry URLs may not contain passwords");
+        }
+        Ok(url)
+    }
+
     /// Loads credentials config from the credentials file into the `ConfigValue` object, if
     /// present.
     fn load_credentials(&self, cfg: &mut ConfigValue) -> CargoResult<()> {
@@ -1648,3 +1661,4 @@ pub fn save_credentials(cfg: &Config, token: String, registry: Option<String>) -
         Ok(())
     }
 }
+

src/cargo/util/to_url.rs

@@ -1,4 +1,4 @@
-use std::path::Path;
+use std::path::{Path, PathBuf};
 
 use url::Url;
 
@@ -22,3 +22,9 @@ impl<'a> ToUrl for &'a Path {
             .map_err(|()| failure::format_err!("invalid path url `{}`", self.display()))
     }
 }
+
+impl<'a> ToUrl for &'a PathBuf {
+    fn to_url(self) -> CargoResult<Url> {
+        self.as_path().to_url()
+    }
+}