Audit mail sent from an address that isn't the sender's own
ci / github (pull_request) Skipped
ci / fork-checks (pull_request) Successful in 48s
ci / build (pull_request) Successful in 8m50s
github/ci (branch) GitHub Actions

A group's members can send as the group, and the message says only
From: the group, so nothing recorded which person sent it. Every
submission whose envelope sender belongs to another account now writes
an audit record: the person as actor, an EmailSubmission target named
by the address and owned by that account, and "Sent as <address>",
with ", from <account>" when it went out through the sender's own
account rather than the group's.

A delegate's send is left to AL-9's record, and a send from the
sender's own address writes nothing. No Sender: header is added: the
audit log is where the real sender is named. email_submission_set now
takes the access token, from its one caller.

The audit suite has a group member send once as the group (one
record, with the address, account and details) and once as themselves
(none) (specs/multi-account.md, MA-D0a, G2).
This commit is contained in:
jcoffey-dev committed 2026-10-05 14:07:25 -07:00
1 parent d7bebd454d
commit 76c170db9d
4 files changed
+165 -1

No files matched your search

+100
View File
@@ -540,10 +540,110 @@ pub async fn test(test: &mut TestServer) {
"AU-7: continued"
);
// MA-D0a: a group member sending as the group is named in the log; the
// same person sending as themselves isn't recorded
let group = admin
.create_group_account("[email protected]", "Help desk", &[])
.await;
let agent = admin
.create_user_account(
"[email protected]",
"agent-secret-for-send-as",
"Agent",
&[],
vec![],
)
.await;
admin
.registry_update_object(
ObjectType::Account,
agent.id(),
json!({"memberGroupIds": {group.id_string(): true}}),
)
.await;
agent.send_as("[email protected]").await;
agent.send_as("[email protected]").await;
let sends = admin
.audit(json!({
"targetKind": "EmailSubmission",
"actorId": agent.id_string(),
}))
.await;
assert_eq!(sends.len(), 1, "MA-D0a: {sends:?}");
assert_eq!(sends[0]["target"]["name"], "[email protected]");
assert_eq!(
sends[0]["target"]["accountId"],
group.id_string(),
"MA-D0a: {}",
sends[0]
);
assert_eq!(
sends[0]["details"],
"Sent as [email protected], from [email protected]"
);
// Clean up what later suites could trip over
admin.registry_destroy_all(ObjectType::BlockedIp).await;
}
impl Account {
/// Sends one message to itself from its own account, as `from`.
async fn send_as(&self, from: &str) {
const USING: &[&str] = &[
"urn:ietf:params:jmap:core",
"urn:ietf:params:jmap:mail",
"urn:ietf:params:jmap:submission",
];
let account_id = self.id_string();
let response = self
.jmap_request(
USING,
json!([
["Identity/get", {"accountId": account_id}, "i"],
["Mailbox/get", {"accountId": account_id, "properties": ["role"]}, "m"]
]),
)
.await;
let identity = response
.0
.pointer("/methodResponses/0/1/list")
.and_then(Value::as_array)
.and_then(|list| list.iter().find(|identity| identity["email"] == from))
.unwrap_or_else(|| panic!("no identity for {from}: {}", response.0))["id"]
.clone();
let drafts = response
.0
.pointer("/methodResponses/1/1/list")
.and_then(Value::as_array)
.and_then(|list| list.iter().find(|mailbox| mailbox["role"] == "drafts"))
.unwrap_or_else(|| panic!("no drafts: {}", response.0))["id"]
.clone();
let response = self
.jmap_request(
USING,
json!([
["Email/set", {"accountId": account_id, "create": {"m": {
"mailboxIds": {drafts.as_str().unwrap(): true},
"from": [{"email": from}],
"to": [{"email": self.name()}],
"subject": format!("Sent as {from}"),
"bodyValues": {"t": {"value": "MA-D0a"}},
"textBody": [{"partId": "t", "type": "text/plain"}]
}}}, "e"],
["EmailSubmission/set", {"accountId": account_id, "create": {"s": {
"identityId": identity, "emailId": "#m"
}}}, "s"]
]),
)
.await;
assert!(
response.0.pointer("/methodResponses/1/1/created/s").is_some(),
"send as {from}: {}",
response.0
);
}
}
/// Runs these tests alone: `cargo test -p tests audit_log_tests -- --ignored`.
#[ignore]
#[tokio::test(flavor = "multi_thread")]