Adding missing audit logs to forward SSH server #52900
Open
+115
−18
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
… for regular SSH server
rosstimothy
reviewed
Mar 8, 2025
| @@ -907,6 +951,7 @@ func (s *Server) handleForwardedTCPIPRequest(ctx context.Context, nch ssh.NewCha | |||
| return trace.Wrap(err) | |||
| } | |||
|
|
|||
| s.logger.WarnContext(ctx, "remote TCPIP request", "req", req) | |||
There was a problem hiding this comment.
Why is this a warning? Is this a leftover from local debugging?
| addr := scx.ConnectionContext.ServerConn.LocalAddr().String() | ||
| host, _, err := sshutils.SplitHostPort(addr) | ||
| if err != nil { | ||
| s.logger.WarnContext(ctx, "Target host for port forwarding could not be determined for audit logging", "error", err) |
There was a problem hiding this comment.
Maybe include the address that was unable to be parsed as an attribute?
| @@ -1091,6 +1150,8 @@ func (s *Server) handleDirectTCPIPRequest(ctx context.Context, ch ssh.Channel, r | |||
| } | |||
| return | |||
| } | |||
|
|
|||
| s.logger.WarnContext(ctx, "local TCPIP request", "req", req) | |||
There was a problem hiding this comment.
Same question as above.
| addr := scx.ConnectionContext.ServerConn.LocalAddr().String() | ||
| host, _, err := sshutils.SplitHostPort(addr) | ||
| if err != nil { | ||
| s.logger.WarnContext(ctx, "Target host for port forwarding could not be determined for audit logging", "error", err) |
There was a problem hiding this comment.
Same suggestion as above.
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.
This PR adds missing audit logging to the forward SSH server, bringing it inline with what we added to the regular server. It also adjusts the
addrvalue in the regular server to show the target address and port rather than always showing the loopback.