v0.28.0

src/settings/tests.rs

@@ -99,6 +99,36 @@ mod tests {
             .is_err());
     }
 
+    #[test]
+    fn explicit_startup_bind_replaces_canonical_saved_binding() {
+        let locks = StartupLocks {
+            http: Some("0.0.0.0:8181".parse().unwrap()),
+            https: Some("0.0.0.0:8443".parse().unwrap()),
+            administration: None,
+        };
+        let mut config = crate::config::Config::default();
+        config.listeners = Listeners::from_startup(
+            "0.0.0.0:80".parse().unwrap(),
+            Some("0.0.0.0:443".parse().unwrap()),
+        );
+        config.listeners.endpoints[0]
+            .additional_addresses
+            .push("127.0.0.1:80".parse().unwrap());
+        config.listeners.endpoints[1]
+            .additional_addresses
+            .push("127.0.0.1:443".parse().unwrap());
+
+        locks.ensure_config(&mut config);
+
+        let http = config.listeners.endpoints.iter().find(|item| item.id == "http").unwrap();
+        let https = config.listeners.endpoints.iter().find(|item| item.id == "https").unwrap();
+        assert_eq!(http.binding.address, "0.0.0.0:8181".parse().unwrap());
+        assert!(http.additional_addresses.is_empty());
+        assert_eq!(https.binding.address, "0.0.0.0:8443".parse().unwrap());
+        assert!(https.additional_addresses.is_empty());
+        assert!(!config.listeners.endpoints.iter().filter(|item| item.enabled).flat_map(|item| item.bindings()).any(|binding| binding.address.port() == 80 || binding.address.port() == 443));
+    }
+
     #[test]
     fn startup_defaults_become_named_listeners() {
         let saved = Listeners::from_startup(