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

[translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
by translation＠torproject.org 06 Oct '20

06 Oct '20

commit d11ed86e53a9cb30a5203d64f56e68959730690a Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 6 07:15:12 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+ka.po | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/contents+ka.po b/contents+ka.po index 946be8f15c..2715727947 100644 --- a/contents+ka.po +++ b/contents+ka.po @@ -6063,6 +6063,8 @@ msgid "" "The following scenario-specific paragraphs should be appended to the Common " "Boilerplate paragraphs above." msgstr "" +"მოცემული პარაგრაფები გარემოებების მიხედვით უნდა დაერთოს ზემოთ აღნიშნულ " +"სტანდარტულ ტექსტს." #: https//community.torproject.org/relay/community-resources/tor-abuse-templates/ #: (content/relay-operations/community-resources/tor-abuse-templates/contents+en.lrpage.body) @@ -6070,6 +6072,8 @@ msgid "" "The common boilerplate should be abridged or be omitted if the abuse " "complaintant is already familiar with Tor." msgstr "" +"ჩვეული ტექსტი შეიძლება შემოკლდეს ან გამოირიცხოს კიდეც, თუ საჩივარში ჩანს, " +"რომ მათთვის Tor-ის შესახებ კარგადაა ცნობილი." #: https//community.torproject.org/relay/community-resources/tor-abuse-templates/ #: (content/relay-operations/community-resources/tor-abuse-templates/contents+en.lrpage.body) @@ -6079,7 +6083,7 @@ msgstr "## გამოხმაურება/არასასურვე #: https//community.torproject.org/relay/community-resources/tor-abuse-templates/ #: (content/relay-operations/community-resources/tor-abuse-templates/contents+en.lrpage.body) msgid "This does not mean that nothing can be done, however." -msgstr "" +msgstr "ეს არ ნიშნავს, რომ არაფრის გაკეთებაა არ შეიძლება." #: https//community.torproject.org/relay/community-resources/tor-abuse-templates/ #: (content/relay-operations/community-resources/tor-abuse-templates/contents+en.lrpage.body) @@ -6087,6 +6091,8 @@ msgid "" "The Tor Project provides an automated DNSRBL for you to query to flag posts " "coming from Tor nodes as requiring special review." msgstr "" +"Tor პროექტი უზრუნველყოფს ავტომატურ DNSRBL-ს, მოთხოვნებისთვის Tor-კვანძებიდან" +" მომავალი გამოხმაურებების მოსანიშნად, საგანგებო განხილვის მიზნით." #: https//community.torproject.org/relay/community-resources/tor-abuse-templates/ #: (content/relay-operations/community-resources/tor-abuse-templates/contents+en.lrpage.body) @@ -6094,6 +6100,9 @@ msgid "" "You can also use this DNSRBL to only allow Tor IPs to read but not post " "comments. https://www.torproject.org/projects/tordnsel.html.en" msgstr "" +"აგრეთვე, შეგიძლიათ გამოიყენოთ DNSRBL და Tor-ის IP-ებს დართოთ მხოლოდ " +"წაკითხვის უფლება, გამოხმაურების დაწერის გარეშე. " +"https://www.torproject.org/projects/tordnsel.html.en" #: https//community.torproject.org/relay/community-resources/tor-abuse-templates/ #: (content/relay-operations/community-resources/tor-abuse-templates/contents+en.lrpage.body) @@ -6101,6 +6110,8 @@ msgid "" "However, be aware that this may be just one jerk amongst many legitimate Tor" " users who use your forums." msgstr "" +"თუმცა, გაითვალისწინეთ, რომ ასეთი შეიძლება მხოლოდ ერთი იყოს, მრავალ წესიერ " +"Tor-მომხმარებელს შორის, თქვენს ფორუმებზე." #: https//community.torproject.org/relay/community-resources/tor-abuse-templates/ #: (content/relay-operations/community-resources/tor-abuse-templates/contents+en.lrpage.body) @@ -6109,6 +6120,9 @@ msgid "" " creation to require Gmail accounts before posting, or by requiring account " "creation be done over non-Tor before posting." msgstr "" +"უმჯობესია სცადოთ მისი მოცილება, გამოხმაურების დასაწერად ანგარიშების შექმნის " +"დროებით შეზღუდვით, შესაბამის Gmail-მისამართებზე ან მოითხოვოთ ანგარიშის " +"შექმნა Tor-ის გარეშე, გამოხმაურების დატოვების უფლების მისაცემად." #: https//community.torproject.org/relay/community-resources/tor-abuse-templates/ #: (content/relay-operations/community-resources/tor-abuse-templates/contents+en.lrpage.body) @@ -6116,6 +6130,9 @@ msgid "" "In general, we believe that problems like this are best solved by improving " "your service to defend against the attack from the Internet at large." msgstr "" +"ზოგადად, ჩვენ მიგვაჩნია რომ ამგვარი ხარვეზების მოგვარების საუკეთესო " +"გადაწყვეტაა, თქვენი მომსახურების სრულიად გაუმჯობესება, შეტევებისგან დაცვის " +"კუთხით." #: https//community.torproject.org/relay/community-resources/tor-abuse-templates/ #: (content/relay-operations/community-resources/tor-abuse-templates/contents+en.lrpage.body)

1 0

[snowflake/master] Extract remote address from ICE candidates
by cohosh＠torproject.org 05 Oct '20

05 Oct '20

commit d7aa9b835645bc52c29ba13cdab461fe0d0e4e66 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Wed Sep 30 10:10:29 2020 -0400 Extract remote address from ICE candidates Parse the received ICE candidates as well as the Connection Data field for a non-local IP address to pass to the bridge. This fixes bug #33157. --- proxy/proxy-go_test.go | 126 +++++++++++++++++++++++++++++++++++++++++++++---- proxy/snowflake.go | 41 ++++++++++++++-- 2 files changed, 154 insertions(+), 13 deletions(-) diff --git a/proxy/proxy-go_test.go b/proxy/proxy-go_test.go index 168ca25..1218289 100644 --- a/proxy/proxy-go_test.go +++ b/proxy/proxy-go_test.go @@ -64,6 +64,51 @@ m=audio 49170 RTP/AVP 0 m=video 51372 RTP/AVP 99 a=rtpmap:99 h263-1998/90000 `, net.ParseIP("224.2.17.12")}, + // local addresses only + {`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 10.47.16.5/127 +t=2873397496 2873404696 +a=recvonly +m=audio 49170 RTP/AVP 0 +m=video 51372 RTP/AVP 99 +a=rtpmap:99 h263-1998/90000 +`, nil}, + // Remote IP in candidate attribute only + {`v=0 +o=- 4358805017720277108 2 IN IP4 0.0.0.0 +s=- +t=0 0 +a=group:BUNDLE data +a=msid-semantic: WMS +m=application 56688 DTLS/SCTP 5000 +c=IN IP4 0.0.0.0 +a=candidate:3769337065 1 udp 2122260223 1.2.3.4 56688 typ host generation 0 network-id 1 network-cost 50 +a=ice-ufrag:aMAZ +a=ice-pwd:jcHb08Jjgrazp2dzjdrvPPvV +a=ice-options:trickle +a=fingerprint:sha-256 C8:88:EE:B9:E7:02:2E:21:37:ED:7A:D1:EB:2B:A3:15:A2:3B:5B:1C:3D:D4:D5:1F:06:CF:52:40:03:F8:DD:66 +a=setup:actpass +a=mid:data +a=sctpmap:5000 webrtc-datachannel 1024 +`, net.ParseIP("1.2.3.4")}, + // Unspecified address + {`v=0 +o=jdoe 2890844526 2890842807 IN IP4 0.0.0.0 +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}, // Missing c= line {`v=0 o=jdoe 2890844526 2890842807 IN IP4 10.47.16.5 @@ -78,22 +123,64 @@ 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 + {`v=0 +o=- 4358805017720277108 2 IN IP4 0.0.0.0 +s=- +t=0 0 +a=group:BUNDLE data +a=msid-semantic: WMS +m=application 56688 DTLS/SCTP 5000 +c=IN IP4 224.2.1.1 `, net.ParseIP("224.2.1.1")}, // Same, with TTL - {`c=IN IP4 224.2.1.1/127 + {`v=0 +o=- 4358805017720277108 2 IN IP4 0.0.0.0 +s=- +t=0 0 +a=group:BUNDLE data +a=msid-semantic: WMS +m=application 56688 DTLS/SCTP 5000 +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 + {`v=0 +o=- 4358805017720277108 2 IN IP4 0.0.0.0 +s=- +t=0 0 +a=group:BUNDLE data +a=msid-semantic: WMS +m=application 56688 DTLS/SCTP 5000 +c=IN IP4 224.2.1.1/127/3 `, net.ParseIP("224.2.1.1")}, // IPv6, address only - {`c=IN IP6 FF15::101 + {`v=0 +o=- 4358805017720277108 2 IN IP4 0.0.0.0 +s=- +t=0 0 +a=group:BUNDLE data +a=msid-semantic: WMS +m=application 56688 DTLS/SCTP 5000 +c=IN IP6 FF15::101 `, net.ParseIP("ff15::101")}, // Same, with multicast addresses - {`c=IN IP6 FF15::101/3 + {`v=0 +o=- 4358805017720277108 2 IN IP4 0.0.0.0 +s=- +t=0 0 +a=group:BUNDLE data +a=msid-semantic: WMS +m=application 56688 DTLS/SCTP 5000 +c=IN IP6 FF15::101/3 `, net.ParseIP("ff15::101")}, // Multiple c= lines - {`c=IN IP4 1.2.3.4 + {`v=0 +o=- 4358805017720277108 2 IN IP4 0.0.0.0 +s=- +t=0 0 +a=group:BUNDLE data +a=msid-semantic: WMS +m=application 56688 DTLS/SCTP 5000 +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. @@ -116,13 +203,34 @@ 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 + {`v=0 +o=- 4358805017720277108 2 IN IP4 0.0.0.0 +s=- +t=0 0 +a=group:BUNDLE data +a=msid-semantic: WMS +m=application 56688 DTLS/SCTP 5000 +c=IN IP4 224.2z.1.1 `, nil}, // Improper character within IPv6 - {`c=IN IP6 ff15:g::101 + {`v=0 +o=- 4358805017720277108 2 IN IP4 0.0.0.0 +s=- +t=0 0 +a=group:BUNDLE data +a=msid-semantic: WMS +m=application 56688 DTLS/SCTP 5000 +c=IN IP6 ff15:g::101 `, nil}, // Bogus "IP7" addrtype - {`c=IN IP7 1.2.3.4 + {`v=0 +o=- 4358805017720277108 2 IN IP4 0.0.0.0 +s=- +t=0 0 +a=group:BUNDLE data +a=msid-semantic: WMS +m=application 56688 DTLS/SCTP 5000 +c=IN IP7 1.2.3.4 `, nil}, } diff --git a/proxy/snowflake.go b/proxy/snowflake.go index b880b36..ac85527 100644 --- a/proxy/snowflake.go +++ b/proxy/snowflake.go @@ -24,6 +24,7 @@ import ( "git.torproject.org/pluggable-transports/snowflake.git/common/util" "git.torproject.org/pluggable-transports/snowflake.git/common/websocketconn" "github.com/gorilla/websocket" + "github.com/pion/sdp/v2" "github.com/pion/webrtc/v2" ) @@ -65,15 +66,47 @@ var remoteIPPatterns = []*regexp.Regexp{ 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 { +// Checks whether an IP address is a remote address for the client +func isRemoteAddress(ip net.IP) bool { + return !(util.IsLocal(ip) || ip.IsUnspecified() || ip.IsLoopback()) +} + +func remoteIPFromSDP(str string) net.IP { + // Look for remote IP in "a=candidate" attribute fields + // https://tools.ietf.org/html/rfc5245#section-15.1 + var desc sdp.SessionDescription + err := desc.Unmarshal([]byte(str)) + if err != nil { + log.Println("Error parsing SDP: ", err.Error()) + return nil + } + for _, m := range desc.MediaDescriptions { + for _, a := range m.Attributes { + if a.IsICECandidate() { + ice, err := a.ToICECandidate() + if err == nil { + ip := net.ParseIP(ice.Address) + if ip != nil && isRemoteAddress(ip) { + return ip + } + } + } + } + } + // Finally look for remote IP in "c=" Connection Data field + // https://tools.ietf.org/html/rfc4566#section-5.7 for _, pattern := range remoteIPPatterns { - m := pattern.FindStringSubmatch(sdp) + m := pattern.FindStringSubmatch(str) if m != nil { // Ignore parsing errors, ParseIP returns nil. - return net.ParseIP(m[1]) + ip := net.ParseIP(m[1]) + if ip != nil && isRemoteAddress(ip) { + return ip + } + } } + return nil }

1 0

[translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
by translation＠torproject.org 05 Oct '20

05 Oct '20

commit cf5fb9aa461faa74ad67a120d694a595709d7e9d Author: Translation commit bot <translation(a)torproject.org> Date: Mon Oct 5 20:45:12 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+ka.po | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/contents+ka.po b/contents+ka.po index 45deb73ebf..946be8f15c 100644 --- a/contents+ka.po +++ b/contents+ka.po @@ -6022,6 +6022,11 @@ msgid "" "skirting the Great Firewall, abuse victims, stalker targets, the US " "military, and law enforcement, just to name a few." msgstr "" +"ეს იმიტომ, რომ Tor-ქსელი არის ცენზურისგან დაცული, პირადულობის, ვინაობის " +"გაუმხელობის უზრუნველმყოფი, რომელსაც იყენებენ ფარული ინფორმაციის " +"გამომქვეყნებლები, ჟურნალისტები, ჩინელი მეამბოხეები, ინტერნეტშემზღუდავი დიდი " +"კედლის გასარღვევად, ძალადობის მსხვერპლნი, დევნის ობიექტები, შტატების " +"სამხედრო პირები, კანონდამცველები და კიდევ უამრავი ადამიანი." #: https//community.torproject.org/relay/community-resources/tor-abuse-templates/ #: (content/relay-operations/community-resources/tor-abuse-templates/contents+en.lrpage.body) @@ -6034,6 +6039,9 @@ msgid "" "Unfortunately, some people misuse the network. However, compared to the rate" " of legitimate use (the IP range in question processes nearly" msgstr "" +"სამწუხაროდ, ზოგიერთი არადანიშნულებისამებრ იყენებს ამ ქსელს. თუმცაღა, " +"მართლზომიერი გამოყენების სიხშირესთან შედარებით (IP-სივრცე ამუშავებს " +"დაახლოებით" #: https//community.torproject.org/relay/community-resources/tor-abuse-templates/ #: (content/relay-operations/community-resources/tor-abuse-templates/contents+en.lrpage.body) @@ -6041,6 +6049,8 @@ msgid "" "a gigabit of traffic per second), [abuse complaints are " "rare](https://www.torproject.org/docs/faq-abuse.html.en)." msgstr "" +"გიგაბიტი მოცულობის მონაცემებს წამში), [დარღვევებზე საჩივრები მეტად " +"იშვიათია](https://www.torproject.org/docs/faq-abuse.html.en)." #: https//community.torproject.org/relay/community-resources/tor-abuse-templates/ #: (content/relay-operations/community-resources/tor-abuse-templates/contents+en.lrpage.body)

1 0

[snowflake-webext/master] bump version to 0.4.2
by cohosh＠torproject.org 05 Oct '20

05 Oct '20

commit 93c41d2d9934215748cb4a95f836f3bb9c66b42d Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Mon Oct 5 16:28:08 2020 -0400 bump version to 0.4.2 --- package.json | 2 +- translation | 2 +- webext/manifest.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 432bdf4..bd0e048 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "snowflake-pt", - "version": "0.4.1", + "version": "0.4.2", "description": "Snowflake is a WebRTC pluggable transport for Tor.", "main": "build/snowflake.js", "directories": { diff --git a/translation b/translation index 9839968..f822932 160000 --- a/translation +++ b/translation @@ -1 +1 @@ -Subproject commit 9839968c45d124011d47a4c5e2110eec853638e2 +Subproject commit f8229329081e851908a97c3c151ed4b82a6fca78 diff --git a/webext/manifest.json b/webext/manifest.json index 8d7fa4d..04d2b96 100644 --- a/webext/manifest.json +++ b/webext/manifest.json @@ -1,7 +1,7 @@ { "manifest_version": 2, "name": "Snowflake", - "version": "0.4.1", + "version": "0.4.2", "description": "__MSG_appDesc__", "default_locale": "en_US", "background": {

1 0

[translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
by translation＠torproject.org 05 Oct '20

05 Oct '20

commit 5c44711d34c1bc301426500cffcea50ed36d1d48 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Oct 5 20:15:11 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+ka.po | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/contents+ka.po b/contents+ka.po index df93f1f01c..45deb73ebf 100644 --- a/contents+ka.po +++ b/contents+ka.po @@ -5994,6 +5994,9 @@ msgid "" "users impossible. The Tor network is run by some 5000 volunteers who use the" " free software provided by the Tor Project to run Tor routers." msgstr "" +"მომხმარებლის კვალზე დადევნება შეუძლებელი იყო. Tor-ქსელს ამუშავებს 5000-მდე " +"მოხალისე, რომლებსაც გაშვებული აქვთ Tor-პროექტის მიერ შექმნილი თავისუფალი " +"პროგრამული უზრუნველყოფა, Tor-ის დამისამართებისთვის." #: https//community.torproject.org/relay/community-resources/tor-abuse-templates/ #: (content/relay-operations/community-resources/tor-abuse-templates/contents+en.lrpage.body) @@ -6001,6 +6004,8 @@ msgid "" "Client connections are routed through multiple relays, and are multiplexed " "together on the connections between relays." msgstr "" +"მომხმარებლის კავშირები გაივლის მრავალი გადამცემის მეშვეობით და გარდაქმნილი " +"სახით გადამისამართდება მათ შორის." #: https//community.torproject.org/relay/community-resources/tor-abuse-templates/ #: (content/relay-operations/community-resources/tor-abuse-templates/contents+en.lrpage.body)

1 0

[snowflake-webext/master] Only extract remote address from peer SDP
by cohosh＠torproject.org 05 Oct '20

05 Oct '20

commit e0f00904102b76af0f8b3cdbb40d8ee45f1018f4 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Wed Sep 30 15:08:54 2020 -0400 Only extract remote address from peer SDP We need to extract the remote address of the client to pass along to the bridge. This adds an extra check to see whether the retrieved address is a remote address (as opposed to local, loopback, or unspecified). It also expands the SDP regexes to check for addresses in the ice candidates. This fixes issue #16 --- spec/util.spec.js | 114 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ util.js | 43 +++++++++++++++++--- 2 files changed, 152 insertions(+), 5 deletions(-) diff --git a/spec/util.spec.js b/spec/util.spec.js index a15c201..687ae98 100644 --- a/spec/util.spec.js +++ b/spec/util.spec.js @@ -136,6 +136,15 @@ describe('Parse', function() { sdp: "v=0\no=jdoe 2890844526 2890842807 IN IP4 10.47.16.5\ns=SDP Seminar\ni=A Seminar on the session description protocol\nu=http://www.example.com/seminars/sdp.pdf\ne=j.doe@example.com (Jane Doe)\nc=IN IP4 224.2.17.12/127\nt=2873397496 2873404696\na=recvonly\nm=audio 49170 RTP/AVP 0\nm=video 51372 RTP/AVP 99\na=rtpmap:99 h263-1998/90000", expected: '224.2.17.12' }, + { + // local addresses only + sdp: "v=0\no=jdoe 2890844526 2890842807 IN IP4 10.47.16.5\ns=SDP Seminar\ni=A Seminar on the session description protocol\nu=http://www.example.com/seminars/sdp.pdf\ne=j.doe@example.com (Jane Doe)\nc=IN IP4 10.47.16.5\nt=2873397496 2873404696\na=recvonly\nm=audio 49170 RTP/AVP 0\nm=video 51372 RTP/AVP 99\na=rtpmap:99 h263-1998/90000", + expected: void 0 + }, + { + sdp: "v=0\no=jdoe 2890844526 2890842807 IN IP4 10.47.16.5\ns=SDP Seminar\ni=A Seminar on the session description protocol\nu=http://www.example.com/seminars/sdp.pdf\ne=j.doe@example.com (Jane Doe)\nc=IN IP4 10.47.16.5\na=candidate:3581707038 1 udp 2122260223 192.168.0.1 54653 typ host generation 0 network-id 1 network-cost 50\na=candidate:2617212910 1 tcp 1518280447 192.168.0.1 59673 typ host tcptype passive generation 0 network-id 1 network-cost 50\na=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\nt=2873397496 2873404696\na=recvonly\nm=audio 49170 RTP/AVP 0\nm=video 51372 RTP/AVP 99\na=rtpmap:99 h263-1998/90000", + expected: '1.2.3.4' + }, { // Missing c= line sdp: "v=0\no=jdoe 2890844526 2890842807 IN IP4 10.47.16.5\ns=SDP Seminar\ni=A Seminar on the session description protocol\nu=http://www.example.com/seminars/sdp.pdf\ne=j.doe@example.com (Jane Doe)\nt=2873397496 2873404696\na=recvonly\nm=audio 49170 RTP/AVP 0\nm=video 51372 RTP/AVP 99\na=rtpmap:99 h263-1998/90000", @@ -235,6 +244,111 @@ describe('Parse', function() { } }); }); + describe('isRemoteIP', function() { + + var testCases = [ + { + ip: "127.0.0.1", + expected: false + }, + { + ip: "::1", + expected: false + }, + { + ip: "0::1", + expected: false + }, + { + ip: "192.168.1.1", + expected: false + }, + { + ip: "10.0.0.0", + expected: false + }, + { + ip: "172.16.1.1", + expected: false + }, + { + ip: "172.15.1.1", + expected: true + }, + { + ip: "100.63.1.1", + expected: true + }, + { + ip: "100.64.1.1", + expected: false + }, + { + ip: "100.127.255.255", + expected: false + }, + { + ip: "100.128.0.0", + expected: true + }, + { + ip: "169.254.0.0", + expected: false + }, + { + ip: "169.244.0.1", + expected: true + }, + { + ip: "fc00::", + expected: false + }, + { + ip: "fdff::0", + expected: false + }, + { + ip: "ff00::0", + expected: true + }, + { + ip: "0.0.0.0", + expected: false + }, + { + ip: "::", + expected: false + }, + { + ip: "::0", + expected: false + }, + { + ip: "0::0", + expected: false + }, + { + ip: "0::", + expected: false + }, + { + ip: "ff15::101", + expected: true + }, + { + ip: "1.2.3.4", + expected: true + } + ]; + it('finds local addresses', function() { + var i, len, ref, ref1, results, test; + results = []; + for (i = 0, len = testCases.length; i < len; i++) { + test = testCases[i]; + expect(Parse.isRemoteIP(test.ip)).toEqual(test.expected); + } + }); + }); }); describe('Params', function() { diff --git a/util.js b/util.js index 0199ae8..ee36478 100644 --- a/util.js +++ b/util.js @@ -133,17 +133,26 @@ class Parse { return count * multiplier; } - // Parse a connection-address out of the "c=" Connection Data field of a - // session description. Return undefined if none is found. + //Parse a remote connection-address out of the "c=" Connection Data field + // or the "a=" attribute fields of the session description. + // Return undefined if none is found. // https://tools.ietf.org/html/rfc4566#section-5.7 + // https://tools.ietf.org/html/rfc5245#section-15 static ipFromSDP(sdp) { var i, len, m, pattern, ref; - ref = [/^c=IN IP4 ([\d.]+)(?:(?:\/\d+)?\/\d+)?(:? |$)/m, /^c=IN IP6 ([0-9A-Fa-f:.]+)(?:\/\d+)?(:? |$)/m]; + console.log(sdp); + ref = [ + /^a=candidate:[a-zA-Z0-9+/]+ \d+ udp \d+ ([\d.]+) /mg, + /^a=candidate:[a-zA-Z0-9+/]+ \d+ udp \d+ ([0-9A-Fa-f:.]+) /mg, + /^c=IN IP4 ([\d.]+)(?:(?:\/\d+)?\/\d+)?(:? |$)/mg, + /^c=IN IP6 ([0-9A-Fa-f:.]+)(?:\/\d+)?(:? |$)/mg + ]; for (i = 0, len = ref.length; i < len; i++) { pattern = ref[i]; m = pattern.exec(sdp); - if (m != null) { - return m[1]; + while (m != null) { + if(Parse.isRemoteIP(m[1])) return m[1]; + m = pattern.exec(sdp); } } } @@ -160,6 +169,30 @@ class Parse { return null; } + // Determine whether an IP address is a local, unspecified, or loopback address + static isRemoteIP(ip) { + if (ip.includes(":")) { + var ip6 = ip.split(':'); + // Loopback address + var loopback = /^(?:0*:)*?:?0*1$/m; + // Unspecified address + var unspecified = /^(?:0*:)*?:?0*$/m; + // Local IPv6 addresses are defined in https://tools.ietf.org/html/rfc4193 + return !((loopback.exec(ip) != null) || (unspecified.exec(ip) != null) || + (parseInt(ip6[0],16)&0xfe00) == 0xfc00); + } + + // Local IPv4 addresses are defined in https://tools.ietf.org/html/rfc1918 + var ip4 = ip.split('.'); + return !(ip4[0] == 10 || ip4[0] == 127 || ip == "0.0.0.0" || + (ip4[0] == 172 && (ip4[1]&0xf0) == 16) || + (ip4[0] == 192 && ip4[1] == 168) || + // Carrier-Grade NAT as per https://tools.ietf.org/htm/rfc6598 + (ip4[0] == 100 && (ip4[1]&0xc0) == 64) || + // Dynamic Configuration as per https://tools.ietf.org/htm/rfc3927 + (ip4[0] == 169 && ip4[1] == 254)); + } + }

1 0

[translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
by translation＠torproject.org 05 Oct '20

05 Oct '20

commit 76e2dbd0bdbf334ae6cbcc0ec372e7aae8b88c3e Author: Translation commit bot <translation(a)torproject.org> Date: Mon Oct 5 19:45:18 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+ka.po | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/contents+ka.po b/contents+ka.po index a0d15678f0..df93f1f01c 100644 --- a/contents+ka.po +++ b/contents+ka.po @@ -5961,16 +5961,18 @@ msgid "" "All templates should include the Common Boilerplate below, and append some " "additional paragraphs depending on the specific Scenario." msgstr "" +"ყველა ნიმუში უნდა შეიცავდეს სამართლებრივ სტანდარტულ ტექსტს ქვემოთ და " +"დანართს, რამდენიმე პარაგრაფის სახით, გარემოებების შესაბამისად." #: https//community.torproject.org/relay/community-resources/tor-abuse-templates/ #: (content/relay-operations/community-resources/tor-abuse-templates/contents+en.lrpage.body) msgid "## Common Boilerplate (Tor Intro)" -msgstr "" +msgstr "## ჩვეული თარგი (Tor შესავალი)" #: https//community.torproject.org/relay/community-resources/tor-abuse-templates/ #: (content/relay-operations/community-resources/tor-abuse-templates/contents+en.lrpage.body) msgid "The IP address in question is a Tor exit node." -msgstr "IP-მისამართი კითხვაში, არის Tor-ის გამსვლელი კვანძი." +msgstr "აღნიშნული IP-მისამართი, წარმოადგენს Tor-ის გამსვლელ კვანძს." #: https//community.torproject.org/relay/community-resources/tor-abuse-templates/ #: (content/relay-operations/community-resources/tor-abuse-templates/contents+en.lrpage.body) @@ -5983,6 +5985,8 @@ msgid "" "There is little we can do to trace this matter further. As can be seen from " "the overview page, the Tor network is designed to make tracing of" msgstr "" +"ჩვენ თითქმის არაფრის გაკეთება არ შეგვიძლია კვალის დადგენის კუთხით. როგორც " +"მიმოხილვის გვერდიდან შეიტყობდით, Tor-ქსელი ისეა მოწყობილი, რომ" #: https//community.torproject.org/relay/community-resources/tor-abuse-templates/ #: (content/relay-operations/community-resources/tor-abuse-templates/contents+en.lrpage.body)

1 0

[translation/fenix-torbrowserstringsxml_completed] https://gitweb.torproject.org/translation.git/commit/?h=fenix-torbrowserstringsxml_completed
by translation＠torproject.org 05 Oct '20

05 Oct '20

commit 9fe4299350f5af668f0f890fb28cfe2ad3f9a845 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Oct 5 19:15:34 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=fenix-torbrowserstr… --- hr/torbrowser_strings.xml | 62 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/hr/torbrowser_strings.xml b/hr/torbrowser_strings.xml new file mode 100644 index 0000000000..2602ff65ba --- /dev/null +++ b/hr/torbrowser_strings.xml @@ -0,0 +1,62 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<resources> +  + <string name="preferences_disable_normal_mode">Dozvoli samo modus privatnog pregledavanja</string> +  + <string name="preferences_donate">Doniraj organizaciji Tor Project</string> +  + <string name="preferences_allow_screenshots">Dozvoli snimanje slika ekrana</string> + + <string name="tor_bootstrap_connect">Spoji</string> + <string name="tor_bootstrap_connecting">Spajanje</string> + <string name="tor_bootstrap_connecting_failed">Spajanje neuspjelo</string> + <string name="tor_bootstrap_quick_start_label">Brzo pokretanje</string> + <string name="tor_bootstrap_quick_start_disabled">Aktiviraj „Brzo pokretanje” za automatsko spajanje u budućnosti</string> + <string name="tor_bootstrap_quick_start_enabled">%s će se u budućnosti automatski spojiti na Tor mrežu</string> + <string name="tor_bootstrap_swipe_for_logs">Potegni prstom ulijevo za prikaz Tor zapisa</string> + <string name="tor_initializing_log">Inicijaliziranje Torovih log-zapisa</string> + + <string name="tor_onboarding_security_level">Postavi razinu sigurnosti</string> + <string name="tor_onboarding_security_level_description">Aktiviraj određene web-funkcije koje se mogu koristiti kako bi te se napalo i koje štete tvojoj sigurnosti, anonimnosti i privatnosti.</string> + <string name="tor_onboarding_security_level_standard_option">Standardno</string> + <string name="tor_onboarding_security_level_standard_button_description">Sve funkcije Tor preglednika i web stranica su aktivirane.</string> + <string name="tor_onboarding_security_level_safer_option">Sigurnije</string> + <string name="tor_onboarding_security_level_safer_button_description">Deaktiviraj web-funkcije koje su često opasne i koje onemogućuju funkcionalnost nekih web-stranica.</string> + <string name="tor_onboarding_security_level_safest_option">Najsigurnije</string> + <string name="tor_onboarding_security_level_safest_button_description">Dozvoli samo funkcije web-stranica potrebne za statične web-stranice i osnovne usluge. Ove promjene utječu na slike, medije i skripte.</string> + <string name="tor_onboarding_security_settings_button">Otvori sigurnosne postavke</string> + <string name="tor_onboarding_donate_header">Doniraj i održi Tor sigurnim</string> + <string name="tor_onboarding_donate_description">Tor se može besplatno koristiti zbog donacija ljudi poput tebe.</string> + <string name="tor_onboarding_donate_button">Doniraj sada</string> + + <string name="tor_explore_privately">Istraži. Privatno.</string> + + <string name="preferences_tor_network_settings">Tor mreža</string> + <string name="preferences_tor_network_settings_explanation">Tor preglednik usmjerava tvoj promet na Tor mrežu, koju pokreću tisuće volontera širom svijeta.</string> + <string name="preferences_tor_network_settings_bridge_config">Konfiguriraj most</string> + <string name="preferences_tor_network_settings_bridge_config_description">Koristi most za povezivanje na Tor</string> + <string name="preferences_tor_network_settings_bridge_config_description_builtin_transport_enabled">Koristiš ugrađeni most za povezivanje na Tor</string> + <string name="preferences_tor_network_settings_bridge_config_description_user_provided_enabled">Omogućio/la si most za povezivanje na Tor</string> + <string name="preferences_tor_network_settings_bridge_config_explanation">Mostovi su nenavedeni releji koji otežavaju blokiranje veza s Tor mrežom. Zbog načina na koji određene zemlje pokušavaju blokirati Tor, određeni mostovi rade u određenim zemljama, dok u drugima ne rade.</string> + <string name="preferences_tor_network_settings_bridge_config_toggle">Koristi most</string> + <string name="preferences_tor_network_settings_bridge_config_toggle_description">Konfiguriraj most za povezivanje na Tor</string> + <string name="preferences_tor_network_settings_bridge_config_builtin_bridge_obfs4">obfs4</string> + <string name="preferences_tor_network_settings_bridge_config_builtin_bridge_meek_azure">meek-azure</string> + <string name="preferences_tor_network_settings_bridge_config_builtin_bridge_snowflake">snowflake</string> + <string name="preferences_tor_network_settings_bridge_config_user_provided_bridge">Pruži mi most koji poznam</string> + <string name="preferences_tor_network_settings_bridge_config_user_provided_bridge_description">Upiši podatke mosta od pouzdanog izvora</string> + <string name="preferences_tor_network_settings_bridge_config_current_bridge">Trenutačno konfigurirani most: %s</string> + <string name="tor_network_settings_bridge_not_configured">Nije konfiguriran</string> + <string name="preferences_tor_network_settings_status">Trenutačno stanje</string> + <string name="preferences_tor_network_settings_tor_ready">Spreman za Tor: %s</string> + <string name="preferences_tor_network_settings_state">Stanje: %s</string> + <string name="preferences_tor_network_settings_yes">Da</string> + <string name="preferences_tor_network_settings_no">Ne</string> + <string name="preferences_tor_network_settings_disconnected">Nepovezano</string> + <string name="preferences_tor_network_settings_connecting">Spajanje</string> + <string name="preferences_tor_network_settings_connected">Spojeno</string> + <string name="preferences_tor_network_settings_restarting">Ponovno se pokrećem</string> + <string name="preferences_tor_network_settings_bridges_enabled">Mostovi su aktivirani: %s</string> +</resources>

1 0

[translation/fenix-torbrowserstringsxml] https://gitweb.torproject.org/translation.git/commit/?h=fenix-torbrowserstringsxml
by translation＠torproject.org 05 Oct '20

05 Oct '20

commit 9fa3d6687d522d81a73398eee572bc3818b845fb Author: Translation commit bot <translation(a)torproject.org> Date: Mon Oct 5 19:15:31 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=fenix-torbrowserstr… --- hr/torbrowser_strings.xml | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/hr/torbrowser_strings.xml b/hr/torbrowser_strings.xml index f02e706591..2602ff65ba 100644 --- a/hr/torbrowser_strings.xml +++ b/hr/torbrowser_strings.xml @@ -16,6 +16,8 @@ <string name="tor_bootstrap_quick_start_disabled">Aktiviraj „Brzo pokretanje” za automatsko spajanje u budućnosti</string> <string name="tor_bootstrap_quick_start_enabled">%s će se u budućnosti automatski spojiti na Tor mrežu</string> <string name="tor_bootstrap_swipe_for_logs">Potegni prstom ulijevo za prikaz Tor zapisa</string> + <string name="tor_initializing_log">Inicijaliziranje Torovih log-zapisa</string> + <string name="tor_onboarding_security_level">Postavi razinu sigurnosti</string> <string name="tor_onboarding_security_level_description">Aktiviraj određene web-funkcije koje se mogu koristiti kako bi te se napalo i koje štete tvojoj sigurnosti, anonimnosti i privatnosti.</string> <string name="tor_onboarding_security_level_standard_option">Standardno</string> @@ -24,6 +26,8 @@ <string name="tor_onboarding_security_level_safer_button_description">Deaktiviraj web-funkcije koje su često opasne i koje onemogućuju funkcionalnost nekih web-stranica.</string> <string name="tor_onboarding_security_level_safest_option">Najsigurnije</string> <string name="tor_onboarding_security_level_safest_button_description">Dozvoli samo funkcije web-stranica potrebne za statične web-stranice i osnovne usluge. Ove promjene utječu na slike, medije i skripte.</string> + <string name="tor_onboarding_security_settings_button">Otvori sigurnosne postavke</string> + <string name="tor_onboarding_donate_header">Doniraj i održi Tor sigurnim</string> <string name="tor_onboarding_donate_description">Tor se može besplatno koristiti zbog donacija ljudi poput tebe.</string> <string name="tor_onboarding_donate_button">Doniraj sada</string> @@ -31,13 +35,28 @@ <string name="preferences_tor_network_settings">Tor mreža</string> <string name="preferences_tor_network_settings_explanation">Tor preglednik usmjerava tvoj promet na Tor mrežu, koju pokreću tisuće volontera širom svijeta.</string> + <string name="preferences_tor_network_settings_bridge_config">Konfiguriraj most</string> + <string name="preferences_tor_network_settings_bridge_config_description">Koristi most za povezivanje na Tor</string> + <string name="preferences_tor_network_settings_bridge_config_description_builtin_transport_enabled">Koristiš ugrađeni most za povezivanje na Tor</string> + <string name="preferences_tor_network_settings_bridge_config_description_user_provided_enabled">Omogućio/la si most za povezivanje na Tor</string> + <string name="preferences_tor_network_settings_bridge_config_explanation">Mostovi su nenavedeni releji koji otežavaju blokiranje veza s Tor mrežom. Zbog načina na koji određene zemlje pokušavaju blokirati Tor, određeni mostovi rade u određenim zemljama, dok u drugima ne rade.</string> + <string name="preferences_tor_network_settings_bridge_config_toggle">Koristi most</string> + <string name="preferences_tor_network_settings_bridge_config_toggle_description">Konfiguriraj most za povezivanje na Tor</string> <string name="preferences_tor_network_settings_bridge_config_builtin_bridge_obfs4">obfs4</string> <string name="preferences_tor_network_settings_bridge_config_builtin_bridge_meek_azure">meek-azure</string> + <string name="preferences_tor_network_settings_bridge_config_builtin_bridge_snowflake">snowflake</string> <string name="preferences_tor_network_settings_bridge_config_user_provided_bridge">Pruži mi most koji poznam</string> + <string name="preferences_tor_network_settings_bridge_config_user_provided_bridge_description">Upiši podatke mosta od pouzdanog izvora</string> + <string name="preferences_tor_network_settings_bridge_config_current_bridge">Trenutačno konfigurirani most: %s</string> + <string name="tor_network_settings_bridge_not_configured">Nije konfiguriran</string> + <string name="preferences_tor_network_settings_status">Trenutačno stanje</string> + <string name="preferences_tor_network_settings_tor_ready">Spreman za Tor: %s</string> + <string name="preferences_tor_network_settings_state">Stanje: %s</string> <string name="preferences_tor_network_settings_yes">Da</string> <string name="preferences_tor_network_settings_no">Ne</string> <string name="preferences_tor_network_settings_disconnected">Nepovezano</string> <string name="preferences_tor_network_settings_connecting">Spajanje</string> <string name="preferences_tor_network_settings_connected">Spojeno</string> <string name="preferences_tor_network_settings_restarting">Ponovno se pokrećem</string> - </resources> + <string name="preferences_tor_network_settings_bridges_enabled">Mostovi su aktivirani: %s</string> +</resources>

1 0

[translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
by translation＠torproject.org 05 Oct '20

05 Oct '20

commit defa3af3821741404f9b5beaaf78ccbf6350ef04 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Oct 5 19:15:22 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+ka.po | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/contents+ka.po b/contents+ka.po index 4dc6fd712b..a0d15678f0 100644 --- a/contents+ka.po +++ b/contents+ka.po @@ -5945,11 +5945,15 @@ msgid "" "This is the core idea that these abuse complaint templates attempt to instil" " in the recipient." msgstr "" +"ესაა დედააზრი, რომლის შთაგონებასაც ცდილობს მიმღებისთვის, აქ მოცემული " +"ნიმუშები საჩივრების საპასუხოდ." #: https//community.torproject.org/relay/community-resources/tor-abuse-templates/ #: (content/relay-operations/community-resources/tor-abuse-templates/contents+en.lrpage.body) msgid "Feel free to improve them if you feel they fall short of this goal." msgstr "" +"თავადაც შეგიძლიათ გააუმჯობესოთ, თუ მიგაჩნიათ რომ არასაკმარად ასრულებს " +"მიზანს." #: https//community.torproject.org/relay/community-resources/tor-abuse-templates/ #: (content/relay-operations/community-resources/tor-abuse-templates/contents+en.lrpage.body)

1 0