Enrich audit events with server information #48475
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Subsystem events did not include ServerMetadata, which results in any events generated for agentless hosts to contain limited information. For example, any sftp subsystem requests made in response to tsh scp for agentless nodes provided information about the proxy forwarding the requests, but no information about the target host. Additionally, the way ServerMetadata information was being populated by using the ServerContext overrode only a subset of the information that was available. This lead to SessionData events emitted when an sftp operation was completed not populating any relevant information about agentless nodes either. To avoid this going forward, the GetServerMetadata receiver has been removed from ServerContext and instead the TargetMetadata must be used from the appropriate SSH server, which already populates the relevant information without omitting any.
rosstimothy
force-pushed
the
tross/server_metadata
branch
from
5d23716 to
27af0fb
Compare
hugoShaka
approved these changes
Nov 6, 2024
Joerger
approved these changes
Nov 12, 2024
public-teleport-github-review-bot
bot
removed the request for review
from rudream
|
@rosstimothy See the table below for backport results.
|
rosstimothy
added a commit
that referenced
this pull request
Nov 12, 2024
Subsystem events did not include ServerMetadata, which results in any events generated for agentless hosts to contain limited information. For example, any sftp subsystem requests made in response to tsh scp for agentless nodes provided information about the proxy forwarding the requests, but no information about the target host. Additionally, the way ServerMetadata information was being populated by using the ServerContext overrode only a subset of the information that was available. This lead to SessionData events emitted when an sftp operation was completed not populating any relevant information about agentless nodes either. To avoid this going forward, the GetServerMetadata receiver has been removed from ServerContext and instead the TargetMetadata must be used from the appropriate SSH server, which already populates the relevant information without omitting any.
rosstimothy
added a commit
that referenced
this pull request
Nov 12, 2024
Subsystem events did not include ServerMetadata, which results in any events generated for agentless hosts to contain limited information. For example, any sftp subsystem requests made in response to tsh scp for agentless nodes provided information about the proxy forwarding the requests, but no information about the target host. Additionally, the way ServerMetadata information was being populated by using the ServerContext overrode only a subset of the information that was available. This lead to SessionData events emitted when an sftp operation was completed not populating any relevant information about agentless nodes either. To avoid this going forward, the GetServerMetadata receiver has been removed from ServerContext and instead the TargetMetadata must be used from the appropriate SSH server, which already populates the relevant information without omitting any.
github-merge-queue bot
pushed a commit
that referenced
this pull request
Nov 13, 2024
Subsystem events did not include ServerMetadata, which results in any events generated for agentless hosts to contain limited information. For example, any sftp subsystem requests made in response to tsh scp for agentless nodes provided information about the proxy forwarding the requests, but no information about the target host. Additionally, the way ServerMetadata information was being populated by using the ServerContext overrode only a subset of the information that was available. This lead to SessionData events emitted when an sftp operation was completed not populating any relevant information about agentless nodes either. To avoid this going forward, the GetServerMetadata receiver has been removed from ServerContext and instead the TargetMetadata must be used from the appropriate SSH server, which already populates the relevant information without omitting any.
github-merge-queue bot
pushed a commit
that referenced
this pull request
Nov 13, 2024
Subsystem events did not include ServerMetadata, which results in any events generated for agentless hosts to contain limited information. For example, any sftp subsystem requests made in response to tsh scp for agentless nodes provided information about the proxy forwarding the requests, but no information about the target host. Additionally, the way ServerMetadata information was being populated by using the ServerContext overrode only a subset of the information that was available. This lead to SessionData events emitted when an sftp operation was completed not populating any relevant information about agentless nodes either. To avoid this going forward, the GetServerMetadata receiver has been removed from ServerContext and instead the TargetMetadata must be used from the appropriate SSH server, which already populates the relevant information without omitting any.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Subsystem events did not include ServerMetadata, which results in any events generated for agentless hosts to contain limited information. For example, any sftp subsystem requests made in response to tsh scp for agentless nodes provided information about the proxy forwarding the requests, but no information about the target host.
Additionally, the way ServerMetadata information was being populated by using the ServerContext overrode only a subset of the information that was available. This lead to SessionData events emitted when an sftp operation was completed not populating any relevant information about agentless nodes either. To avoid this going forward, the GetServerMetadata receiver has been removed from ServerContext and instead the TargetMetadata must be used from the appropriate SSH server, which already populates the relevant information without omitting any.
Events prior to this change
{ "addr.local": "127.0.0.1:50133", "addr.remote": "127.0.0.1:2022", "cluster_name": "local.dev", "code": "T3001I", "ei": 0, "event": "subsystem", "exitError": "", "login": "tim", "name": "sftp", "server_id": "", "time": "2024-11-05T17:22:44.192Z", "uid": "1b5e837d-5d4e-48e9-a0d7-e3b34167fe78", "user": "tim", "user_kind": 1 } { "addr.local": "127.0.0.1:2022", "addr.remote": "127.0.0.1:50153", "cluster_name": "local.dev", "code": "T2006I", "ei": 2147483646, "event": "session.data", "login": "tim", "namespace": "default", "private_key_policy": "none", "rx": 5156, "server_id": "8fb5ba65-2479-4b0e-bc5d-96955af50ee7", "server_version": "17.0.0-alpha.4", "sid": "f9d4469c-a05a-4a06-8ba7-25fd0c14ab0c", "time": "2024-11-05T17:24:08.713Z", "tx": 6040, "uid": "5828657f-4b47-42de-876e-fd62576381e0", "user": "tim", "user_kind": 1 }Events with this change
{ "addr.local": "127.0.0.1:50759", "addr.remote": "127.0.0.1:2022", "cluster_name": "local.dev", "code": "T3001I", "ei": 0, "event": "subsystem", "exitError": "", "forwarded_by": "8fb5ba65-2479-4b0e-bc5d-96955af50ee7", "login": "tim", "name": "sftp", "namespace": "default", "server_addr": "127.0.0.1:2022", "server_hostname": "telebook", "server_id": "d481570f-955b-4ab4-a554-72a08a21e1be.local.dev", "server_sub_kind": "openssh", "server_version": "17.0.0-dev", "time": "2024-11-05T18:55:41.109Z", "uid": "cc7848f3-4be8-48ec-880d-305978ac9c63", "user": "tim", "user_kind": 1 } { "addr.local": "127.0.0.1:2022", "addr.remote": "127.0.0.1:50756", "cluster_name": "local.dev", "code": "T2006I", "ei": 2147483646, "event": "session.data", "forwarded_by": "8fb5ba65-2479-4b0e-bc5d-96955af50ee7", "login": "tim", "namespace": "default", "private_key_policy": "none", "rx": 5156, "server_addr": "127.0.0.1:2022", "server_hostname": "telebook", "server_id": "d481570f-955b-4ab4-a554-72a08a21e1be.local.dev", "server_sub_kind": "openssh", "server_version": "17.0.0-dev", "sid": "46f91ee6-a104-424f-8e49-6893caebc3f4", "time": "2024-11-05T18:55:41.115Z", "tx": 6040, "uid": "3c4e5d54-52c6-458c-b4d8-178ad61c28c6", "user": "tim", "user_kind": 1 }Changelog: Ensure that agentless server information is provided in all audit events