From 2acc89cea40208e30a2d8ea676e5bdff23dd7a22 Mon Sep 17 00:00:00 2001 From: mdecimus Date: Thu, 7 Nov 2024 16:29:42 +0100 Subject: [PATCH] v0.1.19 --- CHANGELOG.md | 9 +++++++++ Cargo.lock | 2 +- Cargo.toml | 2 +- src/components/messages/alert.rs | 2 +- src/pages/config/schema/directory.rs | 19 ++++++++++++++++++- src/pages/config/schema/server.rs | 20 +++++++++++++++++--- 6 files changed, 47 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 693bc48..c90fa5a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,15 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). +## [0.1.19] - 2024-11-07 + +## Added +- `bind.auth.search` and `enterprise.api-key` settings. + +### Changed + +### Fixed + ## [0.1.18] - 2024-10-08 ## Added diff --git a/Cargo.lock b/Cargo.lock index 569adef..9fdd920 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2387,7 +2387,7 @@ dependencies = [ [[package]] name = "webadmin" -version = "0.1.18" +version = "0.1.19" dependencies = [ "ahash", "base64", diff --git a/Cargo.toml b/Cargo.toml index e6dabbd..9c70198 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,7 +7,7 @@ homepage = "https://stalw.art" keywords = ["web", "admin", "email", "mail", "server"] categories = ["email"] license = "AGPL-3.0-only OR LicenseRef-SEL" -version = "0.1.18" +version = "0.1.19" edition = "2021" resolver = "2" diff --git a/src/components/messages/alert.rs b/src/components/messages/alert.rs index 50b18f0..3baf4f2 100644 --- a/src/components/messages/alert.rs +++ b/src/components/messages/alert.rs @@ -289,7 +289,7 @@ impl From for Alert {
{"This feature is only available in the enterprise version of the software. "} diff --git a/src/pages/config/schema/directory.rs b/src/pages/config/schema/directory.rs index 63106d2..3471487 100644 --- a/src/pages/config/schema/directory.rs +++ b/src/pages/config/schema/directory.rs @@ -258,6 +258,17 @@ impl Builder { .placeholder("cn=?,ou=svcaccts,dc=example,dc=org") .input_check([Transformer::Trim], [Validator::Required]) .build() + .new_field("bind.auth.search") + .label("Use Auth DN for search") + .help(concat!( + "Weather to perform LDAP searches with the bind auth DN connection. ", + "If disabled, LDAP searches will be done using a separate connection ", + "using the default Bind DN." + )) + .typ(Type::Boolean) + .display_if_eq("bind.auth.enable", ["true"]) + .default("true") + .build() .new_field("filter.name") .display_if_eq("type", ["ldap"]) .input_check([Transformer::Trim], [Validator::Required]) @@ -478,7 +489,13 @@ impl Builder { .new_form_section() .title("Binding") .display_if_eq("type", ["ldap"]) - .fields(["bind.dn", "bind.secret", "bind.auth.enable", "bind.auth.dn"]) + .fields([ + "bind.dn", + "bind.secret", + "bind.auth.enable", + "bind.auth.dn", + "bind.auth.search", + ]) .build() .new_form_section() .title("TLS") diff --git a/src/pages/config/schema/server.rs b/src/pages/config/schema/server.rs index 347e853..048d9aa 100644 --- a/src/pages/config/schema/server.rs +++ b/src/pages/config/schema/server.rs @@ -568,7 +568,17 @@ impl Builder { .label("License Key") .help(concat!( "Upgrade to the enterprise version of Stalwart by ", - "entering your license key here." + "entering your license key here. Obtain your license at ", + "https://license.stalw.art/buy" + )) + .typ(Type::Secret) + .input_check([Transformer::Trim], []) + .build() + .new_field("enterprise.api-key") + .label("API Key") + .help(concat!( + "API key for license retrieval and automatic renewals. ", + "Obtain your API key at https://license.stalw.art.", )) .typ(Type::Secret) .input_check([Transformer::Trim], []) @@ -584,8 +594,12 @@ impl Builder { .enterprise_feature() .build() .new_form_section() - .title("Enterprise") - .fields(["enterprise.license-key", "enterprise.logo-url"]) + .title("Licensing") + .fields(["enterprise.license-key", "enterprise.api-key"]) + .build() + .new_form_section() + .title("Branding") + .fields(["enterprise.logo-url"]) .build() .build() // Contact form settings