curben
/
cloudflared-mirror
mirror of https://github.com/cloudflare/cloudflared.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

AUTH-2177: Reads and writes error streams

This commit is contained in:
Michael Borkenstein 2019-10-23 10:27:37 -05:00
parent a52f47c9a9
commit e9a8c9850f
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sshserver/sshserver_unix.go
View File

@ -221,6 +221,21 @@ func (s *SSHProxy) proxyChannel(localChan, remoteChan gossh.Channel, localChanRe
} }
done <- struct{}{} done <- struct{}{}
}() }()
// stderr streams are used non-pty sessions since they have distinct IO streams.
remoteStderr := remoteChan.Stderr()
localStderr := localChan.Stderr()
go func() {
if _, err := io.Copy(remoteStderr, localStderr); err != nil {
s.logger.WithError(err).Error("stderr local to remote copy error")
}
}()
go func() {
if _, err := io.Copy(localStderr, remoteStderr); err != nil {
s.logger.WithError(err).Error("stderr remote to local copy error")
}
}()
s.logAuditEvent(conn, "", auditEventStart, ctx) s.logAuditEvent(conn, "", auditEventStart, ctx)
defer s.logAuditEvent(conn, "", auditEventStop, ctx) defer s.logAuditEvent(conn, "", auditEventStop, ctx)
@ -231,7 +246,6 @@ func (s *SSHProxy) proxyChannel(localChan, remoteChan gossh.Channel, localChanRe
if req == nil { if req == nil {
return return
} }
if err := s.forwardChannelRequest(remoteChan, req); err != nil { if err := s.forwardChannelRequest(remoteChan, req); err != nil {
s.logger.WithError(err).Error("Failed to forward request") s.logger.WithError(err).Error("Failed to forward request")
return return
@ -329,6 +343,7 @@ func (s *SSHProxy) dialDestination(ctx ssh.Context) (*gossh.Client, error) {
s.logger.WithError(err).Error("Failed to generate signed short lived cert") s.logger.WithError(err).Error("Failed to generate signed short lived cert")
return nil, err return nil, err
} }
s.logger.Debugf("Short lived certificate for %s connecting to %s:\n\n%s", ctx.User(), preamble.Destination, gossh.MarshalAuthorizedKey(signer.PublicKey()))
clientConfig := &gossh.ClientConfig{ clientConfig := &gossh.ClientConfig{
User: ctx.User(), User: ctx.User(),