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

Internal directory implementation + Management REST API

Browse Source
This commit is contained in:
mdecimus
2023-12-16 10:35:15 +01:00
parent f21bce722e
commit 232d4d691a
64 changed files with 1933 additions and 621 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/src/smtp/inbound/auth.rs
View File

@@ -62,7 +62,7 @@ async fn auth() {
let mut ctx = ConfigContext::new(&[]);
ctx.directory = Config::new(DIRECTORY)
.unwrap()
.parse_directory(&Stores::default())
.parse_directory(&Stores::default(), None)
.unwrap();
let config = &mut core.session.config.auth;

2
tests/src/smtp/inbound/data.rs
View File

@@ -80,7 +80,7 @@ async fn data() {
let mut qr = core.init_test_queue("smtp_data_test");
let directory = Config::new(DIRECTORY)
.unwrap()
.parse_directory(&Stores::default())
.parse_directory(&Stores::default(), None)
.unwrap();
let config = &mut core.session.config.rcpt;
config.directory = IfBlock::new(Some(MaybeDynValue::Static(

2
tests/src/smtp/inbound/dmarc.rs
View File

@@ -135,7 +135,7 @@ async fn dmarc() {
let mut rr = core.init_test_report();
let directory = Config::new(DIRECTORY)
.unwrap()
.parse_directory(&Stores::default())
.parse_directory(&Stores::default(), None)
.unwrap();
let config = &mut core.session.config.rcpt;
config.directory = IfBlock::new(Some(MaybeDynValue::Static(

2
tests/src/smtp/inbound/rcpt.rs
View File

@@ -74,7 +74,7 @@ async fn rcpt() {
let config_ext = &mut core.session.config.extensions;
let directory = Config::new(DIRECTORY)
.unwrap()
.parse_directory(&Stores::default())
.parse_directory(&Stores::default(), None)
.unwrap();
let config = &mut core.session.config.rcpt;
config.directory = IfBlock::new(Some(MaybeDynValue::Static(

2
tests/src/smtp/inbound/rewrite.rs
View File

@@ -104,7 +104,7 @@ async fn address_rewrite() {
let mut core = SMTP::test();
let mut ctx = ConfigContext::new(&[]).parse_signatures();
let settings = Config::new(CONFIG).unwrap();
ctx.directory = settings.parse_directory(&Stores::default()).unwrap();
ctx.directory = settings.parse_directory(&Stores::default(), None).unwrap();
core.sieve = settings.parse_sieve(&mut ctx).unwrap();
let config = &mut core.session.config;
config.mail.script = settings

2
tests/src/smtp/inbound/scripts.rs
View File

@@ -135,7 +135,7 @@ async fn sieve_scripts() {
)
.unwrap();
ctx.stores = config.parse_stores().await.unwrap();
ctx.directory = config.parse_directory(&ctx.stores).unwrap();
ctx.directory = config.parse_directory(&ctx.stores, None).unwrap();
let pipes = config.parse_pipes(&ctx, &[EnvelopeKey::RemoteIp]).unwrap();
core.sieve = config.parse_sieve(&mut ctx).unwrap();
let config = &mut core.session.config;

2
tests/src/smtp/inbound/sign.rs
View File

@@ -154,7 +154,7 @@ async fn sign_and_seal() {
let directory = Config::new(DIRECTORY)
.unwrap()
.parse_directory(&Stores::default())
.parse_directory(&Stores::default(), None)
.unwrap();
let config = &mut core.session.config.rcpt;
config.directory = IfBlock::new(Some(MaybeDynValue::Static(

2
tests/src/smtp/inbound/vrfy.rs
View File

@@ -68,7 +68,7 @@ async fn vrfy_expn() {
let directory = Config::new(DIRECTORY)
.unwrap()
.parse_directory(&Stores::default())
.parse_directory(&Stores::default(), None)
.unwrap();
let config = &mut core.session.config.rcpt;
config.directory = IfBlock::new(Some(MaybeDynValue::Static(

2
tests/src/smtp/lookup/sql.rs
View File

@@ -87,7 +87,7 @@ async fn lookup_sql() {
let mut ctx = ConfigContext::new(&[]);
let config = Config::new(&config_file).unwrap();
ctx.stores = config.parse_stores().await.unwrap();
ctx.directory = config.parse_directory(&ctx.stores).unwrap();
ctx.directory = config.parse_directory(&ctx.stores, None).unwrap();
// Obtain directory handle
let handle = DirectoryStore {

2
tests/src/smtp/management/queue.rs
View File

@@ -98,7 +98,7 @@ async fn manage_queue() {
// Start local management interface
let directory = Config::new(DIRECTORY)
.unwrap()
.parse_directory(&Stores::default())
.parse_directory(&Stores::default(), None)
.unwrap();
core.queue.config.management_lookup = directory.directories.get("local").unwrap().clone();
core.session.config.rcpt.relay = IfBlock::new(true);

2
tests/src/smtp/management/report.rs
View File

@@ -85,7 +85,7 @@ async fn manage_reports() {
config.tls.max_size = IfBlock::new(1024);
let directory = Config::new(DIRECTORY)
.unwrap()
.parse_directory(&Stores::default())
.parse_directory(&Stores::default(), None)
.unwrap();
core.queue.config.management_lookup = directory.directories.get("local").unwrap().clone();
let (report_tx, report_rx) = mpsc::channel(1024);