Support logging.split_host_port for all addresses

Author: jaksi

logging.go

@@ -15,6 +15,26 @@ type logEntry interface {
 	eventType() string
 }
 
+type addressLog struct {
+	Host string `json:"host"`
+	Port int    `json:"port"`
+}
+
+func (entry addressLog) String() string {
+	return net.JoinHostPort(entry.Host, fmt.Sprint(entry.Port))
+}
+
+func getAddressLog(host string, port int, cfg *config) interface{} {
+	entry := addressLog{
+		Host: host,
+		Port: port,
+	}
+	if cfg.Logging.SplitHostPort {
+		return entry
+	}
+	return entry.String()
+}
+
 type authAccepted bool
 
 func (accepted authAccepted) String() string {
@@ -98,7 +118,7 @@ func (entry connectionCloseLog) eventType() string {
 }
 
 type tcpipForwardLog struct {
-	Address string `json:"address"`
+	Address interface{} `json:"address"`
 }
 
 func (entry tcpipForwardLog) String() string {
@@ -109,7 +129,7 @@ func (entry tcpipForwardLog) eventType() string {
 }
 
 type cancelTCPIPForwardLog struct {
-	Address string `json:"address"`
+	Address interface{} `json:"address"`
 }
 
 func (entry cancelTCPIPForwardLog) String() string {
@@ -184,8 +204,8 @@ func (entry sessionInputLog) eventType() string {
 
 type directTCPIPLog struct {
 	channelLog
-	From string `json:"from"`
-	To   string `json:"to"`
+	From interface{} `json:"from"`
+	To   interface{} `json:"to"`
 }
 
 func (entry directTCPIPLog) String() string {
@@ -366,19 +386,8 @@ func (context connContext) logEvent(entry logEntry) {
 	}
 	if context.cfg.Logging.JSON {
 		var jsonEntry interface{}
-		var source interface{}
-		if context.cfg.Logging.SplitHostPort {
-			tcpSource := context.RemoteAddr().(*net.TCPAddr)
-			source = struct {
-				Host string `json:"host"`
-				Port int    `json:"port"`
-			}{
-				Host: tcpSource.IP.String(),
-				Port: tcpSource.Port,
-			}
-		} else {
-			source = context.RemoteAddr().String()
-		}
+		tcpSource := context.RemoteAddr().(*net.TCPAddr)
+		source := getAddressLog(tcpSource.IP.String(), tcpSource.Port, context.cfg)
 		if context.cfg.Logging.Timestamps {
 			jsonEntry = struct {
 				Time      string      `json:"time"`

request.go

@@ -6,8 +6,6 @@ import (
 	"encoding/binary"
 	"errors"
 	mathRand "math/rand"
-	"net"
-	"strconv"
 
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promauto"
@@ -34,7 +32,7 @@ func (request tcpipRequest) reply(context *connContext) []byte {
 }
 func (request tcpipRequest) logEntry(context *connContext) logEntry {
 	return tcpipForwardLog{
-		Address: net.JoinHostPort(request.Address, strconv.Itoa(int(request.Port))),
+		Address: getAddressLog(request.Address, int(request.Port), context.cfg),
 	}
 }
 
@@ -48,7 +46,7 @@ func (request cancelTCPIPRequest) reply(context *connContext) []byte {
 }
 func (request cancelTCPIPRequest) logEntry(context *connContext) logEntry {
 	return cancelTCPIPForwardLog{
-		Address: net.JoinHostPort(request.Address, strconv.Itoa(int(request.Port))),
+		Address: getAddressLog(request.Address, int(request.Port), context.cfg),
 	}
 }
 

tcpip.go

@@ -5,10 +5,8 @@ import (
 	"bytes"
 	"fmt"
 	"io"
-	"net"
 	"net/http"
 	"net/http/httputil"
-	"strconv"
 	"strings"
 
 	"github.com/prometheus/client_golang/prometheus"
@@ -71,8 +69,8 @@ func handleDirectTCPIPChannel(newChannel ssh.NewChannel, context channelContext)
 		channelLog: channelLog{
 			ChannelID: context.channelID,
 		},
-		From: net.JoinHostPort(channelData.OriginatorAddress, strconv.Itoa(int(channelData.OriginatorPort))),
-		To:   net.JoinHostPort(channelData.Address, strconv.Itoa(int(channelData.Port))),
+		From: getAddressLog(channelData.OriginatorAddress, int(channelData.OriginatorPort), context.cfg),
+		To:   getAddressLog(channelData.Address, int(channelData.Port), context.cfg),
 	})
 	defer context.logEvent(directTCPIPCloseLog{
 		channelLog: channelLog{