+ Implement support for setting listening ports in config (fixes #9)

Author: chrivers

doc/config-reference.md

@@ -33,6 +33,18 @@ bridge:
   gateway: 10.0.0.1
   timezone: Europe/Copenhagen
 
+  # http port for emulated bridge
+  #
+  # beware: most client programs do NOT support non-standard ports.
+  # This is for advanced users (e.g. bifrost behind a reverse proxy)
+  http_port: 80
+
+  # https port for emulated bridge
+  #
+  # beware: most client programs do NOT support non-standard ports.
+  # This is for advanced users (e.g. bifrost behind a reverse proxy)
+  https_port: 443
+
 # Zigbee2mqtt section
 #
 # Make a sub-section for each zigbee2mqtt server you want to connect

src/config.rs

@@ -12,6 +12,8 @@ pub struct BridgeConfig {
     pub name: String,
     pub mac: MacAddress,
     pub ipaddress: Ipv4Addr,
+    pub http_port: u16,
+    pub https_port: u16,
     pub netmask: Ipv4Addr,
     pub gateway: Ipv4Addr,
     pub timezone: String,
@@ -53,6 +55,8 @@ pub fn parse(filename: &Utf8Path) -> Result<AppConfig, ConfigError> {
     let settings = Config::builder()
         .set_default("bifrost.state_file", "state.yaml")?
         .set_default("bifrost.cert_file", "cert.pem")?
+        .set_default("bridge.http_port", 80)?
+        .set_default("bridge.https_port", 443)?
         .add_source(config::File::with_name(filename.as_str()))
         .build()?;
 

src/main.rs

@@ -69,8 +69,17 @@ async fn build_tasks(appstate: AppState) -> ApiResult<JoinSet<ApiResult<()>>> {
     let tls_config = appstate.tls_config().await?;
     let state_file = appstate.config().bifrost.state_file.clone();
 
-    tasks.spawn(server::http_server(bconf.ipaddress, svc.clone()));
-    tasks.spawn(server::https_server(bconf.ipaddress, svc, tls_config));
+    tasks.spawn(server::http_server(
+        bconf.ipaddress,
+        bconf.http_port,
+        svc.clone(),
+    ));
+    tasks.spawn(server::https_server(
+        bconf.ipaddress,
+        bconf.https_port,
+        svc,
+        tls_config,
+    ));
     tasks.spawn(server::config_writer(appstate.res.clone(), state_file));
 
     for (name, server) in &appstate.config().z2m.servers {

src/server/mod.rs

@@ -61,25 +61,30 @@ pub fn build_service(appstate: AppState) -> IntoMakeService<NormalizePath<Router
     ServiceExt::<Request>::into_make_service(normalized)
 }
 
-pub async fn http_server<S>(listen_addr: Ipv4Addr, svc: S) -> ApiResult<()>
+pub async fn http_server<S>(listen_addr: Ipv4Addr, listen_port: u16, svc: S) -> ApiResult<()>
 where
     S: Send + MakeService<SocketAddr, Request<Incoming>>,
     S::MakeFuture: Send,
 {
-    let addr = SocketAddr::from((listen_addr, 80));
+    let addr = SocketAddr::from((listen_addr, listen_port));
     log::info!("http listening on {}", addr);
 
     axum_server::bind(addr).serve(svc).await?;
 
     Ok(())
 }
 
-pub async fn https_server<S>(listen_addr: Ipv4Addr, svc: S, config: RustlsConfig) -> ApiResult<()>
+pub async fn https_server<S>(
+    listen_addr: Ipv4Addr,
+    listen_port: u16,
+    svc: S,
+    config: RustlsConfig,
+) -> ApiResult<()>
 where
     S: Send + MakeService<SocketAddr, Request<Incoming>>,
     S::MakeFuture: Send,
 {
-    let addr = SocketAddr::from((listen_addr, 443));
+    let addr = SocketAddr::from((listen_addr, listen_port));
     log::info!("https listening on {}", addr);
 
     axum_server::bind_rustls(addr, config).serve(svc).await?;