vaultnord.no/vaultwarden
1
0
Fork 0
mirror of https://github.com/dani-garcia/vaultwarden.git synced 2026-08-30 23:28:29 +00:00
Code Activity

log_event take enum parameter not i32 (#7656)

Browse Source 
Co-authored-by: Timshel <timshel@users.noreply.github.com>
This commit is contained in:
Timshel
2026-08-29 17:02:26 +02:00
committed by GitHub
co-authored by Timshel
parent 2073c03092
commit fdc156b247
5 changed files with 42 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/api/admin.rs
+3 -3
View File
@@ -425,7 +425,7 @@ async fn delete_user(user_id: UserId, token: AdminToken, conn: DbConn) -> EmptyR
for membership in memberships {
log_event(
EventType::OrganizationUserDeleted as i32,
EventType::OrganizationUserDeleted,
&membership.uuid,
&membership.org_uuid,
&ACTING_ADMIN_USER.into(),
@@ -446,7 +446,7 @@ async fn delete_sso_user(user_id: UserId, token: AdminToken, conn: DbConn) -> Em
for membership in memberships {
log_event(
EventType::OrganizationUserUnlinkedSso as i32,
EventType::OrganizationUserUnlinkedSso,
&membership.uuid,
&membership.org_uuid,
&ACTING_ADMIN_USER.into(),
@@ -571,7 +571,7 @@ async fn update_membership_type(data: Json<MembershipTypeData>, token: AdminToke
OrgPolicy::check_user_allowed(&member_to_edit, "modify", &conn).await?;
log_event(
EventType::OrganizationUserUpdated as i32,
EventType::OrganizationUserUpdated,
&member_to_edit.uuid,
&data.org_uuid,
&ACTING_ADMIN_USER.into(),
src/api/core/ciphers.rs
+9 -17
View File
@@ -553,15 +553,7 @@ pub async fn update_cipher_from_data(
(_, _) => EventType::CipherUpdated,
};
log_event(
event_type as i32,
&cipher.uuid,
org_id,
&headers.user.uuid,
headers.device.atype,
&headers.ip.ip,
conn,
)
log_event(event_type, &cipher.uuid, org_id, &headers.user.uuid, headers.device.atype, &headers.ip.ip, conn)
.await;
}
nt.send_cipher_update(
@@ -850,7 +842,7 @@ async fn post_collections_update(
.await;
log_event(
EventType::CipherUpdatedCollections as i32,
EventType::CipherUpdatedCollections,
&cipher.uuid,
org_uuid,
&headers.user.uuid,
@@ -930,7 +922,7 @@ async fn post_collections_admin(
.await;
log_event(
EventType::CipherUpdatedCollections as i32,
EventType::CipherUpdatedCollections,
&cipher.uuid,
org_uuid,
&headers.user.uuid,
@@ -1335,7 +1327,7 @@ async fn save_attachment(
if let Some(org_id) = &cipher.organization_uuid {
log_event(
EventType::CipherAttachmentCreated as i32,
EventType::CipherAttachmentCreated,
&cipher.uuid,
org_id,
&headers.user.uuid,
@@ -1696,7 +1688,7 @@ async fn purge_org_vault(
nt.send_user_update(UpdateType::SyncVault, &user, headers.device.push_uuid.as_ref(), &conn).await;
log_event(
EventType::OrganizationPurgedVault as i32,
EventType::OrganizationPurgedVault,
&organization.org_id,
&organization.org_id,
&user.uuid,
@@ -1824,9 +1816,9 @@ async fn delete_cipher_by_uuid(
let event_type = if *delete_options == CipherDeleteOptions::SoftSingle
|| *delete_options == CipherDeleteOptions::SoftMulti
{
EventType::CipherSoftDeleted as i32
EventType::CipherSoftDeleted
} else {
EventType::CipherDeleted as i32
EventType::CipherDeleted
};
log_event(event_type, &cipher.uuid, &org_id, &headers.user.uuid, headers.device.atype, &headers.ip.ip, conn)
@@ -1895,7 +1887,7 @@ async fn restore_cipher_by_uuid(
if let Some(org_id) = &cipher.organization_uuid {
log_event(
EventType::CipherRestored as i32,
EventType::CipherRestored,
&cipher.uuid.clone(),
org_id,
&headers.user.uuid,
@@ -1972,7 +1964,7 @@ async fn delete_cipher_attachment_by_id(
if let Some(ref org_id) = cipher.organization_uuid {
log_event(
EventType::CipherAttachmentDeleted as i32,
EventType::CipherAttachmentDeleted,
&cipher.uuid,
org_id,
&headers.user.uuid,
src/api/core/events.rs
+3 -3
View File
@@ -10,7 +10,7 @@ use crate::{
auth::{AdminHeaders, Headers},
db::{
DbConn, DbPool,
models::{Cipher, CipherId, Event, Membership, MembershipId, OrganizationId, UserId},
models::{Cipher, CipherId, Event, EventType, Membership, MembershipId, OrganizationId, UserId},
},
util::parse_date,
};
@@ -267,7 +267,7 @@ async fn log_user_event_impl(
}
pub async fn log_event(
event_type: i32,
event_type: EventType,
source_uuid: &str,
org_id: &OrganizationId,
act_user_id: &UserId,
@@ -278,7 +278,7 @@ pub async fn log_event(
if !CONFIG.org_events_enabled() {
return;
}
log_event_impl(event_type, source_uuid, org_id, act_user_id, device_type, None, ip, conn).await;
log_event_impl(event_type as i32, source_uuid, org_id, act_user_id, device_type, None, ip, conn).await;
}
#[expect(clippy::too_many_arguments)]
src/api/core/organizations.rs
+23 -23
View File
@@ -269,7 +269,7 @@ async fn leave_organization(org_id: OrganizationId, headers: OrgMemberHeaders, c
}
log_event(
EventType::OrganizationUserLeft as i32,
EventType::OrganizationUserLeft,
&membership.uuid,
&org_id,
&headers.user.uuid,
@@ -327,7 +327,7 @@ async fn post_organization(
org.save(&conn).await?;
log_event(
EventType::OrganizationUpdated as i32,
EventType::OrganizationUpdated,
org_id.as_ref(),
&org_id,
&headers.user.uuid,
@@ -514,7 +514,7 @@ async fn post_organization_collections(
collection.save(&conn).await?;
log_event(
EventType::CollectionCreated as i32,
EventType::CollectionCreated,
&collection.uuid,
&org_id,
&headers.user.uuid,
@@ -597,7 +597,7 @@ async fn post_bulk_access_collections(
collection.save(&conn).await?;
log_event(
EventType::CollectionUpdated as i32,
EventType::CollectionUpdated,
&collection.uuid,
&org_id,
&headers.user.uuid,
@@ -674,7 +674,7 @@ async fn post_organization_collection_update(
collection.save(&conn).await?;
log_event(
EventType::CollectionUpdated as i32,
EventType::CollectionUpdated,
&collection.uuid,
&org_id,
&headers.user.uuid,
@@ -723,7 +723,7 @@ async fn delete_organization_collection_impl(
err!("Collection not found", "Collection does not exist or does not belong to this organization")
};
log_event(
EventType::CollectionDeleted as i32,
EventType::CollectionDeleted,
&collection.uuid,
org_id,
&headers.user.uuid,
@@ -1148,7 +1148,7 @@ async fn send_invite(
}
log_event(
EventType::OrganizationUserInvited as i32,
EventType::OrganizationUserInvited,
&new_member.uuid,
&org_id,
&headers.user.uuid,
@@ -1447,7 +1447,7 @@ async fn confirm_invite_impl(
OrgPolicy::check_user_allowed(&member_to_confirm, "confirm", conn).await?;
log_event(
EventType::OrganizationUserConfirmed as i32,
EventType::OrganizationUserConfirmed,
&member_to_confirm.uuid,
org_id,
&headers.user.uuid,
@@ -1637,7 +1637,7 @@ async fn edit_member(
}
log_event(
EventType::OrganizationUserUpdated as i32,
EventType::OrganizationUserUpdated,
&member_to_edit.uuid,
&org_id,
&headers.user.uuid,
@@ -1724,7 +1724,7 @@ async fn delete_member_impl(
}
log_event(
EventType::OrganizationUserRemoved as i32,
EventType::OrganizationUserRemoved,
&member_to_delete.uuid,
org_id,
&headers.user.uuid,
@@ -2144,7 +2144,7 @@ async fn put_policy(
}
log_event(
EventType::OrganizationUserRemoved as i32,
EventType::OrganizationUserRemoved,
&member.uuid,
&org_id,
&headers.user.uuid,
@@ -2170,7 +2170,7 @@ async fn put_policy(
policy.save(&conn).await?;
log_event(
EventType::PolicyUpdated as i32,
EventType::PolicyUpdated,
policy.uuid.as_ref(),
&org_id,
&headers.user.uuid,
@@ -2339,7 +2339,7 @@ async fn revoke_member_impl(
member.save(conn).await?;
log_event(
EventType::OrganizationUserRevoked as i32,
EventType::OrganizationUserRevoked,
&member.uuid,
org_id,
&headers.user.uuid,
@@ -2437,7 +2437,7 @@ async fn restore_member_impl(
member.save(conn).await?;
log_event(
EventType::OrganizationUserRestored as i32,
EventType::OrganizationUserRestored,
&member.uuid,
org_id,
&headers.user.uuid,
@@ -2605,7 +2605,7 @@ async fn post_groups(
let group = group_request.to_group(&org_id);
log_event(
EventType::GroupCreated as i32,
EventType::GroupCreated,
&group.uuid,
&org_id,
&headers.user.uuid,
@@ -2646,7 +2646,7 @@ async fn put_group(
GroupUser::delete_all_by_group(&group_id, &org_id, &conn).await?;
log_event(
EventType::GroupUpdated as i32,
EventType::GroupUpdated,
&updated_group.uuid,
&org_id,
&headers.user.uuid,
@@ -2679,7 +2679,7 @@ async fn add_update_group(
user_entry.save(conn).await?;
log_event(
EventType::OrganizationUserUpdatedGroups as i32,
EventType::OrganizationUserUpdatedGroups,
&assigned_member,
&org_id,
&headers.user.uuid,
@@ -2754,7 +2754,7 @@ async fn delete_group_impl(
};
log_event(
EventType::GroupDeleted as i32,
EventType::GroupDeleted,
&group.uuid,
org_id,
&headers.user.uuid,
@@ -2865,7 +2865,7 @@ async fn put_group_members(
user_entry.save(&conn).await?;
log_event(
EventType::OrganizationUserUpdatedGroups as i32,
EventType::OrganizationUserUpdatedGroups,
&assigned_member,
&org_id,
&headers.user.uuid,
@@ -2903,7 +2903,7 @@ async fn post_delete_group_member(
}
log_event(
EventType::OrganizationUserUpdatedGroups as i32,
EventType::OrganizationUserUpdatedGroups,
&member_id,
&org_id,
&headers.user.uuid,
@@ -3039,7 +3039,7 @@ async fn recover_account(
nt.send_logout(&user, None, &conn).await;
log_event(
EventType::OrganizationUserAdminResetPassword as i32,
EventType::OrganizationUserAdminResetPassword,
&member_id,
&org_id,
&headers.user.uuid,
@@ -3166,9 +3166,9 @@ async fn put_reset_password_enrollment(
membership.save(&conn).await?;
let event_type = if membership.reset_password_key.is_some() {
EventType::OrganizationUserResetPasswordEnroll as i32
EventType::OrganizationUserResetPasswordEnroll
} else {
EventType::OrganizationUserResetPasswordWithdraw as i32
EventType::OrganizationUserResetPasswordWithdraw
};
log_event(event_type, &membership.uuid, &org_id, &headers.user.uuid, headers.device.atype, &headers.ip.ip, &conn)
src/api/core/two_factor/mod.rs
+2 -10
View File
@@ -190,7 +190,7 @@ pub async fn enforce_2fa_policy(
member.save(conn).await?;
log_event(
EventType::OrganizationUserRevoked as i32,
EventType::OrganizationUserRevoked,
&member.uuid,
&member.org_uuid,
act_user_id,
@@ -224,15 +224,7 @@ pub async fn enforce_2fa_policy_for_org(
member.revoke();
member.save(conn).await?;
log_event(
EventType::OrganizationUserRevoked as i32,
&member.uuid,
org_id,
act_user_id,
device_type,
ip,
conn,
)
log_event(EventType::OrganizationUserRevoked, &member.uuid, org_id, act_user_id, device_type, ip, conn)
.await;
}
}