tor-commits March 2020

tor-commits@lists.torproject.org

21 participants
1780 discussions

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

26 Mar '20

commit 7e1656e46e27352ea49e1df36ed967286702c2ad Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 26 22:15:31 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+de.po | 75 ++++++++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 63 insertions(+), 12 deletions(-) diff --git a/contents+de.po b/contents+de.po index 720edb7bef..243e576d31 100644 --- a/contents+de.po +++ b/contents+de.po @@ -4753,6 +4753,9 @@ msgid "" "files when tor starts up or find the file named \"fingerprint\" in your tor " "DataDirectory." msgstr "" +"zu beiden Relays. Um den Fingerabdruck deines Relays zu finden, kannst du " +"beim Start von tor in die Log-Dateien schauen oder die Datei \"fingerprint\"" +" in deinem tor-DataDirectory finden." #: https//community.torproject.org/relay/setup/post-install/ #: (content/relay-operations/technical-setup/post-install/contents+en.lrpage.body) @@ -4760,6 +4763,9 @@ msgid "" "Instead of doing so manually for big operators we recommend to automate the " "MyFamily setting via a configuration management solution." msgstr "" +"Anstatt dies bei großen Betreibern manuell zu tun, empfehlen wir, die " +"Einstellung von MyFamily über eine Konfigurations-Management-Lösung zu " +"automatisieren." #: https//community.torproject.org/relay/setup/post-install/ #: (content/relay-operations/technical-setup/post-install/contents+en.lrpage.body) @@ -4767,11 +4773,14 @@ msgid "" "Manually managing MyFamily for big relay groups is error prone and can put " "Tor clients at risk." msgstr "" +"Die manuelle Verwaltung von MyFamily für große Relay-Gruppen ist " +"fehleranfällig und kann Tor-Clients einem Risiko aussetzen." #: https//community.torproject.org/relay/setup/post-install/ #: (content/relay-operations/technical-setup/post-install/contents+en.lrpage.body) msgid "# 6. Optional: Limiting bandwidth usage (and traffic)" msgstr "" +"# 6. Optional: Begrenzung der Bandbreitennutzung (und des Datenverkehrs)" #: https//community.torproject.org/relay/setup/post-install/ #: (content/relay-operations/technical-setup/post-install/contents+en.lrpage.body) @@ -4779,6 +4788,9 @@ msgid "" "Tor will not limit its bandwidth usage by default, but supports multiple " "ways to restrict the used bandwidth and the amount of traffic." msgstr "" +"Tor schränkt seine Bandbreitennutzung nicht standardmäßig ein, unterstützt " +"aber mehrere Möglichkeiten, die genutzte Bandbreite und die Menge des " +"Datenverkehrs zu begrenzen." #: https//community.torproject.org/relay/setup/post-install/ #: (content/relay-operations/technical-setup/post-install/contents+en.lrpage.body) @@ -4786,6 +4798,9 @@ msgid "" "This can be handy if you want to ensure that your Tor relay does not exceed " "a certain amount of bandwidth or total traffic per day/week/month." msgstr "" +"Dies kann praktisch sein, wenn du sicherstellen möchtest, dass dein Tor-" +"Relay eine bestimmte Bandbreite oder den Gesamtverkehr pro Tag/Woche/Monat " +"nicht überschreitet." #: https//community.torproject.org/relay/setup/post-install/ #: (content/relay-operations/technical-setup/post-install/contents+en.lrpage.body) @@ -4793,36 +4808,38 @@ msgid "" "The following torrc configuration options can be used to restrict bandwidth " "and traffic:" msgstr "" +"Die folgenden Torrc-Konfigurationsoptionen können zur Einschränkung der " +"Bandbreite und des Datenverkehrs verwendet werden:" #: https//community.torproject.org/relay/setup/post-install/ #: (content/relay-operations/technical-setup/post-install/contents+en.lrpage.body) msgid "* AccountingMax" -msgstr "" +msgstr "* AccountingMax" #: https//community.torproject.org/relay/setup/post-install/ #: (content/relay-operations/technical-setup/post-install/contents+en.lrpage.body) msgid "* AccountingRule" -msgstr "" +msgstr "* AccountingRegel" #: https//community.torproject.org/relay/setup/post-install/ #: (content/relay-operations/technical-setup/post-install/contents+en.lrpage.body) msgid "* AccountingStart" -msgstr "" +msgstr "* AccountingStart" #: https//community.torproject.org/relay/setup/post-install/ #: (content/relay-operations/technical-setup/post-install/contents+en.lrpage.body) msgid "* BandwidthRate" -msgstr "" +msgstr "* BandbreitenRate" #: https//community.torproject.org/relay/setup/post-install/ #: (content/relay-operations/technical-setup/post-install/contents+en.lrpage.body) msgid "* BandwidthBurst" -msgstr "" +msgstr "* BandbreitenBurst" #: https//community.torproject.org/relay/setup/post-install/ #: (content/relay-operations/technical-setup/post-install/contents+en.lrpage.body) msgid "* RelayBandwidthRate" -msgstr "" +msgstr "* RelayBandbreitenRate" #: https//community.torproject.org/relay/setup/post-install/ #: (content/relay-operations/technical-setup/post-install/contents+en.lrpage.body) @@ -4830,6 +4847,8 @@ msgid "" "Having a fast relay for some time of the month is preferred over a slow " "relay for the entire month." msgstr "" +"Ein schnelles Relay für einige Zeit im Monat ist einem langsamen Relay für " +"den ganzen Monat vorzuziehen." #: https//community.torproject.org/relay/setup/post-install/ #: (content/relay-operations/technical-setup/post-install/contents+en.lrpage.body) @@ -4837,11 +4856,13 @@ msgid "" "Also see the bandwidth entry in the " "[FAQ](https://www.torproject.org/docs/faq.html.en#BandwidthShaping)." msgstr "" +"Siehe auch den Bandbreiteneintrag in der " +"[F&A](https://www.torproject.org/docs/faq.html.en#BandwidthShaping)." #: https//community.torproject.org/relay/setup/post-install/ #: (content/relay-operations/technical-setup/post-install/contents+en.lrpage.body) msgid "# 7. Check IPv6 availability" -msgstr "" +msgstr "# 7. IPv6-Verfügbarkeit prüfen" #: https//community.torproject.org/relay/setup/post-install/ #: (content/relay-operations/technical-setup/post-install/contents+en.lrpage.body) @@ -4849,6 +4870,8 @@ msgid "" "We encourage everyone to enable IPv6 on their relays. This is especially " "valuable on exit and guard relays." msgstr "" +"Wir ermutigen jeden, IPv6 auf seinen Relays zu aktivieren. Dies ist " +"besonders wertvoll bei Exit- und Schutz-Relays." #: https//community.torproject.org/relay/setup/post-install/ #: (content/relay-operations/technical-setup/post-install/contents+en.lrpage.body) @@ -4856,6 +4879,8 @@ msgid "" "Before enabling your tor daemon to use IPv6 in addition to IPv4 you should " "do some basic IPv6 connectivity tests." msgstr "" +"Bevor dein Tor-Daemon zu IPv4 auch zusätzlich IPv6 verwenden kann, solltest " +"du einige grundlegende IPv6-Verbindungstests durchführen." #: https//community.torproject.org/relay/setup/post-install/ #: (content/relay-operations/technical-setup/post-install/contents+en.lrpage.body) @@ -4863,6 +4888,8 @@ msgid "" "The following command line will ping the IPv6 addresses of Tor directory " "authorities from your server:" msgstr "" +"Die folgende Kommandozeile pingt die IPv6-Adressen der Tor-" +"Verzeichnisdienste von deinem Server aus an:" #: https//community.torproject.org/relay/setup/post-install/ #: (content/relay-operations/technical-setup/post-install/contents+en.lrpage.body) @@ -4884,6 +4911,9 @@ msgid "" "not enable IPv6 in your torrc configuration file before IPv6 is indeed " "working." msgstr "" +"Am Ende der Ausgabe solltest du \"OK\" sehen. Wenn dies nicht der Fall ist, " +"aktiviere IPv6 nicht in deiner torrc-Konfigurationsdatei, bevor IPv6 " +"tatsächlich funktioniert." #: https//community.torproject.org/relay/setup/post-install/ #: (content/relay-operations/technical-setup/post-install/contents+en.lrpage.body) @@ -4891,6 +4921,8 @@ msgid "" "If you enable IPv6 without working IPv6 connectivity your entire relay will " "not be used, regardless if IPv4 is working." msgstr "" +"Wenn du IPv6 aktivierst, ohne dass die IPv6-Verbindung funktioniert, wird " +"dein gesamtes Relay nicht verwendet, unabhängig davon, ob IPv4 funktioniert." #: https//community.torproject.org/relay/setup/post-install/ #: (content/relay-operations/technical-setup/post-install/contents+en.lrpage.body) @@ -4898,11 +4930,14 @@ msgid "" "If it worked fine, make your Tor relay reachable via IPv6 by adding an " "additional ORPort line to your configuration (example for ORPort 9001):" msgstr "" +"Wenn es gut funktioniert hat, mach dein Tor-Relay über IPv6 erreichbar, " +"indem du eine zusätzliche ORPort-Leitung zu deiner Konfiguration hinzufügst " +"(Beispiel für ORPort 9001):" #: https//community.torproject.org/relay/setup/post-install/ #: (content/relay-operations/technical-setup/post-install/contents+en.lrpage.body) msgid "ORPort [IPv6-address]:9001" -msgstr "" +msgstr "ORPort [IPv6-address]:9001" #: https//community.torproject.org/relay/setup/post-install/ #: (content/relay-operations/technical-setup/post-install/contents+en.lrpage.body) @@ -4910,6 +4945,9 @@ msgid "" "The location of that line in the configuration file does not matter you can " "simply add it next to the first ORPort lins in your torrc file." msgstr "" +"Die Position dieser Zeile in der Konfigurationsdatei spielt keine Rolle, du " +"kannst sie einfach nach den ersten ORPort-Zeilen in deiner torrc-Datei " +"hinzufügen." #: https//community.torproject.org/relay/setup/post-install/ #: (content/relay-operations/technical-setup/post-install/contents+en.lrpage.body) @@ -4917,6 +4955,9 @@ msgid "" "Note: You have to explicitly specify your IPv6 address in square brackets, " "you can not tell tor to bind to any IPv6 (like you do for IPv4)." msgstr "" +"Hinweis: Du musst deine IPv6-Adresse explizit in eckigen Klammern angeben, " +"du kannst Tor nicht sagen, dass es sich an irgendein IPv6 binden soll (wie " +"du es bei IPv4 tust)." #: https//community.torproject.org/relay/setup/post-install/ #: (content/relay-operations/technical-setup/post-install/contents+en.lrpage.body) @@ -4924,11 +4965,13 @@ msgid "" "If you have a global IPv6 address you should be able to find it in the " "output of the following command:" msgstr "" +"Wenn du eine globale IPv6-Adresse hast, solltest du sie in der Ausgabe des " +"folgenden Befehls finden können:" #: https//community.torproject.org/relay/setup/post-install/ #: (content/relay-operations/technical-setup/post-install/contents+en.lrpage.body) msgid "ip addr|grep inet6|grep global" -msgstr "" +msgstr "ip addr|grep inet6|grep global" #: https//community.torproject.org/relay/setup/post-install/ #: (content/relay-operations/technical-setup/post-install/contents+en.lrpage.body) @@ -4936,11 +4979,14 @@ msgid "" "If you are an exit relay with IPv6 connectivity, tell your tor daemon to " "allow exiting via IPv6 so clients can reach IPv6 destinations:" msgstr "" +"Wenn du ein Exit-Relay mit IPv6-Verbindung bist, sag deinem Tor-Daemon, dass" +" er das Verlassen über IPv6 erlauben soll, damit Clients IPv6-Ziele " +"erreichen können:" #: https//community.torproject.org/relay/setup/post-install/ #: (content/relay-operations/technical-setup/post-install/contents+en.lrpage.body) msgid "IPv6Exit 1" -msgstr "" +msgstr "IPv6Exit 1" #: https//community.torproject.org/relay/setup/post-install/ #: (content/relay-operations/technical-setup/post-install/contents+en.lrpage.body) @@ -4948,16 +4994,18 @@ msgid "" "Note: Tor requires IPv4 connectivity, you can not run a Tor relay on " "IPv6-only." msgstr "" +"Hinweis: Tor benötigt eine IPv4-Verbindung, du kannst kein Tor-Relay nur mit" +" IPv6 betreiben." #: https//community.torproject.org/relay/setup/post-install/ #: (content/relay-operations/technical-setup/post-install/contents+en.lrpage.body) msgid "# 8. Maintaining a relay" -msgstr "" +msgstr "# 8. Wartung eines Relays" #: https//community.torproject.org/relay/setup/post-install/ #: (content/relay-operations/technical-setup/post-install/contents+en.lrpage.body) msgid "## Backup Tor Identity Keys" -msgstr "" +msgstr "## Datensicherung der Tor Identitätsschlüssel" #: https//community.torproject.org/relay/setup/post-install/ #: (content/relay-operations/technical-setup/post-install/contents+en.lrpage.body) @@ -4965,6 +5013,9 @@ msgid "" "After your initial installation and start of the tor daemon it is a good " "idea to make a backup of your relay's long term identity keys." msgstr "" +"Nach der Erstinstallation und dem Start des Tor-Daemons ist es eine gute " +"Idee, eine Datensicherung der Langzeit-Identitätsschlüssel deines Relays zu " +"machen." #: https//community.torproject.org/relay/setup/post-install/ #: (content/relay-operations/technical-setup/post-install/contents+en.lrpage.body)

1 0

[translation/bridgedb_completed] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb_completed
by translation＠torproject.org 26 Mar '20

26 Mar '20

commit 25198be1a2a4c11a29030981f963219b8e95b21a Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 26 22:15:23 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=bridgedb_completed --- es/LC_MESSAGES/bridgedb.po | 46 ++++++++++++---------------------------------- 1 file changed, 12 insertions(+), 34 deletions(-) diff --git a/es/LC_MESSAGES/bridgedb.po b/es/LC_MESSAGES/bridgedb.po index 48e2c742c5..43c475bd80 100644 --- a/es/LC_MESSAGES/bridgedb.po +++ b/es/LC_MESSAGES/bridgedb.po @@ -24,8 +24,8 @@ msgid "" msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" -"POT-Creation-Date: 2020-03-18 09:23-0700\n" -"PO-Revision-Date: 2020-03-19 15:27+0000\n" +"POT-Creation-Date: 2020-03-24 10:22-0700\n" +"PO-Revision-Date: 2020-03-26 21:53+0000\n" "Last-Translator: eulalio barbero espinosa <eulaliob(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/otf/torproject/language/es/)\n" "MIME-Version: 1.0\n" @@ -426,56 +426,34 @@ msgstr "Cómo comenzar a usar los puentes" #: bridgedb/strings.py:184 #, python-format msgid "" -"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n" -"page %s and then follow the instructions there for downloading and starting\n" -"Tor Browser." -msgstr "Para introducir puentes de red en el Tor Browser, ve a la %s página de descarga del Tor Browser %s y sigue las instrucciones de descarga e inicio del Tor Browser." - -#. TRANSLATORS: Please DO NOT translate "Tor". -#: bridgedb/strings.py:189 -msgid "" -"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n" -"the wizard until it asks:" -msgstr "Cuando aparezca el cuadro 'Configuración de red Tor', haz clic en 'Configurar'\ny sigue al asistente hasta que pregunte:" - -#. TRANSLATORS: Please DO NOT translate "Tor". -#: bridgedb/strings.py:193 -msgid "" -"Does your Internet Service Provider (ISP) block or otherwise censor connections\n" -"to the Tor network?" -msgstr "¿Tu proveedor de Internet (ISP) bloquea o censura de alguna manera las conexiones a la red Tor?" - -#. TRANSLATORS: Please DO NOT translate "Tor". -#: bridgedb/strings.py:197 -msgid "" -"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n" -"paste the bridge lines into the text input box. Finally, click 'Connect', and\n" -"you should be good to go! If you experience trouble, try clicking the 'Help'\n" -"button in the 'Tor Network Settings' wizard for further assistance." -msgstr "Selecciona 'Sí' y luego haz clic en 'Siguiente'. Para configurar tus nuevos\npuentes, copia y pega las líneas de puentes en el recuadro de texto.\nPor último, haz clic en 'Conectar', ¡y listo! Si hay algún problema, prueba en 'Ayuda' en el asistente de 'Configuración de red Tor' para asistencia adicional." +" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n" +" Manual explains how you can add your bridges to Tor Browser. If you are\n" +" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n" +" are using Android, %sclick here%s." +msgstr "" -#: bridgedb/strings.py:205 +#: bridgedb/strings.py:192 msgid "Displays this message." msgstr "Muestra este mensaje." #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the #. same non-Pluggable Transport bridges described above as being #. "plain-ol'-vanilla" bridges. -#: bridgedb/strings.py:209 +#: bridgedb/strings.py:196 msgid "Request vanilla bridges." msgstr "Solicitar puentes estándar." -#: bridgedb/strings.py:210 +#: bridgedb/strings.py:197 msgid "Request IPv6 bridges." msgstr "Solicitar puente de red IPv6." #. TRANSLATORS: Please DO NOT translate the word the word "TYPE". -#: bridgedb/strings.py:212 +#: bridgedb/strings.py:199 msgid "Request a Pluggable Transport by TYPE." msgstr "Solicitar un Pluggable Transport por TYPE ." #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "GnuPG". -#: bridgedb/strings.py:215 +#: bridgedb/strings.py:202 msgid "Get a copy of BridgeDB's public GnuPG key." msgstr "Obtener una copia de la clave pública GnuPG de BridgeDB."

1 0

[translation/bridgedb] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb
by translation＠torproject.org 26 Mar '20

26 Mar '20

commit 8b2e4971f730ec14c95fb6837d6122f9e9910d4c Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 26 22:15:16 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=bridgedb --- es/LC_MESSAGES/bridgedb.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/es/LC_MESSAGES/bridgedb.po b/es/LC_MESSAGES/bridgedb.po index 928d821db4..d4cad408fe 100644 --- a/es/LC_MESSAGES/bridgedb.po +++ b/es/LC_MESSAGES/bridgedb.po @@ -25,8 +25,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2020-03-24 10:22-0700\n" -"PO-Revision-Date: 2020-03-26 19:37+0000\n" -"Last-Translator: Transifex Bot <>\n" +"PO-Revision-Date: 2020-03-26 21:53+0000\n" +"Last-Translator: eulalio barbero espinosa <eulaliob(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/otf/torproject/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -430,7 +430,7 @@ msgid "" " Manual explains how you can add your bridges to Tor Browser. If you are\n" " using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n" " are using Android, %sclick here%s." -msgstr "" +msgstr " Primero, necesitas %sbajarte el Navegador Tor%s. Nuestro Manual de Usuario\ndel Navegador Tor explica como puedes añadir tus puentes al navegador. Si estás\nusando Windows, Linux, u OS X, %sclick aquí%s para saber más. Si estás\nusando Android, %sclick aquí%s." #: bridgedb/strings.py:192 msgid "Displays this message."

1 0

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

26 Mar '20

commit 077657e206c48f8125db0d356ecac8578bef8888 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 26 21:45:29 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+de.po | 57 +++++++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 49 insertions(+), 8 deletions(-) diff --git a/contents+de.po b/contents+de.po index 80987b223a..720edb7bef 100644 --- a/contents+de.po +++ b/contents+de.po @@ -4508,12 +4508,12 @@ msgstr "## Rede über Tor" #: https//community.torproject.org/relay/setup/post-install/ #: (content/relay-operations/technical-setup/post-install/contents+en.lrpage.title) msgid "Relay Post-install and good practices" -msgstr "" +msgstr "Relay-Nachinstallation und bewährte Praktiken" #: https//community.torproject.org/relay/setup/post-install/ #: (content/relay-operations/technical-setup/post-install/contents+en.lrpage.body) msgid "#1. Make sure relay ports can be reached" -msgstr "" +msgstr "#1. Stelle sicher, dass die Relay-Anschlüsse erreicht werden können" #: https//community.torproject.org/relay/setup/post-install/ #: (content/relay-operations/technical-setup/post-install/contents+en.lrpage.body) @@ -4522,6 +4522,9 @@ msgid "" "connections can reach the ports you will use for your relay (ORPort, plus " "DirPort if you enabled it)." msgstr "" +"Wenn du eine Firewall verwendest, öffne ein Loch in deiner Firewall, so dass" +" eingehende Verbindungen die Ports erreichen können, die du für dein Relay " +"(ORPort, plus DirPort, wenn du es aktiviert hast) verwenden wirst." #: https//community.torproject.org/relay/setup/post-install/ #: (content/relay-operations/technical-setup/post-install/contents+en.lrpage.body) @@ -4529,6 +4532,8 @@ msgid "" "Also, make sure you allow all outgoing connections too, so your relay can " "reach the other Tor relays, clients and destinations." msgstr "" +"Stelle außerdem sicher, dass du auch alle ausgehenden Verbindungen zulässt, " +"damit dein Relay die anderen Tor-Relays, Clients und Ziele erreichen kann." #: https//community.torproject.org/relay/setup/post-install/ #: (content/relay-operations/technical-setup/post-install/contents+en.lrpage.body) @@ -4536,11 +4541,13 @@ msgid "" "You can find the specific ORPort TCP port number in the torrc configuration " "samples bellow (in the OS specific sections)." msgstr "" +"Die spezifische ORPort TCP-Anschluss-Nummer findest du in den torrc-" +"Konfigurationsbeispielen weiter unten (in den OS-spezifischen Abschnitten)." #: https//community.torproject.org/relay/setup/post-install/ #: (content/relay-operations/technical-setup/post-install/contents+en.lrpage.body) msgid "# 2. Verify that your relay works" -msgstr "" +msgstr "# 2. Überprüfe, ob dein Relay funktioniert" #: https//community.torproject.org/relay/setup/post-install/ #: (content/relay-operations/technical-setup/post-install/contents+en.lrpage.body) @@ -4548,6 +4555,8 @@ msgid "" "If your logfile (syslog) contains the following entry after starting your " "tor daemon your relay should be up and running as expected:" msgstr "" +"Wenn deine Logdatei (syslog) nach dem Start deines tor-Daemons den folgenden" +" Eintrag enthält, sollte dein Relay wie erwartet laufen:" #: https//community.torproject.org/relay/setup/post-install/ #: (content/relay-operations/technical-setup/post-install/contents+en.lrpage.body) @@ -4605,11 +4614,13 @@ msgstr "```" msgid "" "Self-testing indicates your ORPort is reachable from the outside. Excellent." msgstr "" +"Der Selbsttest zeigt an, dass dein ORPort von außen erreichbar ist. " +"Ausgezeichnet." #: https//community.torproject.org/relay/setup/post-install/ #: (content/relay-operations/technical-setup/post-install/contents+en.lrpage.body) msgid "Publishing server descriptor." -msgstr "" +msgstr "Veröffentlichen des Server-Deskriptors." #: https//community.torproject.org/relay/setup/post-install/ #: (content/relay-operations/technical-setup/post-install/contents+en.lrpage.body) @@ -4624,11 +4635,13 @@ msgstr "" #: (content/relay-operations/technical-setup/post-install/contents+en.lrpage.body) msgid "You can search for your relay using your nickname or IP address." msgstr "" +"Du kannst mit deinem Spitznamen oder deiner IP-Adresse nach deinem Relay " +"suchen." #: https//community.torproject.org/relay/setup/post-install/ #: (content/relay-operations/technical-setup/post-install/contents+en.lrpage.body) msgid "# 3. Read about Tor relay lifecycle" -msgstr "" +msgstr "# 3. Mehr zum Thema Tor-Relay-Lebenszyklus." #: https//community.torproject.org/relay/setup/post-install/ #: (content/relay-operations/technical-setup/post-install/contents+en.lrpage.body) @@ -4638,11 +4651,15 @@ msgid "" "this process, read about the [lifecycle of a new " "relay](https://blog.torproject.org/lifecycle-new-relay)." msgstr "" +"Es dauert eine gewisse Zeit, bis der Relay-Verkehr ansteigt, dies gilt " +"insbesondere für die Schutz-Relays, in geringerem Maße aber auch für die " +"Exit-Relays. Um diesen Prozess zu verstehen, lies über den [Lebenszyklus " +"eines neuen Relays] (https://blog.torproject.org/lifecycle-new-relay)." #: https//community.torproject.org/relay/setup/post-install/ #: (content/relay-operations/technical-setup/post-install/contents+en.lrpage.body) msgid "# 4. Configuration Management" -msgstr "" +msgstr "# 4. Konfigurations-Management" #: https//community.torproject.org/relay/setup/post-install/ #: (content/relay-operations/technical-setup/post-install/contents+en.lrpage.body) @@ -4654,6 +4671,12 @@ msgid "" " without performing additional steps manually, you may want to use a " "configuration management for better maintainability." msgstr "" +"Wenn du planst, mehr als ein einzelnes Relay zu betreiben, oder wenn du ein " +"Relay mit hoher Kapazität (mehrere Tor-Instanzen pro Server) betreiben " +"willst, oder wenn du starke Sicherheitsfunktionen wie [Offline Master " +"Keys](https://trac.torproject.org/projects/tor/wiki/doc/TorRelaySecurity/Of…" +" nutzen willst, ohne zusätzliche Schritte manuell durchzuführen, solltest du" +" ein Konfigurations-Management für eine bessere Wartungsfähigkeit verwenden." #: https//community.torproject.org/relay/setup/post-install/ #: (content/relay-operations/technical-setup/post-install/contents+en.lrpage.body) @@ -4661,6 +4684,8 @@ msgid "" "There are multiple configuration management solutions for Unix based " "operating systems (Ansible, Puppet, Salt, ...)." msgstr "" +"Es gibt mehrere Konfigurations-Management-Lösungen für Unix-basierte " +"Betriebssysteme (Ansible, Puppet, Salt, ...)." #: https//community.torproject.org/relay/setup/post-install/ #: (content/relay-operations/technical-setup/post-install/contents+en.lrpage.body) @@ -4669,11 +4694,14 @@ msgid "" "operators and supports multiple operating systems: [Ansible " "Relayor](http://github.com/nusenu/ansible-relayor)." msgstr "" +"Die folgende Ansible-Rolle wurde speziell für Tor-Relay-Betreiber erstellt " +"und unterstützt mehrere Betriebssysteme: [Ansible " +"Relayor](http://github.com/nusenu/ansible-relayor)." #: https//community.torproject.org/relay/setup/post-install/ #: (content/relay-operations/technical-setup/post-install/contents+en.lrpage.body) msgid "# 5. Important: if you run more than one Tor instance" -msgstr "" +msgstr "# 5. Wichtig: Wenn du mehr als eine Tor-Instanz ausführst" #: https//community.torproject.org/relay/setup/post-install/ #: (content/relay-operations/technical-setup/post-install/contents+en.lrpage.body) @@ -4684,6 +4712,12 @@ msgid "" "[ContactInfo](https://2019.www.torproject.org/docs/tor-" "manual.html.en#ContactInfo) in your torrc configuration." msgstr "" +"Um zu vermeiden, dass du Tor-Clients beim Betrieb mehrerer Relays einem " +"Risiko aussetzt, musst du einen korrekten " +"[MyFamily](https://2019.www.torproject.org/docs/tor-manual.html.en#MyFamily)" +" -Wert einstellen und eine gültige " +"[ContactInfo](https://2019.www.torproject.org/docs/tor-" +"manual.html.en#ContactInfo) in deiner torrc-Konfiguration haben." #: https//community.torproject.org/relay/setup/post-install/ #: (content/relay-operations/technical-setup/post-install/contents+en.lrpage.body) @@ -4692,6 +4726,10 @@ msgid "" "controlled by a single entity/operator/organization, so they are not used in" " multiple positions in a single circuit." msgstr "" +"Die MyFamily-Einstellung teilt den Tor-Clients einfach mit, welche Tor-" +"Relays von einer einzigen Entität/Betreiber/Organisation kontrolliert " +"werden, so dass sie nicht an mehreren Stellen in einem einzigen Kanal " +"verwendet werden." #: https//community.torproject.org/relay/setup/post-install/ #: (content/relay-operations/technical-setup/post-install/contents+en.lrpage.body) @@ -4699,11 +4737,14 @@ msgid "" "If you run two relays and they have fingerprints AAAAAAAAAA and BBBBBBBB, " "you would add the following configuration to set MyFamily:" msgstr "" +"Wenn du zwei Relays mit den Fingerabdrücken AAAAAAAAAAAA und BBBBBBBBBB " +"betreibst, solltest du die folgende Konfiguration zur Einstellung von " +"MyFamily hinzufügen:" #: https//community.torproject.org/relay/setup/post-install/ #: (content/relay-operations/technical-setup/post-install/contents+en.lrpage.body) msgid "MyFamily AAAAAAAAAA,BBBBBBBB" -msgstr "" +msgstr "MyFamily AAAAAAAAAA,BBBBBBBB" #: https//community.torproject.org/relay/setup/post-install/ #: (content/relay-operations/technical-setup/post-install/contents+en.lrpage.body)

1 0

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

26 Mar '20

commit 068a729af1e65dbc308f0e3ad5a0062343940ee5 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 26 21:15:33 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+de.po | 3 +++ 1 file changed, 3 insertions(+) diff --git a/contents+de.po b/contents+de.po index d159bfeb64..80987b223a 100644 --- a/contents+de.po +++ b/contents+de.po @@ -4496,6 +4496,9 @@ msgid "" "Here you'll find materials on basic Tor explainers and concepts, ideas for " "preparing a Tor talk, suggested social media posts, and more." msgstr "" +"Hier findest du Materialien zu grundlegenden Tor-Erläuterungen und " +"-Konzepten, Ideen zur Vorbereitung eines Tor-Vortrags, Vorschläge für " +"Social-Media-Posts und mehr." #: https//community.torproject.org/outreach/talk/ #: (content/outreach/talk/contents+en.lrpage.body)

1 0

[translation/bridgedb_completed] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb_completed
by translation＠torproject.org 26 Mar '20

26 Mar '20

commit bbebfa2fc84b8feaf8aeeebbabf16f8fa2e19f5a Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 26 21:15:25 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=bridgedb_completed --- de/LC_MESSAGES/bridgedb.po | 46 ++++++++++++---------------------------------- 1 file changed, 12 insertions(+), 34 deletions(-) diff --git a/de/LC_MESSAGES/bridgedb.po b/de/LC_MESSAGES/bridgedb.po index 95bdbbd7e0..ec43eba8cd 100644 --- a/de/LC_MESSAGES/bridgedb.po +++ b/de/LC_MESSAGES/bridgedb.po @@ -27,8 +27,8 @@ msgid "" msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" -"POT-Creation-Date: 2020-03-18 09:23-0700\n" -"PO-Revision-Date: 2020-03-20 20:48+0000\n" +"POT-Creation-Date: 2020-03-24 10:22-0700\n" +"PO-Revision-Date: 2020-03-26 21:07+0000\n" "Last-Translator: Curtis Baltimore <curtisbaltimore(a)protonmail.com>\n" "Language-Team: German (http://www.transifex.com/otf/torproject/language/de/)\n" "MIME-Version: 1.0\n" @@ -429,56 +429,34 @@ msgstr "So starten Sie die Benutzung Ihrer Brücken" #: bridgedb/strings.py:184 #, python-format msgid "" -"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n" -"page %s and then follow the instructions there for downloading and starting\n" -"Tor Browser." -msgstr "Um Brücken in Tor Browser einzugeben, gehe erst auf die %s Tor Browser Downloadseite %s und folge dort den Anweisungen zum Download und Starten von Tor Browser." - -#. TRANSLATORS: Please DO NOT translate "Tor". -#: bridgedb/strings.py:189 -msgid "" -"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n" -"the wizard until it asks:" -msgstr "Wenn der Dialog mit den »Tor-Netzwerkeinstellungen« erscheint, \nklicken Sie auf »Konfigurieren« und folgen den Anweisungen des Assistenten: " - -#. TRANSLATORS: Please DO NOT translate "Tor". -#: bridgedb/strings.py:193 -msgid "" -"Does your Internet Service Provider (ISP) block or otherwise censor connections\n" -"to the Tor network?" -msgstr "Blockiert oder zensiert Ihr Internetanbieter (ISP) die Verbindungen zum Tor-Netzwerk?" - -#. TRANSLATORS: Please DO NOT translate "Tor". -#: bridgedb/strings.py:197 -msgid "" -"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n" -"paste the bridge lines into the text input box. Finally, click 'Connect', and\n" -"you should be good to go! If you experience trouble, try clicking the 'Help'\n" -"button in the 'Tor Network Settings' wizard for further assistance." -msgstr "Wählen Sie »Ja« und klicken dann auf »Weiter«. Um Ihre neuen Brücken zu konfigurieren, kopieren Sie die \nZeilen mit den Adressen der Brücken und fügen sie in das Texteingabefeld ein. Zum Schluss klicken Sie auf \n»Verbinden« und Sie können loslegen! Falls Sie Schwierigkeiten haben, \nversuchen Sie bitte auf den »Hilfe«-Knopf im Assistenten der »Tor- Netzwerkeinstellungen« zu klicken, \num weitere Hilfe zu erhalten." +" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n" +" Manual explains how you can add your bridges to Tor Browser. If you are\n" +" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n" +" are using Android, %sclick here%s." +msgstr "" -#: bridgedb/strings.py:205 +#: bridgedb/strings.py:192 msgid "Displays this message." msgstr "Diese Nachricht anzeigen." #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the #. same non-Pluggable Transport bridges described above as being #. "plain-ol'-vanilla" bridges. -#: bridgedb/strings.py:209 +#: bridgedb/strings.py:196 msgid "Request vanilla bridges." msgstr "Standard-Brücken anfordern." -#: bridgedb/strings.py:210 +#: bridgedb/strings.py:197 msgid "Request IPv6 bridges." msgstr "IPv6-Brücken anfordern." #. TRANSLATORS: Please DO NOT translate the word the word "TYPE". -#: bridgedb/strings.py:212 +#: bridgedb/strings.py:199 msgid "Request a Pluggable Transport by TYPE." msgstr "Einen Pluggable Transport des TYPEs anfordern." #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "GnuPG". -#: bridgedb/strings.py:215 +#: bridgedb/strings.py:202 msgid "Get a copy of BridgeDB's public GnuPG key." msgstr "Eine Kopie des öffentlichen GnuPG-Schlüssels der Brückendatenbank erhalten."

1 0

[translation/bridgedb] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb
by translation＠torproject.org 26 Mar '20

26 Mar '20

commit c70a296ca1c0fef146734cd01c67bda6401aa09d Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 26 21:15:18 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=bridgedb --- de/LC_MESSAGES/bridgedb.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/de/LC_MESSAGES/bridgedb.po b/de/LC_MESSAGES/bridgedb.po index 1fb3a52388..d252302557 100644 --- a/de/LC_MESSAGES/bridgedb.po +++ b/de/LC_MESSAGES/bridgedb.po @@ -28,8 +28,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2020-03-24 10:22-0700\n" -"PO-Revision-Date: 2020-03-26 19:37+0000\n" -"Last-Translator: Transifex Bot <>\n" +"PO-Revision-Date: 2020-03-26 21:07+0000\n" +"Last-Translator: Curtis Baltimore <curtisbaltimore(a)protonmail.com>\n" "Language-Team: German (http://www.transifex.com/otf/torproject/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -433,7 +433,7 @@ msgid "" " Manual explains how you can add your bridges to Tor Browser. If you are\n" " using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n" " are using Android, %sclick here%s." -msgstr "" +msgstr "Als Erstes musst du %sTor Browser herunterladen%s. Unser Tor Browser Benutzer-\nHandbuch erklärt, wie du deine Brücken zum Tor Browser hinzufügen kannst. Wenn du \nWindows, Linux, or OS X verwendest, %sklick hier%s um mehr zu erfahren. Wenn du \nAndroid verwendest, %sklick hier%s." #: bridgedb/strings.py:192 msgid "Displays this message."

1 0

[translation/abouttor-homepage_completed] https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage_completed
by translation＠torproject.org 26 Mar '20

26 Mar '20

commit 8b062616df0685e8e96cbcb7efbea5d139b5b1fd Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 26 21:15:12 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage_c… --- de/aboutTor.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/de/aboutTor.dtd b/de/aboutTor.dtd index 972952ab03..1e87c70d12 100644 --- a/de/aboutTor.dtd +++ b/de/aboutTor.dtd @@ -27,5 +27,5 @@ <!ENTITY aboutTor.newsletter.tagline ""> <!ENTITY aboutTor.newsletter.link_text ""> -<!ENTITY aboutTor.donationBanner.line2e ""> +<!ENTITY aboutTor.donationBanner.freeToUse ""> <!ENTITY aboutTor.donationBanner.buttonA "">

1 0

[translation/abouttor-homepage] https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage
by translation＠torproject.org 26 Mar '20

26 Mar '20

commit 04721a0b488f2c57279b4733ba27f64217bb37fc Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 26 21:15:05 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage --- de/aboutTor.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/de/aboutTor.dtd b/de/aboutTor.dtd index 61bd9e74e5..afb1ce3468 100644 --- a/de/aboutTor.dtd +++ b/de/aboutTor.dtd @@ -27,5 +27,5 @@ <!ENTITY aboutTor.newsletter.tagline "Erhalte die neuesten Nachrichten von Tor direkt in den Posteingang."> <!ENTITY aboutTor.newsletter.link_text "Tor-Nachrichten abonnieren."> -<!ENTITY aboutTor.donationBanner.freeToUse "Tor is free to use because of donations from people like you."> +<!ENTITY aboutTor.donationBanner.freeToUse "Tor ist aufgrund von Spenden von Leuten wie dir frei nutzbar."> <!ENTITY aboutTor.donationBanner.buttonA "Spende jetzt">

1 0

[snowflake/master] Move StripLocalAddresses to a common util
by arlo＠torproject.org 26 Mar '20

26 Mar '20

commit 670e4ba4380b3fa5cf82043559dcb8c2ca790a7d Author: Arlo Breault <arlolra(a)gmail.com> Date: Thu Mar 26 13:05:24 2020 -0400 Move StripLocalAddresses to a common util Trac: 19026 --- client/lib/lib_test.go | 17 ----------------- client/lib/rendezvous.go | 47 +---------------------------------------------- common/util/util.go | 45 +++++++++++++++++++++++++++++++++++++++++++++ common/util/util_test.go | 26 ++++++++++++++++++++++++++ 4 files changed, 72 insertions(+), 63 deletions(-) diff --git a/client/lib/lib_test.go b/client/lib/lib_test.go index 4b1a9fa..1cdc2c6 100644 --- a/client/lib/lib_test.go +++ b/client/lib/lib_test.go @@ -358,21 +358,4 @@ func TestSnowflakeClient(t *testing.T) { }) }) - Convey("Strip", t, func() { - const offerStart = "v=0\r\no=- 4358805017720277108 2 IN IP4 8.8.8.8\r\ns=-\r\nt=0 0\r\na=group:BUNDLE data\r\na=msid-semantic: WMS\r\nm=application 56688 DTLS/SCTP 5000\r\nc=IN IP4 8.8.8.8\r\n" - const goodCandidate = "a=candidate:3769337065 1 udp 2122260223 8.8.8.8 56688 typ host generation 0 network-id 1 network-cost 50\r\n" - const offerEnd = "a=ice-ufrag:aMAZ\r\na=ice-pwd:jcHb08Jjgrazp2dzjdrvPPvV\r\na=ice-options:trickle\r\na=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\r\na=setup:actpass\r\na=mid:data\r\na=sctpmap:5000 webrtc-datachannel 1024\r\n" - - offer := offerStart + goodCandidate + - "a=candidate:3769337065 1 udp 2122260223 192.168.0.100 56688 typ host generation 0 network-id 1 network-cost 50\r\n" + // IsLocal IPv4 - "a=candidate:3769337065 1 udp 2122260223 fdf8:f53b:82e4::53 56688 typ host generation 0 network-id 1 network-cost 50\r\n" + // IsLocal IPv6 - "a=candidate:3769337065 1 udp 2122260223 0.0.0.0 56688 typ host generation 0 network-id 1 network-cost 50\r\n" + // IsUnspecified IPv4 - "a=candidate:3769337065 1 udp 2122260223 :: 56688 typ host generation 0 network-id 1 network-cost 50\r\n" + // IsUnspecified IPv6 - "a=candidate:3769337065 1 udp 2122260223 127.0.0.1 56688 typ host generation 0 network-id 1 network-cost 50\r\n" + // IsLoopback IPv4 - "a=candidate:3769337065 1 udp 2122260223 ::1 56688 typ host generation 0 network-id 1 network-cost 50\r\n" + // IsLoopback IPv6 - offerEnd - - So(stripLocalAddresses(offer), ShouldEqual, offerStart+goodCandidate+offerEnd) - }) - } diff --git a/client/lib/rendezvous.go b/client/lib/rendezvous.go index 85f6f1a..1f98e26 100644 --- a/client/lib/rendezvous.go +++ b/client/lib/rendezvous.go @@ -14,12 +14,10 @@ import ( "io" "io/ioutil" "log" - "net" "net/http" "net/url" "git.torproject.org/pluggable-transports/snowflake.git/common/util" - "github.com/pion/sdp/v2" "github.com/pion/webrtc/v2" ) @@ -81,49 +79,6 @@ func limitedRead(r io.Reader, limit int64) ([]byte, error) { return p, err } -// Stolen from https://github.com/golang/go/pull/30278 -func IsLocal(ip net.IP) bool { - if ip4 := ip.To4(); ip4 != nil { - // Local IPv4 addresses are defined in https://tools.ietf.org/html/rfc1918 - return ip4[0] == 10 || - (ip4[0] == 172 && ip4[1]&0xf0 == 16) || - (ip4[0] == 192 && ip4[1] == 168) - } - // Local IPv6 addresses are defined in https://tools.ietf.org/html/rfc4193 - return len(ip) == net.IPv6len && ip[0]&0xfe == 0xfc -} - -// Removes local LAN address ICE candidates -func stripLocalAddresses(str string) string { - var desc sdp.SessionDescription - err := desc.Unmarshal([]byte(str)) - if err != nil { - return str - } - for _, m := range desc.MediaDescriptions { - attrs := make([]sdp.Attribute, 0) - for _, a := range m.Attributes { - if a.IsICECandidate() { - ice, err := a.ToICECandidate() - if err == nil && ice.Typ == "host" { - ip := net.ParseIP(ice.Address) - if ip != nil && (IsLocal(ip) || ip.IsUnspecified() || ip.IsLoopback()) { - /* no append in this case */ - continue - } - } - } - attrs = append(attrs, a) - } - m.Attributes = attrs - } - bts, err := desc.Marshal() - if err != nil { - return str - } - return string(bts) -} - // Roundtrip HTTP POST using WebRTC SessionDescriptions. // // Send an SDP offer to the broker, which assigns a proxy and responds @@ -138,7 +93,7 @@ func (bc *BrokerChannel) Negotiate(offer *webrtc.SessionDescription) ( if !bc.keepLocalAddresses { offer = &webrtc.SessionDescription{ Type: offer.Type, - SDP: stripLocalAddresses(offer.SDP), + SDP: util.StripLocalAddresses(offer.SDP), } } data := bytes.NewReader([]byte(util.SerializeSessionDescription(offer))) diff --git a/common/util/util.go b/common/util/util.go index 0a86241..fa62fd7 100644 --- a/common/util/util.go +++ b/common/util/util.go @@ -3,7 +3,9 @@ package util import ( "encoding/json" "log" + "net" + "github.com/pion/sdp/v2" "github.com/pion/webrtc/v2" ) @@ -56,3 +58,46 @@ func DeserializeSessionDescription(msg string) *webrtc.SessionDescription { SDP: parsed["sdp"].(string), } } + +// Stolen from https://github.com/golang/go/pull/30278 +func IsLocal(ip net.IP) bool { + if ip4 := ip.To4(); ip4 != nil { + // Local IPv4 addresses are defined in https://tools.ietf.org/html/rfc1918 + return ip4[0] == 10 || + (ip4[0] == 172 && ip4[1]&0xf0 == 16) || + (ip4[0] == 192 && ip4[1] == 168) + } + // Local IPv6 addresses are defined in https://tools.ietf.org/html/rfc4193 + return len(ip) == net.IPv6len && ip[0]&0xfe == 0xfc +} + +// Removes local LAN address ICE candidates +func StripLocalAddresses(str string) string { + var desc sdp.SessionDescription + err := desc.Unmarshal([]byte(str)) + if err != nil { + return str + } + for _, m := range desc.MediaDescriptions { + attrs := make([]sdp.Attribute, 0) + for _, a := range m.Attributes { + if a.IsICECandidate() { + ice, err := a.ToICECandidate() + if err == nil && ice.Typ == "host" { + ip := net.ParseIP(ice.Address) + if ip != nil && (IsLocal(ip) || ip.IsUnspecified() || ip.IsLoopback()) { + /* no append in this case */ + continue + } + } + } + attrs = append(attrs, a) + } + m.Attributes = attrs + } + bts, err := desc.Marshal() + if err != nil { + return str + } + return string(bts) +} diff --git a/common/util/util_test.go b/common/util/util_test.go new file mode 100644 index 0000000..271619a --- /dev/null +++ b/common/util/util_test.go @@ -0,0 +1,26 @@ +package util + +import ( + "testing" + + . "github.com/smartystreets/goconvey/convey" +) + +func TestUtil(t *testing.T) { + Convey("Strip", t, func() { + const offerStart = "v=0\r\no=- 4358805017720277108 2 IN IP4 8.8.8.8\r\ns=-\r\nt=0 0\r\na=group:BUNDLE data\r\na=msid-semantic: WMS\r\nm=application 56688 DTLS/SCTP 5000\r\nc=IN IP4 8.8.8.8\r\n" + const goodCandidate = "a=candidate:3769337065 1 udp 2122260223 8.8.8.8 56688 typ host generation 0 network-id 1 network-cost 50\r\n" + const offerEnd = "a=ice-ufrag:aMAZ\r\na=ice-pwd:jcHb08Jjgrazp2dzjdrvPPvV\r\na=ice-options:trickle\r\na=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\r\na=setup:actpass\r\na=mid:data\r\na=sctpmap:5000 webrtc-datachannel 1024\r\n" + + offer := offerStart + goodCandidate + + "a=candidate:3769337065 1 udp 2122260223 192.168.0.100 56688 typ host generation 0 network-id 1 network-cost 50\r\n" + // IsLocal IPv4 + "a=candidate:3769337065 1 udp 2122260223 fdf8:f53b:82e4::53 56688 typ host generation 0 network-id 1 network-cost 50\r\n" + // IsLocal IPv6 + "a=candidate:3769337065 1 udp 2122260223 0.0.0.0 56688 typ host generation 0 network-id 1 network-cost 50\r\n" + // IsUnspecified IPv4 + "a=candidate:3769337065 1 udp 2122260223 :: 56688 typ host generation 0 network-id 1 network-cost 50\r\n" + // IsUnspecified IPv6 + "a=candidate:3769337065 1 udp 2122260223 127.0.0.1 56688 typ host generation 0 network-id 1 network-cost 50\r\n" + // IsLoopback IPv4 + "a=candidate:3769337065 1 udp 2122260223 ::1 56688 typ host generation 0 network-id 1 network-cost 50\r\n" + // IsLoopback IPv6 + offerEnd + + So(StripLocalAddresses(offer), ShouldEqual, offerStart+goodCandidate+offerEnd) + }) +}

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits March 2020