October 2017 - tor-commits - lists.torproject.org

[tor/master] bump version on master to 0.3.3.0-alpha-dev
by nickm＠torproject.org 15 Oct '17

15 Oct '17

commit e00f12ec6c6fda091bbf09d0bfeab057947d3808 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Oct 15 11:57:06 2017 -0400 bump version on master to 0.3.3.0-alpha-dev --- configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 668fd4f1f..c02646426 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2017, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.3.2.2-alpha-dev]) +AC_INIT([tor],[0.3.3.0-alpha-dev]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 02d4ef907..f3c23ef33 100644 --- a/contrib/win32build/tor-mingw.nsi.in +++ b/contrib/win32build/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.3.2.2-alpha-dev" +!define VERSION "0.3.3.0-alpha-dev" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index 6c3000a71..5e3c5d87f 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -218,7 +218,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.3.2.2-alpha-dev" +#define VERSION "0.3.3.0-alpha-dev"

1 0

[translation/tor-browser-manual] Update translations for tor-browser-manual
by translation＠torproject.org 15 Oct '17

15 Oct '17

commit a3e71752367f53192e394c8006ce9d0c2820cbd8 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Oct 15 15:20:42 2017 +0000 Update translations for tor-browser-manual --- sv/sv.po | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/sv/sv.po b/sv/sv.po index 64224e2fa..32f4f8547 100644 --- a/sv/sv.po +++ b/sv/sv.po @@ -773,6 +773,11 @@ msgid "" " Browser includes some additional features that help you control what " "information can be tied to your identity." msgstr "" +"Med hjälp av Tor-nätverket hindras observatörer från att kunna upptäcka din " +"exakta plats och IP-adress, men även utan denna information kan de " +"eventuellt länka olika delar av din verksamhet tillsammans. Av denna " +"anledning innehåller Tor Browser några ytterligare funktioner som hjälper " +"dig att styra vilken information som kan kopplas till din identitet." #: managing-identities.page:29 msgid "The URL bar" @@ -786,6 +791,11 @@ msgid "" " be served over two different Tor circuits, so the tracker will not know " "that both connections originate from your browser." msgstr "" +"Tor Browser centrerar din webbupplevelse kring ditt förhållande till " +"webbplatsen i webbläsarfältet. Även om du ansluter till två olika " +"webbplatser som använder samma tredjeparts spårningstjänst, kommer Tor " +"Browser att tvinga innehållet som ska serveras över två olika Tor-kretsar, " +"så spåraren vet inte att båda anslutningarna kommer från din webbläsare." #: managing-identities.page:38 msgid "" @@ -794,6 +804,10 @@ msgid "" "single website in separate tabs or windows, without any loss of " "functionality." msgstr "" +"Å andra sidan kommer alla anslutningar till en enda webbplatsadress att " +"göras över samma Tor-krets, vilket innebär att du kan bläddra i olika sidor " +"på en enda webbplats i separata flikar eller fönster, utan att det går någon" +" förlust av funktionaliteten." #. This is a reference to an external file such as an image or video. When #. the file changes, the md5 hash will change to let you know you need to @@ -805,12 +819,16 @@ msgid "" "external ref='media/managing-identities/circuit_full.png' " "md5='bd46d22de952fee42643be46d3f95928'" msgstr "" +"external ref='media/managing-identities/circuit_full.png' " +"md5='bd46d22de952fee42643be46d3f95928'" #: managing-identities.page:48 msgid "" "You can see a diagram of the circuit that Tor Browser is using for the " "current tab in the onion menu." msgstr "" +"Du kan se ett diagram över den krets som Tor Browser använder för den " +"aktuella fliken i onionmenyn." #: managing-identities.page:55 msgid "Logging in over Tor" @@ -822,6 +840,10 @@ msgid "" "there may be situations in which it makes sense to use Tor with websites " "that require usernames, passwords, or other identifying information." msgstr "" +"Även om Tor Browser är utformad för att möjliggöra total användaranonymitet " +"på webben kan det finnas situationer där det är vettigt att använda Tor med " +"webbplatser som kräver användarnamn, lösenord eller annan identifierande " +"information." #: managing-identities.page:62 msgid "" @@ -832,18 +854,29 @@ msgid "" "you reveal to the websites you browse. Logging in using Tor Browser is also " "useful if the website you are trying to reach is censored on your network." msgstr "" +"Om du loggar in på en webbplats med en vanlig webbläsare avslöjar du också " +"din IP-adress och geografiska plats i processen. Detsamma är ofta sant när " +"du skickar ett mail. Genom att logga in på dina sociala nätverk eller " +"e-postkonton med hjälp av Tor Browser kan du välja exakt vilken information " +"du avslöjar för de webbplatser du surfar på. Att logga in med Tor Browser är" +" också användbart om webbplatsen du försöker nå är censurerad på ditt " +"nätverk." #: managing-identities.page:72 msgid "" "When you log in to a website over Tor, there are several points you should " "bear in mind:" msgstr "" +"När du loggar in på en webbplats över Tor finns det flera punkter du bör " +"tänka på: " #: managing-identities.page:79 msgid "" "See the <link xref=\"secure-connections\">Secure Connections</link> page for" " important information on how to secure your connection when logging in." msgstr "" +"Se <link xref=\"secure-connections\">Säkra anslutningar</link>-sidan för " +"viktig information om hur du säkrar din anslutning när du loggar in." #: managing-identities.page:87 msgid "" @@ -854,6 +887,12 @@ msgid "" "following the site’s recommended procedure for account recovery, or " "contacting the operators and explaining the situation." msgstr "" +"Tor Browser gör att din anslutning ofta visas som om den kommer från en helt" +" annan del av världen. Vissa webbplatser, till exempel banker eller " +"e-postleverantörer, kan tolka detta som ett tecken på att ditt konto har " +"hackats eller kompromissad och låser ut dig. Det enda sättet att lösa det " +"här är att följa webbplatsens rekommenderade procedur för kontoåterställning" +" eller kontakta operatörerna och förklara situationen." #: managing-identities.page:101 msgid "Changing identities and circuits" @@ -869,6 +908,8 @@ msgid "" "external ref='media/managing-identities/new_identity.png' " "md5='15b01e35fa83185d94b57bf0ccf09d76'" msgstr "" +"external ref='media/managing-identities/new_identity.png' " +"md5='15b01e35fa83185d94b57bf0ccf09d76'" #: managing-identities.page:105 msgid ""

1 0

[metrics-web/master] Update news.json to version 158 of doc/MetricsTimeline.
by karsten＠torproject.org 15 Oct '17

15 Oct '17

commit e35bd338ed14720243b3193a9739a40d721c5c18 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sun Oct 15 14:45:17 2017 +0200 Update news.json to version 158 of doc/MetricsTimeline. Also fix some minor HTML display bugs in links. --- website/src/main/resources/etc/news.json | 34 ++++++++++++++++++++++++++++---- 1 file changed, 30 insertions(+), 4 deletions(-) diff --git a/website/src/main/resources/etc/news.json b/website/src/main/resources/etc/news.json index 91738ae..c6fd3a7 100644 --- a/website/src/main/resources/etc/news.json +++ b/website/src/main/resources/etc/news.json @@ -1300,6 +1300,16 @@ ] }, { + "start": "2017-10-14", + "protocols": [ + "snowflake" + ], + "description": "Activated client IP address statistics on the Snowflake server and standalone proxies.", + "links": [ + "<a href=\"https://bugs.torproject.org/18628#comment:16\">comment</a>" + ] + }, + { "start": "2016-02-24", "places": [ "tm" @@ -1640,7 +1650,7 @@ "description": "Increase of relay users in the Netherlands, from 50k to 100k.", "links": [ "<a href=\"https://metrics.torproject.org/userstats-relay-country.html?start=2017-05-1…">relay graph</a>", - "<a href=\"https://lists.torproject.org/pipermail/tor-dev/2017-September/012446.html\">post suggesting link to 2× dirauth bandwidth</a>" + "<a href=\"https://lists.torproject.org/pipermail/tor-dev/2017-September/012446.html\">post suggesting link to 2× dirauth bandwidth</a>" ], "unknown": true }, @@ -1656,7 +1666,7 @@ "description": "Increase of relay users in Romania, from 10k to 40k. Bridge users not affected.", "links": [ "<a href=\"https://metrics.torproject.org/userstats-relay-country.html?start=2017-05-1…">relay graph</a>", - "<a href=\"https://lists.torproject.org/pipermail/tor-dev/2017-September/012446.html\">post suggesting link to 2× dirauth bandwidth</a>" + "<a href=\"https://lists.torproject.org/pipermail/tor-dev/2017-September/012446.html\">post suggesting link to 2× dirauth bandwidth</a>" ], "unknown": true }, @@ -1672,7 +1682,7 @@ "description": "Increase of relay users in Lithuania, from 2k to 70k. Bridge users not affected.", "links": [ "<a href=\"https://metrics.torproject.org/userstats-relay-country.html?start=2017-06-0…">relay graph</a>", - "<a href=\"https://lists.torproject.org/pipermail/tor-dev/2017-September/012446.html\">post suggesting link to 2× dirauth bandwidth</a>" + "<a href=\"https://lists.torproject.org/pipermail/tor-dev/2017-September/012446.html\">post suggesting link to 2× dirauth bandwidth</a>" ], "unknown": true }, @@ -1688,7 +1698,7 @@ "description": "Further increase of relay users in the Seychelles, from 5k to 100k. Bridge users not affected.", "links": [ "<a href=\"https://metrics.torproject.org/userstats-relay-country.html?start=2017-05-1…">relay graph</a>", - "<a href=\"https://lists.torproject.org/pipermail/tor-dev/2017-September/012446.html\">post suggesting link to 2× dirauth bandwidth</a>" + "<a href=\"https://lists.torproject.org/pipermail/tor-dev/2017-September/012446.html\">post suggesting link to 2× dirauth bandwidth</a>" ], "unknown": true }, @@ -1752,5 +1762,21 @@ "<a href=\"https://metrics.torproject.org/userstats-relay-country.html?start=2017-07-0…">tr graph</a>" ], "unknown": true + }, + { + "start": "2017-09-17", + "end": "2017-10-15", + "places": [ + "de" + ], + "protocols": [ + "<OR>", + "relay" + ], + "description": "Twofold increase in direct Tor users in Germany.", + "links": [ + "<a href=\"https://metrics.torproject.org/userstats-relay-country.html?start=2017-09-1…">de graph</a>" + ], + "unknown": true } ]

1 0

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation＠torproject.org 15 Oct '17

15 Oct '17

commit 69d7f0c22726efed4042c4dc8c153d6d3b68300e Author: Translation commit bot <translation(a)torproject.org> Date: Sun Oct 15 10:47:20 2017 +0000 Update translations for tails-misc_completed --- he.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/he.po b/he.po index 039adcbe8..5f5087f90 100644 --- a/he.po +++ b/he.po @@ -14,7 +14,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-09-13 20:10+0200\n" -"PO-Revision-Date: 2017-10-01 18:54+0000\n" +"PO-Revision-Date: 2017-10-15 10:21+0000\n" "Last-Translator: ION\n" "Language-Team: Hebrew (http://www.transifex.com/otf/torproject/language/he/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 15 Oct '17

15 Oct '17

commit afbec49c79a454a8ced0c81e2a9900f1b21e7a09 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Oct 15 10:47:14 2017 +0000 Update translations for tails-misc --- he.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/he.po b/he.po index 039adcbe8..5f5087f90 100644 --- a/he.po +++ b/he.po @@ -14,7 +14,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-09-13 20:10+0200\n" -"PO-Revision-Date: 2017-10-01 18:54+0000\n" +"PO-Revision-Date: 2017-10-15 10:21+0000\n" "Last-Translator: ION\n" "Language-Team: Hebrew (http://www.transifex.com/otf/torproject/language/he/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-persistence-setup_completed] Update translations for tails-persistence-setup_completed
by translation＠torproject.org 15 Oct '17

15 Oct '17

commit 877c775492c2c1331e9a5323f589748dbf5259d2 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Oct 15 10:46:16 2017 +0000 Update translations for tails-persistence-setup_completed --- he/he.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/he/he.po b/he/he.po index e2bb4b1fc..a0940f427 100644 --- a/he/he.po +++ b/he/he.po @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2017-05-15 13:51+0200\n" -"PO-Revision-Date: 2017-10-01 14:04+0000\n" +"PO-Revision-Date: 2017-10-15 10:21+0000\n" "Last-Translator: ION\n" "Language-Team: Hebrew (http://www.transifex.com/otf/torproject/language/he/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 15 Oct '17

15 Oct '17

commit 77189c219cebfa800bac824e788ba0983eeda78b Author: Translation commit bot <translation(a)torproject.org> Date: Sun Oct 15 10:46:10 2017 +0000 Update translations for tails-persistence-setup --- he/he.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/he/he.po b/he/he.po index e2bb4b1fc..a0940f427 100644 --- a/he/he.po +++ b/he/he.po @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2017-05-15 13:51+0200\n" -"PO-Revision-Date: 2017-10-01 14:04+0000\n" +"PO-Revision-Date: 2017-10-15 10:21+0000\n" "Last-Translator: ION\n" "Language-Team: Hebrew (http://www.transifex.com/otf/torproject/language/he/)\n" "MIME-Version: 1.0\n"

1 0

[translation/whisperback_completed] Update translations for whisperback_completed
by translation＠torproject.org 15 Oct '17

15 Oct '17

commit 9d3d00458aac393fe6104af58af03a518ae8291e Author: Translation commit bot <translation(a)torproject.org> Date: Sun Oct 15 10:45:33 2017 +0000 Update translations for whisperback_completed --- he/he.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/he/he.po b/he/he.po index 7ae37c900..f93c012e7 100644 --- a/he/he.po +++ b/he/he.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-03-20 12:09+0000\n" -"PO-Revision-Date: 2017-10-01 18:56+0000\n" +"PO-Revision-Date: 2017-10-15 10:22+0000\n" "Last-Translator: ION\n" "Language-Team: Hebrew (http://www.transifex.com/otf/torproject/language/he/)\n" "MIME-Version: 1.0\n"

1 0

[translation/whisperback] Update translations for whisperback
by translation＠torproject.org 15 Oct '17

15 Oct '17

commit 38bcf7e34f4cff03422248a8f2d01a6b44f1444d Author: Translation commit bot <translation(a)torproject.org> Date: Sun Oct 15 10:45:25 2017 +0000 Update translations for whisperback --- he/he.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/he/he.po b/he/he.po index 7ae37c900..f93c012e7 100644 --- a/he/he.po +++ b/he/he.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-03-20 12:09+0000\n" -"PO-Revision-Date: 2017-10-01 18:56+0000\n" +"PO-Revision-Date: 2017-10-15 10:22+0000\n" "Last-Translator: ION\n" "Language-Team: Hebrew (http://www.transifex.com/otf/torproject/language/he/)\n" "MIME-Version: 1.0\n"

1 0

[snowflake/master] Pass client IP from proxy-go to server by parsing SDP
by dcf＠torproject.org 14 Oct '17

14 Oct '17

commit ae0643320e30fb1d9b825c779fdfa0ae2d2ac190 Author: Hooman <hoomanm(a)princeton.edu> Date: Thu Jul 20 16:39:28 2017 -0700 Pass client IP from proxy-go to server by parsing SDP Call conn.RemoteAddr() before entering the datachannelHandler goroutine. This is a workaround for the hang described at https://bugs.torproject.org/18628#comment:8 --- proxy-go/snowflake.go | 54 ++++++++++++++++++++++-- proxy-go/webrtc_test.go | 109 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 159 insertions(+), 4 deletions(-) diff --git a/proxy-go/snowflake.go b/proxy-go/snowflake.go index 33becb3..1273474 100644 --- a/proxy-go/snowflake.go +++ b/proxy-go/snowflake.go @@ -13,6 +13,7 @@ import ( "net/http" "net/url" "os" + "regexp" "strings" "sync" "time" @@ -38,6 +39,25 @@ var ( client http.Client ) +var remoteIPPatterns = []*regexp.Regexp{ + /* IPv4 */ + regexp.MustCompile(`(?m)^c=IN IP4 ([\d.]+)(?:(?:\/\d+)?\/\d+)?(:? |\r?\n)`), + /* IPv6 */ + regexp.MustCompile(`(?m)^c=IN IP6 ([0-9A-Fa-f:.]+)(?:\/\d+)?(:? |\r?\n)`), +} + +// https://tools.ietf.org/html/rfc4566#section-5.7 +func remoteIPFromSDP(sdp string) net.IP { + for _, pattern := range remoteIPPatterns { + m := pattern.FindStringSubmatch(sdp) + if m != nil { + // Ignore parsing errors, ParseIP returns nil. + return net.ParseIP(m[1]) + } + } + return nil +} + type webRTCConn struct { dc *webrtc.DataChannel pc *webrtc.PeerConnection @@ -64,7 +84,12 @@ func (c *webRTCConn) LocalAddr() net.Addr { } func (c *webRTCConn) RemoteAddr() net.Addr { - return nil + //Parse Remote SDP offer and extract client IP + clientIP := remoteIPFromSDP(c.pc.RemoteDescription().Sdp) + if clientIP == nil { + return nil + } + return &net.IPAddr{clientIP, ""} } func (c *webRTCConn) SetDeadline(t time.Time) error { @@ -181,11 +206,31 @@ func CopyLoopTimeout(c1 net.Conn, c2 net.Conn, timeout time.Duration) { wg.Wait() } -func datachannelHandler(conn *webRTCConn) { +// We pass conn.RemoteAddr() as an additional parameter, rather than calling +// conn.RemoteAddr() inside this function, as a workaround for a hang that +// otherwise occurs inside of conn.pc.RemoteDescription() (called by +// RemoteAddr). https://bugs.torproject.org/18628#comment:8 +func datachannelHandler(conn *webRTCConn, remoteAddr net.Addr) { defer conn.Close() defer retToken() - wsConn, err := websocket.Dial(relayURL, "", relayURL) + u, err := url.Parse(relayURL) + if err != nil { + log.Fatalf("invalid relay url: %s", err) + } + + // Retrieve client IP address + if remoteAddr != nil { + // Encode client IP address in relay URL + q := u.Query() + clientIP := remoteAddr.String() + q.Set("client_ip", clientIP) + u.RawQuery = q.Encode() + } else { + log.Printf("no remote address given in websocket") + } + + wsConn, err := websocket.Dial(u.String(), "", relayURL) if err != nil { log.Printf("error dialing relay: %s", err) return @@ -237,8 +282,9 @@ func makePeerConnectionFromOffer(sdp *webrtc.SessionDescription, config *webrtc. panic("short write") } } + conn := &webRTCConn{pc: pc, dc: dc, pr: pr} - go datachannelHandler(conn) + go datachannelHandler(conn, conn.RemoteAddr()) } err = pc.SetRemoteDescription(sdp) diff --git a/proxy-go/webrtc_test.go b/proxy-go/webrtc_test.go new file mode 100644 index 0000000..2413207 --- /dev/null +++ b/proxy-go/webrtc_test.go @@ -0,0 +1,109 @@ +package main + +import ( + "net" + "strings" + "testing" +) + +func TestRemoteIPFromSDP(t *testing.T) { + tests := []struct { + sdp string + expected net.IP + }{ + // https://tools.ietf.org/html/rfc4566#section-5 + {`v=0 +o=jdoe 2890844526 2890842807 IN IP4 10.47.16.5 +s=SDP Seminar +i=A Seminar on the session description protocol +u=http://www.example.com/seminars/sdp.pdf +e=j.doe(a)example.com (Jane Doe) +c=IN IP4 224.2.17.12/127 +t=2873397496 2873404696 +a=recvonly +m=audio 49170 RTP/AVP 0 +m=video 51372 RTP/AVP 99 +a=rtpmap:99 h263-1998/90000 +`, net.ParseIP("224.2.17.12")}, + // Missing c= line + {`v=0 +o=jdoe 2890844526 2890842807 IN IP4 10.47.16.5 +s=SDP Seminar +i=A Seminar on the session description protocol +u=http://www.example.com/seminars/sdp.pdf +e=j.doe(a)example.com (Jane Doe) +t=2873397496 2873404696 +a=recvonly +m=audio 49170 RTP/AVP 0 +m=video 51372 RTP/AVP 99 +a=rtpmap:99 h263-1998/90000 +`, nil}, + // Single line, IP address only + {`c=IN IP4 224.2.1.1 +`, net.ParseIP("224.2.1.1")}, + // Same, with TTL + {`c=IN IP4 224.2.1.1/127 +`, net.ParseIP("224.2.1.1")}, + // Same, with TTL and multicast addresses + {`c=IN IP4 224.2.1.1/127/3 +`, net.ParseIP("224.2.1.1")}, + // IPv6, address only + {`c=IN IP6 FF15::101 +`, net.ParseIP("ff15::101")}, + // Same, with multicast addresses + {`c=IN IP6 FF15::101/3 +`, net.ParseIP("ff15::101")}, + // Multiple c= lines + {`c=IN IP4 1.2.3.4 +c=IN IP4 5.6.7.8 +`, net.ParseIP("1.2.3.4")}, + // Modified from SDP sent by snowflake-client. + {`v=0 +o=- 7860378660295630295 2 IN IP4 127.0.0.1 +s=- +t=0 0 +a=group:BUNDLE data +a=msid-semantic: WMS +m=application 54653 DTLS/SCTP 5000 +c=IN IP4 1.2.3.4 +a=candidate:3581707038 1 udp 2122260223 192.168.0.1 54653 typ host generation 0 network-id 1 network-cost 50 +a=candidate:2617212910 1 tcp 1518280447 192.168.0.1 59673 typ host tcptype passive generation 0 network-id 1 network-cost 50 +a=candidate:2082671819 1 udp 1686052607 1.2.3.4 54653 typ srflx raddr 192.168.0.1 rport 54653 generation 0 network-id 1 network-cost 50 +a=ice-ufrag:IBdf +a=ice-pwd:G3lTrrC9gmhQx481AowtkhYz +a=fingerprint:sha-256 53:F8:84:D9:3C:1F:A0:44:AA:D6:3C:65:80:D3:CB:6F:23:90:17:41:06:F9:9C:10:D8:48:4A:A8:B6:FA:14:A1 +a=setup:actpass +a=mid:data +a=sctpmap:5000 webrtc-datachannel 1024 +`, net.ParseIP("1.2.3.4")}, + // Improper character within IPv4 + {`c=IN IP4 224.2z.1.1 +`, nil}, + // Improper character within IPv6 + {`c=IN IP6 ff15:g::101 +`, nil}, + // Bogus "IP7" addrtype + {`c=IN IP7 1.2.3.4 +`, nil}, + } + + for _, test := range tests { + // https://tools.ietf.org/html/rfc4566#section-5: "The sequence + // CRLF (0x0d0a) is used to end a record, although parsers + // SHOULD be tolerant and also accept records terminated with a + // single newline character." We represent the test cases with + // LF line endings for convenience, and test them both that way + // and with CRLF line endings. + lfSDP := test.sdp + crlfSDP := strings.Replace(lfSDP, "\n", "\r\n", -1) + + ip := remoteIPFromSDP(lfSDP) + if !ip.Equal(test.expected) { + t.Errorf("expected %q, got %q from %q", test.expected, ip, lfSDP) + } + ip = remoteIPFromSDP(crlfSDP) + if !ip.Equal(test.expected) { + t.Errorf("expected %q, got %q from %q", test.expected, ip, crlfSDP) + } + } +}

1 0