Skip to content

[v12] web: use desktop name instead of addr in audit event summary #34836

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

Merged
gzdunek merged 1 commit into from
Nov 22, 2023
Merged

[v12] web: use desktop name instead of addr in audit event summary #34836

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions web/packages/teleport/src/Audit/__snapshots__/Audit.story.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4155,7 +4155,7 @@ exports[`list of all events 1`] = `
<td
style="word-break: break-word;"
>
User [joe] was denied access to Windows desktop [Administrator@100.104.52.89:3389] on [desktopaccess.com]
User [joe] was denied access to Windows desktop [Administrator@desktop-name] on [desktopaccess.com]
</td>
<td
style="min-width: 120px;"
Expand Down Expand Up @@ -4192,7 +4192,7 @@ exports[`list of all events 1`] = `
<td
style="word-break: break-word;"
>
Session for Windows desktop [Administrator@100.104.52.89:3389] on [desktopaccess.com] has ended for user [joe]
Session for Windows desktop [Administrator@desktop-name] on [desktopaccess.com] has ended for user [joe]
</td>
<td
style="min-width: 120px;"
Expand Down Expand Up @@ -4229,7 +4229,7 @@ exports[`list of all events 1`] = `
<td
style="word-break: break-word;"
>
User [joe] has connected to Windows desktop [Administrator@100.104.52.89:3389] on [desktopaccess.com]
User [joe] has connected to Windows desktop [Administrator@desktop-name] on [desktopaccess.com]
</td>
<td
style="min-width: 120px;"
Expand Down
3 changes: 3 additions & 0 deletions web/packages/teleport/src/Audit/fixtures/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1707,6 +1707,7 @@ export const events = [
cluster_name: 'im-a-cluster-name',
code: 'TDP00I',
desktop_addr: '100.104.52.89:3389',
desktop_name: 'desktop-name',
desktop_labels: {
env: 'prod',
foo: 'bar',
Expand All @@ -1727,6 +1728,7 @@ export const events = [
cluster_name: 'im-a-cluster-name',
code: 'TDP01I',
desktop_addr: '100.104.52.89:3389',
desktop_name: 'desktop-name',
desktop_labels: {
env: 'prod',
foo: 'bar',
Expand All @@ -1745,6 +1747,7 @@ export const events = [
cluster_name: 'im-a-cluster-name',
code: 'TDP00W',
desktop_addr: '100.104.52.89:3389',
desktop_name: 'desktop-name',
desktop_labels: {
env: 'prod',
foo: 'bar',
Expand Down
12 changes: 6 additions & 6 deletions web/packages/teleport/src/services/audit/makeEvent.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1082,8 +1082,8 @@ 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 }) => {
let message = `User [${user}] has connected to Windows desktop [${windows_user}@${desktop_addr}]`;
format: ({ user, windows_domain, desktop_name, windows_user }) => {
let message = `User [${user}] has connected to Windows desktop [${windows_user}@${desktop_name}]`;
if (windows_domain) {
message += ` on [${windows_domain}]`;
}
Expand All @@ -1093,8 +1093,8 @@ export const formatters: Formatters = {
[eventCodes.DESKTOP_SESSION_STARTED_FAILED]: {
type: 'windows.desktop.session.start',
desc: 'Windows Desktop Session Denied',
format: ({ user, windows_domain, desktop_addr, windows_user }) => {
let message = `User [${user}] was denied access to Windows desktop [${windows_user}@${desktop_addr}]`;
format: ({ user, windows_domain, desktop_name, windows_user }) => {
let message = `User [${user}] was denied access to Windows desktop [${windows_user}@${desktop_name}]`;
if (windows_domain) {
message += ` on [${windows_domain}]`;
}
Expand All @@ -1104,8 +1104,8 @@ export const formatters: Formatters = {
[eventCodes.DESKTOP_SESSION_ENDED]: {
type: 'windows.desktop.session.end',
desc: 'Windows Desktop Session Ended',
format: ({ user, windows_domain, desktop_addr, windows_user }) => {
let desktopMessage = `[${windows_user}@${desktop_addr}]`;
format: ({ user, windows_domain, desktop_name, windows_user }) => {
let desktopMessage = `[${windows_user}@${desktop_name}]`;
if (windows_domain) {
desktopMessage += ` on [${windows_domain}]`;
}
Expand Down
3 changes: 3 additions & 0 deletions web/packages/teleport/src/services/audit/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -954,6 +954,7 @@ export type RawEvents = {
typeof eventCodes.DESKTOP_SESSION_STARTED,
{
desktop_addr: string;
desktop_name: string;
windows_user: string;
windows_domain: string;
}
Expand All @@ -962,6 +963,7 @@ export type RawEvents = {
typeof eventCodes.DESKTOP_SESSION_STARTED_FAILED,
{
desktop_addr: string;
desktop_name: string;
windows_user: string;
windows_domain: string;
}
Expand All @@ -970,6 +972,7 @@ export type RawEvents = {
typeof eventCodes.DESKTOP_SESSION_ENDED,
{
desktop_addr: string;
desktop_name: string;
windows_user: string;
windows_domain: string;
}
Expand Down