v0.1.19

stalwartlabs · Nov 7, 2024 · 2acc89c · 2acc89c
1 parent aec2a73
commit 2acc89c
Show file tree

Hide file tree

Showing 6 changed files with 47 additions and 7 deletions.
diff --git 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
diff --git 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
@@ -289,7 +289,7 @@ impl From<http::Error> for Alert {
                                     <div>
                                         {"This feature is only available in the enterprise version of the software. "}
                                         <a
-                                            href="https://stalw.art/contact/"
+                                            href="https://license.stalw.art/trial/"
                                             class="text-yellow-800 underline decoration-yellow-800 hover:opacity-80 focus:outline-none focus:opacity-80"
                                             target="_blank"
                                         >

diff --git a/src/pages/config/schema/directory.rs b/src/pages/config/schema/directory.rs
@@ -258,6 +258,17 @@ impl Builder<Schemas, ()> {
             .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<Schemas, ()> {
             .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
@@ -568,7 +568,17 @@ impl Builder<Schemas, ()> {
             .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<Schemas, ()> {
             .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