Nick Mathewson · Nick Mathewson · bd3f8a14 · 4c340178 · bd3f8a14 · e9fb6b6b
--- a/crates/tor-config/src/sources.rs
+++ b/crates/tor-config/src/sources.rs
                Ok(()) => {}
-                Err(fs_mistrust::Error::NotFound(_)) if !required => {}
-                Err(e) => return Err(foreign_err(e)),
+                Err(fs_mistrust::Error::NotFound(_)) if !required => {
+                    continue;
+                }
+                Err(e) => return Err(ConfigError::Permissions(e)),
            }

-            // Not going to use File::with_name here, since it doesn't
-            // quite do what we want.
-            let f: config::File<_, _> = file.into();
-            builder = builder.add_source(f.format(config::FileFormat::Toml).required(required));
+            // We need the path to be absolute here; since figment wants to look
+            // at all our parent directories.
+            // TODO Find a better way to disable this behavior?
--- a/crates/tor-config/src/sources.rs
+++ b/crates/tor-config/src/sources.rs
 /// You can make one out of a `PathBuf`, examining its syntax like `arti` does,
 /// using `ConfigurationSource::from_path`.
 #[derive(Clone, Debug, Eq, PartialEq, Hash, Ord, PartialOrd)]
-#[allow(clippy::exhaustive_enums)] // Callers will need to understand this
+#[allow(clippy::exhaustive_enums)]
 pub enum ConfigurationSource {
    /// A plain file
    File(PathBuf),

    /// A directory
    Dir(PathBuf),
+
+    /// A verbatim TOML file
+    Verbatim(Arc<String>),
--- a/crates/tor-config/src/err.rs
+++ b/crates/tor-config/src/err.rs
+/// An error that occurs while trying to read and process our configuration.
+#[derive(Debug, Clone, thiserror::Error)]
+#[non_exhaustive]
+pub enum ConfigError {
+    /// We encoundered a problem with file permissions.
+    #[error("Bad permissions on configuration file")]
+    Permissions(#[source] fs_mistrust::Error),
+    /// Our underlying configuration library gave an error.
+    #[error("Invalid configuration data")]
+    Parse(#[source] ConfigParseError),
+    /// Encountered an IO error while reading (or preparing to read) a file.
+    #[error("Unable to read configuration file {0:?}")]
+    Io(
+        Option<std::path::PathBuf>,
+        #[source] std::sync::Arc<std::io::Error>,
+    ),
--- a/crates/tor-config/src/lib.rs
+++ b/crates/tor-config/src/lib.rs
 #[doc(hidden)]
 pub use flatten::flattenable_extract_fields;

+/// A set of configuration fields, represented as a set of nested K=V
+/// mappings.
+///
+/// (This is a wrapper for an underlying type provided by the library that
+/// actually does our configuration.)
+#[derive(Clone, Debug)]
+pub struct ConfigurationFields(config::Config);
--- a/crates/tor-config/src/sources.rs
+++ b/crates/tor-config/src/sources.rs

    /// Add every file and commandline source to `builder`, returning a new
    /// builder.
-    fn add_sources(self, mut builder: ConfigBuilder) -> Result<ConfigBuilder, ConfigError> {
+    fn add_sources(self, mut builder: Figment) -> Result<Figment, ConfigError> {
+        use figment::providers::Format;
+
+        // Note that we're using `admerge` here.  It causes later sources' options
+        // to replace those in earlier sources, and causes arrays to be extended
+        // rather than replaces.
+        //
+        // TODO: Maybe we should use "merge" instead?  That does the same,
+        // except for the array behavior.