From 3077890c2266f196ec15a92b254a98187b8d02b6 Mon Sep 17 00:00:00 2001
From: Waldemar Heinze <mail@wheinze.dev>
Date: Thu, 24 Nov 2022 01:37:09 +0100
Subject: [PATCH] feat: make `host` configurable to enable IPv6 support

---
 lldap_config.docker_template.toml | 4 ++++
 server/src/infra/configuration.rs | 2 ++
 server/src/infra/ldap_server.rs   | 4 ++--
 server/src/infra/tcp_server.rs    | 2 +-
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/lldap_config.docker_template.toml b/lldap_config.docker_template.toml
index 9ab45ec..78c1cb8 100644
--- a/lldap_config.docker_template.toml
+++ b/lldap_config.docker_template.toml
@@ -7,6 +7,10 @@
 ## You can set it with the LLDAP_VERBOSE environment variable.
 # verbose=false
 
+## The host address that the LDAP server will be bound to.
+## To enable IPv6 support, simply switch "host" to "::1":
+#host = "0.0.0.0"
+
 ## The port on which to have the LDAP server.
 #ldap_port = 3890
 
diff --git a/server/src/infra/configuration.rs b/server/src/infra/configuration.rs
index 63bce2f..ffb2b54 100644
--- a/server/src/infra/configuration.rs
+++ b/server/src/infra/configuration.rs
@@ -66,6 +66,8 @@ impl std::default::Default for LdapsOptions {
 pub struct Configuration {
     #[builder(default = "3890")]
     pub ldap_port: u16,
+    #[builder(default = r#"String::from("0.0.0.0")"#)]
+    pub host: String,
     #[builder(default = "17170")]
     pub http_port: u16,
     #[builder(default = r#"SecUtf8::from("secretjwtsecret")"#)]
diff --git a/server/src/infra/ldap_server.rs b/server/src/infra/ldap_server.rs
index 9cc2899..ec9e96f 100644
--- a/server/src/infra/ldap_server.rs
+++ b/server/src/infra/ldap_server.rs
@@ -177,7 +177,7 @@ where
 
     info!("Starting the LDAP server on port {}", config.ldap_port);
     let server_builder = server_builder
-        .bind("ldap", ("0.0.0.0", config.ldap_port), binder)
+        .bind("ldap", (config.host.clone(), config.ldap_port), binder)
         .with_context(|| format!("while binding to the port {}", config.ldap_port));
     if config.ldaps_options.enabled {
         let tls_context = (
@@ -212,7 +212,7 @@ where
             config.ldaps_options.port
         );
         server_builder.and_then(|s| {
-            s.bind("ldaps", ("0.0.0.0", config.ldaps_options.port), tls_binder)
+            s.bind("ldaps", (config.host.clone(), config.ldaps_options.port), tls_binder)
                 .with_context(|| format!("while binding to the port {}", config.ldaps_options.port))
         })
     } else {
diff --git a/server/src/infra/tcp_server.rs b/server/src/infra/tcp_server.rs
index 76772ea..fc440a8 100644
--- a/server/src/infra/tcp_server.rs
+++ b/server/src/infra/tcp_server.rs
@@ -129,7 +129,7 @@ where
     let mail_options = config.smtp_options.clone();
     info!("Starting the API/web server on port {}", config.http_port);
     server_builder
-        .bind("http", ("0.0.0.0", config.http_port), move || {
+        .bind("http", (config.host.clone(), config.http_port), move || {
             let backend_handler = backend_handler.clone();
             let jwt_secret = jwt_secret.clone();
             let jwt_blacklist = jwt_blacklist.clone();