stalwartlabs/mail-server
1
1
Fork 0
mirror of https://github.com/stalwartlabs/mail-server.git synced 2024-09-20 07:16:18 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix: Local keys settings parsed incorrectly

Browse source
This commit is contained in:
mdecimus 2024-09-09 16:30:05 +02:00
parent 3912fd0084
commit 1e0bde1008
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
crates/common/src/manager/config.rs
View file

@ -34,11 +34,13 @@ pub struct Patterns {
patterns: Vec<Pattern>,
}
#[derive(Debug)]
enum Pattern {
Include(MatchType),
Exclude(MatchType),
}
#[derive(Debug)]
enum MatchType {
Equal(String),
StartsWith(String),
@ -469,9 +471,9 @@ impl Patterns {
}
let match_type = if value == "*" {
MatchType::All
} else if let Some(value) = value.strip_prefix('*') {
MatchType::StartsWith(value.to_string())
} else if let Some(value) = value.strip_suffix('*') {
MatchType::StartsWith(value.to_string())
} else if let Some(value) = value.strip_prefix('*') {
MatchType::EndsWith(value.to_string())
} else if value.contains('*') {
MatchType::Matches(GlobPattern::compile(&value, false))
@ -485,6 +487,7 @@ impl Patterns {
Pattern::Exclude(match_type)
});
}
if cfg_local_patterns.is_empty() {
cfg_local_patterns = vec![
Pattern::Include(MatchType::StartsWith("store.".to_string())),
@ -494,6 +497,7 @@ impl Patterns {
Pattern::Exclude(MatchType::StartsWith("server.allowed-ip.".to_string())),
Pattern::Include(MatchType::StartsWith("server.".to_string())),
Pattern::Include(MatchType::StartsWith("certificate.".to_string())),
Pattern::Include(MatchType::StartsWith("config.local-keys.".to_string())),
Pattern::Include(MatchType::StartsWith(
"authentication.fallback-admin.".to_string(),
)),