octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2024-12-31 05:51:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

lib/relay: Correctly get IP from remote addr via proxy (fixes #3223)

Browse Source 
Correctly handles addresses, and fixes one more panicing place.

GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/3230
This commit is contained in:
Jakob Borg 2016-05-31 14:42:10 +00:00 committed by Audrius Butkevicius
parent a775dd2b79
commit 4970bd7f65
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/relay/client/methods.go
View File

@ -55,7 +55,7 @@ func GetInvitationFromRelay(uri *url.URL, id syncthingprotocol.DeviceID, certs [
l.Debugln("Received invitation", msg, "via", conn.LocalAddr())
ip := net.IP(msg.Address)
if len(ip) == 0 || ip.IsUnspecified() {
msg.Address = conn.RemoteAddr().(*net.TCPAddr).IP[:]
msg.Address = remoteIPBytes(conn)
}
return msg, nil
default:
@ -144,3 +144,11 @@ func configForCerts(certs []tls.Certificate) *tls.Config {
},
}
}
func remoteIPBytes(conn net.Conn) []byte {
addr := conn.RemoteAddr().String()
if host, _, err := net.SplitHostPort(addr); err == nil {
addr = host
}
return net.ParseIP(addr)[:]
}

3
lib/relay/client/static.go
View File

@ -122,8 +122,7 @@ func (c *staticClient) Serve() {
case protocol.SessionInvitation:
ip := net.IP(msg.Address)
if len(ip) == 0 || ip.IsUnspecified() {
ip := net.ParseIP(c.conn.RemoteAddr().String())
msg.Address = ip[:]
msg.Address = remoteIPBytes(c.conn)
}
c.invitations <- msg