Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[v13] only show windows domain in audit log ui if applicable #26078

Merged
merged 5 commits into from May 15, 2023
Merged

[v13] only show windows domain in audit log ui if applicable #26078

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ae781f7
only show windows domain in audit log if applicable
stevenGravy May 11, 2023
a39378c
lint fix
stevenGravy May 11, 2023
c9401b5
Merge branch 'branch/v13' into bot/backport-26063-branch/v13
stevenGravy May 11, 2023
0800f1e
Merge branch 'branch/v13' into bot/backport-26063-branch/v13
stevenGravy May 12, 2023
309c3b0
Merge branch 'branch/v13' into bot/backport-26063-branch/v13
stevenGravy May 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
28 changes: 22 additions & 6 deletions web/packages/teleport/src/services/audit/makeEvent.ts
View file
Open in desktop
Expand Up @@ -1103,20 +1103,36 @@ export const formatters: Formatters = {
[eventCodes.DESKTOP_SESSION_STARTED]: {
type: 'windows.desktop.session.start',
desc: 'Windows Desktop Session Started',
format: ({ user, windows_domain, desktop_addr, windows_user }) =>
`User [${user}] has connected to Windows desktop [${windows_user}@${desktop_addr}] on [${windows_domain}]`,
format: ({ user, windows_domain, desktop_addr, windows_user }) => {
let message = `User [${user}] has connected to Windows desktop [${windows_user}@${desktop_addr}]`;
if (windows_domain) {
message += ` on [${windows_domain}]`;
}
return message;
},
},
[eventCodes.DESKTOP_SESSION_STARTED_FAILED]: {
type: 'windows.desktop.session.start',
desc: 'Windows Desktop Session Denied',
format: ({ user, windows_domain, desktop_addr, windows_user }) =>
`User [${user}] was denied access to Windows desktop [${windows_user}@${desktop_addr}] on [${windows_domain}]`,
format: ({ user, windows_domain, desktop_addr, windows_user }) => {
let message = `User [${user}] was denied access to Windows desktop [${windows_user}@${desktop_addr}]`;
if (windows_domain) {
message += ` on [${windows_domain}]`;
}
return message;
},
},
[eventCodes.DESKTOP_SESSION_ENDED]: {
type: 'windows.desktop.session.end',
desc: 'Windows Desktop Session Ended',
format: ({ user, windows_domain, desktop_addr, windows_user }) =>
`Session for Windows desktop [${windows_user}@${desktop_addr}] on [${windows_domain}] has ended for user [${user}]`,
format: ({ user, windows_domain, desktop_addr, windows_user }) => {
let desktopMessage = `[${windows_user}@${desktop_addr}]`;
if (windows_domain) {
desktopMessage += ` on [${windows_domain}]`;
}
let message = `Session for Windows desktop ${desktopMessage} has ended for user [${user}]`;
return message;
},
},
[eventCodes.DESKTOP_CLIPBOARD_RECEIVE]: {
type: 'desktop.clipboard.receive',
Expand Down