server: make host configurable to enable IPv6 support

This change also separates the API host and the LDAP host for further customization.
This commit is contained in:
Waldemar Heinze 2022-11-24 23:39:11 +01:00 committed by GitHub
parent dd7e392626
commit 2668ea4553
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 59 additions and 27 deletions

View File

@ -7,9 +7,21 @@
## You can set it with the LLDAP_VERBOSE environment variable. ## You can set it with the LLDAP_VERBOSE environment variable.
# verbose=false # verbose=false
## The host address that the LDAP server will be bound to.
## To enable IPv6 support, simply switch "ldap_host" to "::":
## To only allow connections from localhost (if you want to restrict to local self-hosted services),
## change it to "127.0.0.1" ("::1" in case of IPv6)".
#ldap_host = "0.0.0.0"
## The port on which to have the LDAP server. ## The port on which to have the LDAP server.
#ldap_port = 3890 #ldap_port = 3890
## The host address that the HTTP server will be bound to.
## To enable IPv6 support, simply switch "http_host" to "::".
## To only allow connections from localhost (if you want to restrict to local self-hosted services),
## change it to "127.0.0.1" ("::1" in case of IPv6)".
#http_host = "0.0.0.0"
## The port on which to have the HTTP server, for user login and ## The port on which to have the HTTP server, for user login and
## administration. ## administration.
#http_port = 17170 #http_port = 17170

View File

@ -54,10 +54,18 @@ pub struct RunOpts {
#[clap(long, env = "LLDAP_SERVER_KEY_FILE")] #[clap(long, env = "LLDAP_SERVER_KEY_FILE")]
pub server_key_file: Option<String>, pub server_key_file: Option<String>,
/// Change ldap host. Default: "0.0.0.0"
#[clap(long, env = "LLDAP_LDAP_HOST")]
pub ldap_host: Option<String>,
/// Change ldap port. Default: 3890 /// Change ldap port. Default: 3890
#[clap(long, env = "LLDAP_LDAP_PORT")] #[clap(long, env = "LLDAP_LDAP_PORT")]
pub ldap_port: Option<u16>, pub ldap_port: Option<u16>,
/// Change HTTP API host. Default: "0.0.0.0"
#[clap(long, env = "LLDAP_HTTP_HOST")]
pub http_host: Option<String>,
/// Change HTTP API port. Default: 17170 /// Change HTTP API port. Default: 17170
#[clap(long, env = "LLDAP_HTTP_PORT")] #[clap(long, env = "LLDAP_HTTP_PORT")]
pub http_port: Option<u16>, pub http_port: Option<u16>,

View File

@ -64,8 +64,12 @@ impl std::default::Default for LdapsOptions {
#[derive(Clone, Debug, Deserialize, Serialize, derive_builder::Builder)] #[derive(Clone, Debug, Deserialize, Serialize, derive_builder::Builder)]
#[builder(pattern = "owned", build_fn(name = "private_build"))] #[builder(pattern = "owned", build_fn(name = "private_build"))]
pub struct Configuration { pub struct Configuration {
#[builder(default = r#"String::from("0.0.0.0")"#)]
pub ldap_host: String,
#[builder(default = "3890")] #[builder(default = "3890")]
pub ldap_port: u16, pub ldap_port: u16,
#[builder(default = r#"String::from("0.0.0.0")"#)]
pub http_host: String,
#[builder(default = "17170")] #[builder(default = "17170")]
pub http_port: u16, pub http_port: u16,
#[builder(default = r#"SecUtf8::from("secretjwtsecret")"#)] #[builder(default = r#"SecUtf8::from("secretjwtsecret")"#)]

View File

@ -177,7 +177,7 @@ where
info!("Starting the LDAP server on port {}", config.ldap_port); info!("Starting the LDAP server on port {}", config.ldap_port);
let server_builder = server_builder let server_builder = server_builder
.bind("ldap", ("0.0.0.0", config.ldap_port), binder) .bind("ldap", (config.ldap_host.clone(), config.ldap_port), binder)
.with_context(|| format!("while binding to the port {}", config.ldap_port)); .with_context(|| format!("while binding to the port {}", config.ldap_port));
if config.ldaps_options.enabled { if config.ldaps_options.enabled {
let tls_context = ( let tls_context = (
@ -212,7 +212,11 @@ where
config.ldaps_options.port config.ldaps_options.port
); );
server_builder.and_then(|s| { server_builder.and_then(|s| {
s.bind("ldaps", ("0.0.0.0", config.ldaps_options.port), tls_binder) s.bind(
"ldaps",
(config.ldap_host.clone(), config.ldaps_options.port),
tls_binder,
)
.with_context(|| format!("while binding to the port {}", config.ldaps_options.port)) .with_context(|| format!("while binding to the port {}", config.ldaps_options.port))
}) })
} else { } else {

View File

@ -129,7 +129,10 @@ where
let mail_options = config.smtp_options.clone(); let mail_options = config.smtp_options.clone();
info!("Starting the API/web server on port {}", config.http_port); info!("Starting the API/web server on port {}", config.http_port);
server_builder server_builder
.bind("http", ("0.0.0.0", config.http_port), move || { .bind(
"http",
(config.http_host.clone(), config.http_port),
move || {
let backend_handler = backend_handler.clone(); let backend_handler = backend_handler.clone();
let jwt_secret = jwt_secret.clone(); let jwt_secret = jwt_secret.clone();
let jwt_blacklist = jwt_blacklist.clone(); let jwt_blacklist = jwt_blacklist.clone();
@ -152,7 +155,8 @@ where
|_| AppConfig::default(), |_| AppConfig::default(),
)) ))
.tcp() .tcp()
}) },
)
.with_context(|| { .with_context(|| {
format!( format!(
"While bringing up the TCP server with port {}", "While bringing up the TCP server with port {}",