filip/Stalwart
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

v0.14.0

Browse Source
This commit is contained in:
mdecimus
2025-10-22 18:02:46 +02:00
parent 49b384d740
commit 86c963ef68
27 changed files with 528 additions and 395 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
crates/migration/src/principal_v1.rs
View File

@@ -12,7 +12,7 @@ use crate::{
use common::Server;
use directory::{
Permission, Principal, PrincipalData, ROLE_ADMIN, ROLE_USER, Type,
backend::internal::{PrincipalField, PrincipalSet},
backend::internal::{PrincipalField, PrincipalSet, SpecialSecrets},
};
use nlp::tokenizers::word::WordTokenizer;
use std::{slice::Iter, time::Instant};
@@ -183,11 +183,19 @@ impl FromLegacy for Principal {
};
// Map fields
let mut has_secret = false;
for secret in legacy
.take_str_array(PrincipalField::Secrets)
.unwrap_or_default()
{
principal.data.push(PrincipalData::Secret(secret));
if secret.is_otp_secret() {
principal.data.push(PrincipalData::OtpAuth(secret));
} else if secret.is_app_secret() {
principal.data.push(PrincipalData::AppPassword(secret));
} else if !has_secret {
principal.data.push(PrincipalData::Password(secret));
has_secret = true;
}
}
for (idx, email) in legacy
.take_str_array(PrincipalField::Emails)
@@ -371,7 +379,7 @@ pub(crate) fn build_search_index(batch: &mut BatchBuilder, principal_id: u32, ne
for word in [Some(new.name.as_str()), new.description()]
.into_iter()
.chain(new.email_addresses().map(|s| Some(s.as_str())))
.chain(new.email_addresses().map(Some))
.flatten()
{
new_words.extend(WordTokenizer::new(word, MAX_TOKEN_LENGTH).map(|t| t.word));

12
crates/migration/src/principal_v2.rs
View File

@@ -7,7 +7,7 @@
use std::time::Instant;
use common::Server;
use directory::{Principal, PrincipalData, Type};
use directory::{Principal, PrincipalData, Type, backend::internal::SpecialSecrets};
use proc_macros::EnumMethods;
use store::{
Serialize, ValueKey,
@@ -59,8 +59,16 @@ pub(crate) async fn migrate_principals_v0_13(server: &Server) -> trc::Result<Roa
data: Vec::new(),
};
let mut has_secret = false;
for secret in old_principal.secrets {
principal.data.push(PrincipalData::Secret(secret));
if secret.is_otp_secret() {
principal.data.push(PrincipalData::OtpAuth(secret));
} else if secret.is_app_secret() {
principal.data.push(PrincipalData::AppPassword(secret));
} else if !has_secret {
principal.data.push(PrincipalData::Password(secret));
has_secret = true;
}
}
for (idx, email) in old_principal.emails.into_iter().enumerate() {