bug: allow APNS env credentials to include serialized keys

Closes #240
mozilla-services · Nov 30, 2020 · 72f8209 · AzureMarker · Dec 1, 2020 · 72f8209
1 parent 9a88141
commit 72f8209
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 19 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/autoendpoint/Cargo.toml b/autoendpoint/Cargo.toml
@@ -36,7 +36,7 @@ reqwest = "0.10.6"
 rusoto_core = "0.45.0"
 rusoto_dynamodb = "0.45.0"
 # Using debug-logs avoids https://github.com/getsentry/sentry-rust/issues/237
-sentry = { version = "0.21", features = ["debug-logs"] }
+sentry = { version = "0.20", features = ["debug-logs"] }
 serde = { version = "1.0", features = ["derive"] }
 serde_dynamodb = "0.6"
 serde_json = "1.0"

diff --git a/autoendpoint/src/routers/apns/router.rs b/autoendpoint/src/routers/apns/router.rs
@@ -82,12 +82,12 @@ impl ApnsRouter {
         } else {
             Endpoint::Production
         };
-        let cert = if settings.cert.starts_with('/') {
+        let cert = if !settings.cert.starts_with('-') {
             tokio::fs::read(settings.cert).await?
         } else {
             settings.cert.as_bytes().to_vec()
         };
-        let key = if settings.key.starts_with('/') {
+        let key = if !settings.key.starts_with('-') {
             tokio::fs::read(settings.key).await?
         } else {
             settings.key.as_bytes().to_vec()

diff --git a/autoendpoint/src/routers/apns/settings.rs b/autoendpoint/src/routers/apns/settings.rs
@@ -1,5 +1,4 @@
 use std::collections::HashMap;
-use std::path::PathBuf;
 
 /// Settings for `ApnsRouter`
 #[derive(Clone, Debug, serde::Deserialize)]

diff --git a/autoendpoint/src/settings.rs b/autoendpoint/src/settings.rs
@@ -68,7 +68,9 @@ impl Settings {
         }
 
         // Merge the environment overrides
-        config.merge(Environment::with_prefix(ENV_PREFIX))?;
+        // Note: Specify the separator here so that the shell can properly pass args
+        // down to the sub structures.
+        config.merge(Environment::with_prefix(ENV_PREFIX).separator("__"))?;
 
         config.try_into::<Self>().map_err(|error| match error {
             // Configuration errors are not very sysop friendly, Try to make them