Sieve script import case insensitiviy (fixes #962)
This commit is contained in:
@@ -179,7 +179,8 @@ impl SieveScriptIngest for Server {
|
||||
}
|
||||
}
|
||||
sieve::Script::Global(name_) => {
|
||||
if let Some(script) = self.get_untrusted_sieve_script(name_, session_id)
|
||||
if let Some(script) =
|
||||
self.get_untrusted_sieve_script(&name_.to_lowercase(), session_id)
|
||||
{
|
||||
input = Input::script(name, script.clone());
|
||||
} else {
|
||||
|
||||
@@ -78,7 +78,8 @@ impl RunScript for Server {
|
||||
match result {
|
||||
Ok(event) => match event {
|
||||
Event::IncludeScript { name, optional } => {
|
||||
if let Some(script) = self.core.sieve.trusted_scripts.get(name.as_str()) {
|
||||
let name_ = name.as_str().to_lowercase();
|
||||
if let Some(script) = self.core.sieve.trusted_scripts.get(&name_) {
|
||||
input = Input::script(name, script.clone());
|
||||
} else if optional {
|
||||
input = false.into();
|
||||
@@ -87,7 +88,7 @@ impl RunScript for Server {
|
||||
Sieve(SieveEvent::ScriptNotFound),
|
||||
Id = script_id.clone(),
|
||||
SpanId = session_id,
|
||||
Details = name.as_str().to_string(),
|
||||
Details = name_,
|
||||
);
|
||||
break;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user