Skip to content

ActivityPub-federated video streaming platform using P2P directly in your web browser

Audit create/update user does not display security related attributes #7694 (#7695)

Soisik Froger33f23257d6c2
diff --git a/server/core/controllers/api/users/index.ts b/server/core/controllers/api/users/index.ts
index fc2bc36d1d..9282b5b701 100644
--- a/server/core/controllers/api/users/index.ts
+++ b/server/core/controllers/api/users/index.ts
@@ -180,7 +180,7 @@ async function createUser (req: express.Request, res: express.Response) {
channelNames: body.channelName && { name: body.channelName, displayName: body.channelName }
})
- auditLogger.create(getAuditIdFromRes(res), new UserAuditView(user.toFormattedJSON()))
+ auditLogger.create(getAuditIdFromRes(res), new UserAuditView(user.toFormattedJSON({ withAdminFlags: true })))
logger.info('User %s with its channel and account created.', body.username, lTags(user.username))
if (createPassword) {
@@ -306,7 +306,7 @@ async function updateUser (req: express.Request, res: express.Response) {
// Destroy user token to refresh rights
if (roleChanged || body.password !== undefined) await OAuthTokenModel.deleteUserToken(userToUpdate.id)
- auditLogger.update(getAuditIdFromRes(res), new UserAuditView(user.toFormattedJSON()), oldUserAuditView)
+ auditLogger.update(getAuditIdFromRes(res), new UserAuditView(user.toFormattedJSON({ withAdminFlags: true })), oldUserAuditView)
logger.info(`Updated user ${user.username} by moderator ${byUser.username}.`, lTags(user.username, byUser.username))
@@ -359,5 +359,5 @@ async function changeUserBlock (res: express.Response, user: MUserAccountDefault
Emailer.Instance.addUserBlockJob({ username: user.username, email: user.email, language: user.getLanguage(), blocked: block, reason })
- auditLogger.update(getAuditIdFromRes(res), new UserAuditView(user.toFormattedJSON()), oldUserAuditView)
+ auditLogger.update(getAuditIdFromRes(res), new UserAuditView(user.toFormattedJSON({ withAdminFlags: true })), oldUserAuditView)
}
diff --git a/server/core/helpers/audit-logger.ts b/server/core/helpers/audit-logger.ts
index 88fbbfa9ac..f93e27f767 100644
--- a/server/core/helpers/audit-logger.ts
+++ b/server/core/helpers/audit-logger.ts
@@ -173,7 +173,9 @@ const userKeysToKeep = new Set([
'email',
'nsfwPolicy',
'autoPlayVideo',
- 'role',
+ 'role-id',
+ 'role-label',
+ 'adminFlags',
'videoQuota',
'createdAt',
'account-id',