Merge pull request #658 from mirokuratczyk/log-passthrough

Fix: log passthrough_address

psiphon/common/transforms/httpNormalizer.go

@@ -632,6 +632,7 @@ func (t *HTTPNormalizer) SetWriteDeadline(tt time.Time) error {
 	return t.Conn.SetWriteDeadline(tt)
 }
 
+// GetMetrics implements the common.MetricsSource interface.
 func (t *HTTPNormalizer) GetMetrics() common.LogFields {
 	// Relay any metrics from the underlying conn.
 	m, ok := t.Conn.(common.MetricsSource)

psiphon/common/transforms/httpTransformer.go

@@ -276,6 +276,7 @@ func (t *HTTPTransformer) Write(b []byte) (int, error) {
 	return n, err
 }
 
+// GetMetrics implements the common.MetricsSource interface.
 func (t *HTTPTransformer) GetMetrics() common.LogFields {
 	// Relay any metrics from the underlying conn.
 	m, ok := t.Conn.(common.MetricsSource)

psiphon/server/tlsTunnel.go

@@ -58,7 +58,9 @@ func ListenTLSTunnel(
 		return nil, errors.Trace(err)
 	}
 
-	return tris.NewListener(server.listener, server.tlsConfig), nil
+	listener = tris.NewListener(server.listener, server.tlsConfig)
+
+	return NewTLSTunnelListener(listener, server), nil
 }
 
 // NewTLSTunnelServer initializes a new TLSTunnelServer.
@@ -195,3 +197,60 @@ func (server *TLSTunnelServer) makeTLSTunnelConfig() (*tris.Config, error) {
 
 	return config, nil
 }
+
+// TLSTunnelListener implements the net.Listener interface. Accept returns a
+// net.Conn which implements the common.MetricsSource interface.
+type TLSTunnelListener struct {
+	net.Listener
+	server *TLSTunnelServer
+}
+
+// NewTLSTunnelListener initializes a new TLSTunnelListener.
+func NewTLSTunnelListener(listener net.Listener, server *TLSTunnelServer) *TLSTunnelListener {
+	return &TLSTunnelListener{
+		Listener: listener,
+		server:   server,
+	}
+}
+
+func (l *TLSTunnelListener) Accept() (net.Conn, error) {
+	conn, err := l.Listener.Accept()
+	if err != nil {
+		return nil, errors.Trace(err)
+	}
+
+	return NewTLSTunnelConn(conn, l.server), nil
+}
+
+// TLSTunnelConn implements the net.Conn and common.MetricsSource interfaces.
+type TLSTunnelConn struct {
+	net.Conn
+	server *TLSTunnelServer
+}
+
+// NewTLSTunnelConn initializes a new TLSTunnelConn.
+func NewTLSTunnelConn(conn net.Conn, server *TLSTunnelServer) *TLSTunnelConn {
+	return &TLSTunnelConn{
+		Conn:   conn,
+		server: server,
+	}
+}
+
+// GetMetrics implements the common.MetricsSource interface.
+func (conn *TLSTunnelConn) GetMetrics() common.LogFields {
+
+	var logFields common.LogFields
+
+	// Relay any metrics from the underlying conn.
+	if m, ok := conn.Conn.(common.MetricsSource); ok {
+		logFields = m.GetMetrics()
+	} else {
+		logFields = make(common.LogFields)
+	}
+
+	if conn.server.passthroughAddress != "" {
+		logFields["passthrough_address"] = conn.server.passthroughAddress
+	}
+
+	return logFields
+}