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

[snowflake/master] Update favicon with badge state on embed.html
by arlo＠torproject.org 11 Oct '19

11 Oct '19

commit faf02d86a15c795e69f176d952bbe1f3f531da28 Author: Arlo Breault <arlolra(a)gmail.com> Date: Tue Oct 1 16:45:04 2019 -0400 Update favicon with badge state on embed.html .ico files were created with, convert -density 256x256 -background transparent toolbar-on.svg -define icon:auto-resize -colors 256 toolbar-on.ico Trac: 31537 --- proxy/init-badge.js | 8 ++++++++ proxy/static/assets/toolbar-off.ico | Bin 0 -> 387723 bytes proxy/static/assets/toolbar-on.ico | Bin 0 -> 385740 bytes proxy/static/assets/toolbar-running.ico | Bin 0 -> 386345 bytes proxy/static/embed.html | 2 ++ 5 files changed, 10 insertions(+) diff --git a/proxy/init-badge.js b/proxy/init-badge.js index 7684e68..fe8cc91 100644 --- a/proxy/init-badge.js +++ b/proxy/init-badge.js @@ -31,6 +31,7 @@ class BadgeUI extends UI { this.popup.setEnabled(false); this.popup.setActive(false); this.popup.setStatusText(messages.getMessage('popupStatusOff')); + this.setIcon('off'); this.popup.setStatusDesc(missing, true); this.popup.hideButton(); } @@ -40,8 +41,10 @@ class BadgeUI extends UI { this.popup.setChecked(true); if (clients > 0) { this.popup.setStatusText(messages.getMessage('popupStatusOn', String(clients))); + this.setIcon('running'); } else { this.popup.setStatusText(messages.getMessage('popupStatusReady')); + this.setIcon('on'); } // FIXME: Share stats from webext this.popup.setStatusDesc(''); @@ -52,6 +55,7 @@ class BadgeUI extends UI { turnOff() { this.popup.setChecked(false); this.popup.setStatusText(messages.getMessage('popupStatusOff')); + this.setIcon('off'); this.popup.setStatusDesc(''); this.popup.setEnabled(false); this.popup.setActive(false); @@ -62,6 +66,10 @@ class BadgeUI extends UI { this.turnOn(); } + setIcon(status) { + document.getElementById('icon').href = `assets/toolbar-${status}.ico`; + } + } BadgeUI.prototype.popup = null; diff --git a/proxy/static/assets/toolbar-off.ico b/proxy/static/assets/toolbar-off.ico new file mode 100644 index 0000000..9483fc9 Binary files /dev/null and b/proxy/static/assets/toolbar-off.ico differ diff --git a/proxy/static/assets/toolbar-on.ico b/proxy/static/assets/toolbar-on.ico new file mode 100644 index 0000000..01203d5 Binary files /dev/null and b/proxy/static/assets/toolbar-on.ico differ diff --git a/proxy/static/assets/toolbar-running.ico b/proxy/static/assets/toolbar-running.ico new file mode 100644 index 0000000..1abf83e Binary files /dev/null and b/proxy/static/assets/toolbar-running.ico differ diff --git a/proxy/static/embed.html b/proxy/static/embed.html index 96bf90c..b3ca800 100644 --- a/proxy/static/embed.html +++ b/proxy/static/embed.html @@ -4,6 +4,8 @@ <meta charset="utf-8" />  <meta http-equiv="refresh" content="86400" /> + <title>Snowflake</title> + <link rel="icon" id="icon" href="assets/toolbar-off.ico" /> <link rel="stylesheet" href="embed.css" /> <script src="popup.js"></script> <script src="embed.js"></script>

1 0

[snowflake/master] Add --chown=:snowflake to rsync commands.
by dcf＠torproject.org 11 Oct '19

11 Oct '19

commit 5732f1a630e0c8021f220d8de4a34a0f22353f8a Author: David Fifield <david(a)bamsoftware.com> Date: Fri Oct 11 10:37:06 2019 -0600 Add --chown=:snowflake to rsync commands. Thanks cohosh for helping debug this. Uploaded files need correct group ownership. --- proxy/README.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/proxy/README.md b/proxy/README.md index 538366f..61468c0 100644 --- a/proxy/README.md +++ b/proxy/README.md @@ -50,15 +50,17 @@ npm run build Do a "dry run" rsync with `-n` to check that only expected files are being changed. If you don't understand why a file would be updated, you can add the `-i` option to see the reason. ``` -rsync -n --chmod ug=rw,D+x --perms --delete -crv build/ staticiforme:/srv/snowflake.torproject.org/htdocs/ +rsync -n --chown=:snowflake --chmod ug=rw,D+x --perms --delete -crv build/ staticiforme:/srv/snowflake.torproject.org/htdocs/ ``` If it looks good, then repeat the rsync without `-n`. ``` -rsync --chmod ug=rw,D+x --perms --delete -crv build/ staticiforme:/srv/snowflake.torproject.org/htdocs/ +rsync --chown=:snowflake --chmod ug=rw,D+x --perms --delete -crv build/ staticiforme:/srv/snowflake.torproject.org/htdocs/ ``` +You can ignore errors of the form `rsync: failed to set permissions on "<dirname>/": Operation not permitted (1)`. + Then run the command to copy the new files to the live web servers: ```

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-2] Bug 31607: App menu items stop working on macOS
by gk＠torproject.org 11 Oct '19

11 Oct '19

commit 1da04ce775a4994924a2c8154fb1f76c663a5eff Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Oct 3 10:53:43 2019 -0400 Bug 31607: App menu items stop working on macOS Avoid re-creating the hidden window, since this causes the nsMenuBarX object that is associated with the app menu to be freed (which in turn causes all of the app menu items to stop working). More detail: There should only be one hidden window. XREMain::XRE_mainRun() contains an explicit call to create the hidden window and that is the normal path by which it is created. However, when Tor Launcher's wizard/progress window is opened during startup, a hidden window is created earlier as a side effect of calls to nsAppShellService::GetHiddenWindow(). Then, when XREMain::XRE_mainRun() creates its hidden window, the original one is freed which also causes the app menu's nsMenuBarX object which is associated with that window to be destroyed. When that happens, the menuGroupOwner property within each Cocoa menu items's MenuItemInfo object is cleared. This breaks the link that is necessary for NativeMenuItemTarget's menuItemHit method to dispatch a menu item event. --- xpfe/appshell/nsAppShellService.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/xpfe/appshell/nsAppShellService.cpp b/xpfe/appshell/nsAppShellService.cpp index b09534c8841d..cb76f1ab45d5 100644 --- a/xpfe/appshell/nsAppShellService.cpp +++ b/xpfe/appshell/nsAppShellService.cpp @@ -85,6 +85,10 @@ NS_IMPL_ISUPPORTS(nsAppShellService, nsIAppShellService, nsIObserver) NS_IMETHODIMP nsAppShellService::CreateHiddenWindow() { + if (mHiddenWindow) { + return NS_OK; + } + return CreateHiddenWindowHelper(false); }

1 0

[translation/torbutton-browseronboardingproperties_completed] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-browseronboardingproperties_completed
by translation＠torproject.org 11 Oct '19

11 Oct '19

commit ab5d9b05ad02a29f097c168cf6bf0e3ed0b34f86 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Oct 11 14:52:11 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torbutton-browseron… --- nl/browserOnboarding.properties | 109 ++++++++++++++++++++-------------------- 1 file changed, 55 insertions(+), 54 deletions(-) diff --git a/nl/browserOnboarding.properties b/nl/browserOnboarding.properties index f524f6a57..6f2ac2e3f 100644 --- a/nl/browserOnboarding.properties +++ b/nl/browserOnboarding.properties @@ -2,70 +2,71 @@ # See LICENSE for licensing information. # vim: set sw=2 sts=2 ts=8 et: -onboarding.tour-tor-welcome=Welkom -onboarding.tour-tor-welcome.title=U bent klaar. -onboarding.tour-tor-welcome.description=Tor Browser biedt de hoogste standaard aan privacy en beveiliging tijdens het websurfen. U bent nu beschermd tegen volgen, bewaking en censuur. Deze snelle onboarding toont hoe dit werkt. -onboarding.tour-tor-welcome.next-button=Naar Privacy +# onboarding.tour-tor-welcome=Welcome +# onboarding.tour-tor-welcome.title=You’re ready. +# onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You’re now protected against tracking, surveillance, and censorship. This quick onboarding will show you how. +# onboarding.tour-tor-welcome.next-button=Go to Privacy -onboarding.tour-tor-privacy=Privacy -onboarding.tour-tor-privacy.title=Verwerp volgers en speurders. -onboarding.tour-tor-privacy.description=Tor Browser isoleert cookies en verwijdert uw browsergeschiedenis na uw sessie. Deze wijzigingen zorgen ervoor dat uw privacy en veiligheid in de browser zijn beschermd. Klik op ‘Tor-netwerk’ om te lezen hoe we u op netwerkniveau beschermen. -onboarding.tour-tor-privacy.button=Naar Tor-netwerk +# onboarding.tour-tor-privacy=Privacy +# onboarding.tour-tor-privacy.title=Snub trackers and snoopers. +# onboarding.tour-tor-privacy.description=Tor Browser isolates cookies and deletes your browser history after your session. These modifications ensure your privacy and security are protected in the browser. Click ‘Tor Network’ to learn how we protect you on the network level. +# onboarding.tour-tor-privacy.button=Go to Tor Network -onboarding.tour-tor-network=Tor-netwerk -onboarding.tour-tor-network.title=Reis over een gedecentraliseerd netwerk. -onboarding.tour-tor-network.description=Tor Browser verbindt u met het Tor-netwerk, mogelijk gemaakt door duizenden vrijwilligers over de hele wereld. Anders dan bij een VPN is er geen sprake van één zwakke plek of centrale autoriteit die u moet vertrouwen om privé van het internet gebruik te maken. -onboarding.tour-tor-network.button=Naar Circuit-venster +# onboarding.tour-tor-network=Tor Network +# onboarding.tour-tor-network.title=Travel a decentralized network. +# onboarding.tour-tor-network.description=Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, there’s no one point of failure or centralized entity you need to trust in order to enjoy the internet privately. +# onboarding.tour-tor-network.description-para2=NEW: Tor Network Settings, including the ability to request bridges where Tor is blocked, can now be found in Preferences. +# onboarding.tour-tor-network.action-button=Adjust Your Tor Network Settings +# onboarding.tour-tor-network.button=Go to Circuit Display -onboarding.tour-tor-circuit-display=Circuit-venster -onboarding.tour-tor-circuit-display.title=Bekijk uw pad. -onboarding.tour-tor-circuit-display.description=Voor elk domein dat u bezoekt, wordt uw verkeer in een circuit over drie Tor-omleidingen over de hele wereld omgeleid en versleuteld. Geen website weet waarvandaan u verbinding maakt. U kunt een nieuw circuit aanvragen door op ‘Nieuw circuit voor deze website’ in ons Circuit-venster te klikken. -onboarding.tour-tor-circuit-display.button=Mijn pad bekijken -onboarding.tour-tor-circuit-display.next-button=Naar Beveiliging +# onboarding.tour-tor-circuit-display=Circuit Display +# onboarding.tour-tor-circuit-display.title=See your path. +# onboarding.tour-tor-circuit-display.description=For each domain you visit, your traffic is relayed and encrypted in a circuit across three Tor relays around the world. No website knows where you are connecting from. You can request a new circuit by clicking ‘New Circuit for this Site’ on our Circuit Display. +# onboarding.tour-tor-circuit-display.button=See My Path +# onboarding.tour-tor-circuit-display.next-button=Go to Security -onboarding.tour-tor-security=Beveiliging -onboarding.tour-tor-security.title=Kies uw ervaring. -onboarding.tour-tor-security.description=We bieden ook aanvullende instellingen om de beveiliging van uw browser te verhogen. Via onze Beveiligingsinstellingen kunt u elementen blokkeren die kunnen worden gebruikt om uw computer aan te vallen. Klik hieronder om te zien wat de verschillende opties doen. -onboarding.tour-tor-security.description-suffix=Opmerking: NoScript en HTTPS Everywhere zijn standaard niet in de werkbalk opgenomen, maar deze kunt u aanpassen om ze toe te voegen. -onboarding.tour-tor-security-level.button=Uw beveiligingsniveau bekijken -onboarding.tour-tor-security-level.next-button=Naar Ervaringstips +# onboarding.tour-tor-security=Security +# onboarding.tour-tor-security.title=Choose your experience. +# onboarding.tour-tor-security.description=We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer. Click below to see what the different options do. +# onboarding.tour-tor-security.description-suffix=Note: By default, NoScript and HTTPS Everywhere are not included on the toolbar, but you can customize your toolbar to add them. +# onboarding.tour-tor-security-level.button=See Your Security Level +# onboarding.tour-tor-security-level.next-button=Go to Experience Tips -onboarding.tour-tor-expect-differences=Ervaringstips -onboarding.tour-tor-expect-differences.title=Verwacht enige verschillen. -onboarding.tour-tor-expect-differences.description=Met alle door Tor geboden beveiligings- en privacyfuncties kan uw ervaring tijdens het webbrowsen een beetje anders zijn. Dingen gaan misschien iets langzamer, en afhankelijk van het door u gekozen beveiligingsniveau zullen bepaalde elementen misschien niet werken of worden geladen. Er kan ook worden gevraagd te bewijzen dat u een mens bent en geen robot. -onboarding.tour-tor-expect-differences.button=FAQ’s bekijken -onboarding.tour-tor-expect-differences.next-button=Naar Onion-services +# onboarding.tour-tor-expect-differences=Experience Tips +# onboarding.tour-tor-expect-differences.title=Expect some differences. +# onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by Tor, your experience while browsing the internet may be a little different. Things may be a bit slower, and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot. +# onboarding.tour-tor-expect-differences.button=See FAQs +# onboarding.tour-tor-expect-differences.next-button=Go to Onion Services -onboarding.tour-tor-onion-services=Onion-services -onboarding.tour-tor-onion-services.title=Wees extra beschermd. -onboarding.tour-tor-onion-services.description=Onion-services zijn websites die op .onion eindigen en extra bescherming bieden voor publicisten en bezoekers, waaronder toegevoegde beschermingsmechanismen tegen censuur. Via Onion-services kan iedereen anoniem inhoud en diensten aanbieden. Klik hieronder om de DuckDuckGo-onion-website te bezoeken. -onboarding.tour-tor-onion-services.button=Een Onion bezoeken -onboarding.tour-tor-onion-services.next-button=Gereed +# onboarding.tour-tor-onion-services=Onion Services +# onboarding.tour-tor-onion-services.title=Be extra protected. +# onboarding.tour-tor-onion-services.description=Onion services are sites that end with a .onion that provide extra protections to publishers and visitors, including added safeguards against censorship. Onion services allow anyone to provide content and services anonymously. Click below to visit the DuckDuckGo onion site. +# onboarding.tour-tor-onion-services.button=Visit an Onion +# onboarding.tour-tor-onion-services.next-button=Done -onboarding.overlay-icon-tooltip-updated2=Bekijk wat er nieuw is\nin %S -onboarding.tour-tor-update.prefix-new=Nieuw -onboarding.tour-tor-update.prefix-updated=Bijgewerkt +# onboarding.overlay-icon-tooltip-updated2=See what's new\nin %S +# onboarding.tour-tor-update.prefix-new=New +# onboarding.tour-tor-update.prefix-updated=Updated -onboarding.tour-tor-toolbar=Werkbalk -onboarding.tour-tor-toolbar-update-8.5.title=Werkbalkindeling -onboarding.tour-tor-toolbar-update-8.5.description=We hebben de indeling van de browserwerkbalk verbeterd. Het Torbutton-pictogram is nu achter de URL-balk geplaatst, en daarnaast is een pictogram voor het beveiligingsniveau toegevoegd. -onboarding.tour-tor-toolbar-update-8.5.next-button=Naar Beveiliging - -onboarding.tour-tor-security-update-8.5.title=Beveiligingsniveau-ervaring -onboarding.tour-tor-security-update-8.5.description=We hebben de manier waarop u uw beveiligingsniveau ziet en instelt verbeterd. De schuifregelaar is vervangen door een werkbalkpictogram dat uw huidige niveau altijd zichtbaar maakt. Klik hierop om details over uw huidige niveau te zien of om uw beveiligingsinstellingen te wijzigen. +# onboarding.tour-tor-toolbar=Toolbar +# onboarding.tour-tor-toolbar-update-9.0.title=Goodbye Onion Button. +# onboarding.tour-tor-toolbar-update-9.0.description=We want your experience using Tor to be fully integrated within Tor Browser. +# onboarding.tour-tor-toolbar-update-9.0.description-para2=That's why now, rather than using the onion button, you can see your Tor Circuit via the [i] in the URL bar and request a New Identity using the toolbar button or the [=] menu. +# onboarding.tour-tor-toolbar-update-9.0.button=How to Request a New Identity +# onboarding.tour-tor-toolbar-update-9.0.next-button=Go to Tor Network # Circuit Display onboarding. -onboarding.tor-circuit-display.next=Volgende -onboarding.tor-circuit-display.done=Gereed -onboarding.tor-circuit-display.one-of-three=1 van 3 -onboarding.tor-circuit-display.two-of-three=2 van 3 -onboarding.tor-circuit-display.three-of-three=3 van 3 +# onboarding.tor-circuit-display.next=Next +# onboarding.tor-circuit-display.done=Done +# onboarding.tor-circuit-display.one-of-three=1 of 3 +# onboarding.tor-circuit-display.two-of-three=2 of 3 +# onboarding.tor-circuit-display.three-of-three=3 of 3 -onboarding.tor-circuit-display.intro.title=Hoe werken circuits? -onboarding.tor-circuit-display.intro.msg=Circuits worden gevormd door willekeurig toegekende relays, bestaande uit computers over de hele wereld die zijn geconfigureerd om Tor-verkeer door te sturen. Via circuits kunt u privé browsen en verbinding maken met onion-services. +# onboarding.tor-circuit-display.intro.title=How do circuits work? +# onboarding.tor-circuit-display.intro.msg=Circuits are made up of randomly assigned relays, which are computers around the world configured to forward Tor traffic. Circuits allow you to browse privately and to connect to onion services. -onboarding.tor-circuit-display.diagram.title=Circuit-venster -onboarding.tor-circuit-display.diagram.msg=Dit diagram toont de relays die het circuit voor deze website vormen. Om het koppelen van activiteit tussen verschillende websites te voorkomen, krijgt elke website een apart circuit. +# onboarding.tor-circuit-display.diagram.title=Circuit Display +# onboarding.tor-circuit-display.diagram.msg=This diagram shows the relays that make up the circuit for this website. To prevent linking of activity across different sites, each website gets a different circuit. -onboarding.tor-circuit-display.new-circuit.title=Hebt u een nieuw circuit nodig? -onboarding.tor-circuit-display.new-circuit.msg=Als u geen verbinding kunt maken met de website die u probeert te bezoeken of als deze niet goed wordt geladen, kunt u deze knop gebruiken om de website opnieuw te laden met een nieuw circuit. +# onboarding.tor-circuit-display.new-circuit.title=Do you need a new circuit? +# onboarding.tor-circuit-display.new-circuit.msg=If you are not able to connect to the website you’re trying to visit or it is not loading properly, then you can use this button to reload the site with a new circuit.

1 0

[translation/torbutton-browseronboardingproperties] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-browseronboardingproperties
by translation＠torproject.org 11 Oct '19

11 Oct '19

commit fd8c2e1bab6a608cf54242ad14d6673e14174626 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Oct 11 14:52:05 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torbutton-browseron… --- nl/browserOnboarding.properties | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/nl/browserOnboarding.properties b/nl/browserOnboarding.properties index 84ab01764..6c3e5ed95 100644 --- a/nl/browserOnboarding.properties +++ b/nl/browserOnboarding.properties @@ -15,8 +15,8 @@ onboarding.tour-tor-privacy.button=Naar Tor-netwerk onboarding.tour-tor-network=Tor-netwerk onboarding.tour-tor-network.title=Reis over een gedecentraliseerd netwerk. onboarding.tour-tor-network.description=Tor Browser verbindt u met het Tor-netwerk, mogelijk gemaakt door duizenden vrijwilligers over de hele wereld. Anders dan bij een VPN is er geen sprake van één zwakke plek of centrale autoriteit die u moet vertrouwen om privé van het internet gebruik te maken. -onboarding.tour-tor-network.description-para2=NEW: Tor Network Settings, including the ability to request bridges where Tor is blocked, can now be found in Preferences. -onboarding.tour-tor-network.action-button=Adjust Your Tor Network Settings +onboarding.tour-tor-network.description-para2=NIEUW: De Tor-netwerk instellingen, inclusief de mogelijkheid om bridges aan te vragen waar Tor is geblokkeerd, kunnen nu worden gevonden in het menu 'voorkeuren'. +onboarding.tour-tor-network.action-button=Uw Tor-netwerk instellingen aanpassen onboarding.tour-tor-network.button=Naar Circuit-venster onboarding.tour-tor-circuit-display=Circuit-venster @@ -49,10 +49,10 @@ onboarding.tour-tor-update.prefix-new=Nieuw onboarding.tour-tor-update.prefix-updated=Bijgewerkt onboarding.tour-tor-toolbar=Werkbalk -onboarding.tour-tor-toolbar-update-9.0.title=Goodbye Onion Button. -onboarding.tour-tor-toolbar-update-9.0.description=We want your experience using Tor to be fully integrated within Tor Browser. -onboarding.tour-tor-toolbar-update-9.0.description-para2=That's why now, rather than using the onion button, you can see your Tor Circuit via the [i] in the URL bar and request a New Identity using the toolbar button or the [=] menu. -onboarding.tour-tor-toolbar-update-9.0.button=How to Request a New Identity +onboarding.tour-tor-toolbar-update-9.0.title=Vaarwel Onion-knop. +onboarding.tour-tor-toolbar-update-9.0.description=We willen dat uw ervaring met Tor volledig is geïntegreerd binnen Tor Browser. +onboarding.tour-tor-toolbar-update-9.0.description-para2=Dat is waarom u vanaf nu, in plaats van de onion-knop, u uw Tor-cicuit via de [i] in de URL-balk kunt zien en u een nieuwe identiteit kunt aanvragen via de werkbalk-knop of via het [=]-menu. +onboarding.tour-tor-toolbar-update-9.0.button=Hoe kan ik een nieuwe identiteit aanvragen? onboarding.tour-tor-toolbar-update-9.0.next-button=Naar Tor-netwerk # Circuit Display onboarding.

1 0

[snowflake/master] bump version to 0.0.11
by cohosh＠torproject.org 11 Oct '19

11 Oct '19

commit 61d8eb5ef03204e2ca1fa2d8424a6d3572f58c96 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Fri Oct 11 10:40:26 2019 -0400 bump version to 0.0.11 --- proxy/webext/manifest.json | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/proxy/webext/manifest.json b/proxy/webext/manifest.json index bc93608..0c29f2d 100644 --- a/proxy/webext/manifest.json +++ b/proxy/webext/manifest.json @@ -1,11 +1,13 @@ { "manifest_version": 2, "name": "Snowflake", - "version": "0.0.10", + "version": "0.0.11", "description": "__MSG_appDesc__", "default_locale": "en_US", "background": { - "scripts": ["snowflake.js"], + "scripts": [ + "snowflake.js" + ], "persistent": true }, "browser_action": { @@ -16,5 +18,7 @@ "default_title": "Snowflake", "default_popup": "embed.html" }, - "permissions": ["storage"] -} + "permissions": [ + "storage" + ] +} \ No newline at end of file

1 0

[torbutton/master] Bug 32041: Replace = with real hamburguer icon ≡
by gk＠torproject.org 11 Oct '19

11 Oct '19

commit 9a16e4bad1453e530a1308db7450b2e617bd5b58 Author: emma peel <emmapeel(a)torproject.org> Date: Fri Oct 11 11:59:27 2019 +0000 Bug 32041: Replace = with real hamburguer icon ≡ --- chrome/locale/en-US/browserOnboarding.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chrome/locale/en-US/browserOnboarding.properties b/chrome/locale/en-US/browserOnboarding.properties index 7acfe2eb..8068b6c8 100644 --- a/chrome/locale/en-US/browserOnboarding.properties +++ b/chrome/locale/en-US/browserOnboarding.properties @@ -51,7 +51,7 @@ onboarding.tour-tor-update.prefix-updated=Updated onboarding.tour-tor-toolbar=Toolbar onboarding.tour-tor-toolbar-update-9.0.title=Goodbye Onion Button. onboarding.tour-tor-toolbar-update-9.0.description=We want your experience using Tor to be fully integrated within Tor Browser. -onboarding.tour-tor-toolbar-update-9.0.description-para2=That's why now, rather than using the onion button, you can see your Tor Circuit via the [i] in the URL bar and request a New Identity using the toolbar button or the [=] menu. +onboarding.tour-tor-toolbar-update-9.0.description-para2=That's why now, rather than using the onion button, you can see your Tor Circuit via the [i] in the URL bar and request a New Identity using the toolbar button or the [≡] menu. onboarding.tour-tor-toolbar-update-9.0.button=How to Request a New Identity onboarding.tour-tor-toolbar-update-9.0.next-button=Go to Tor Network

1 0

[torspec/master] control-spec: ADD_ONION ClientAuth is v2 only
by nickm＠torproject.org 11 Oct '19

11 Oct '19

commit 03caff6632d74beca06147d1c8dd082900b334f1 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Oct 9 10:39:23 2019 -0400 control-spec: ADD_ONION ClientAuth is v2 only Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- control-spec.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/control-spec.txt b/control-spec.txt index e95bec1..c77c335 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -1624,7 +1624,7 @@ "Detach" / ; Do not associate the newly created Onion Service to the current control connection. "BasicAuth" / ; Client authorization is required using the "basic" - method. + method (v2 only). "NonAnonymous" /; Add a non-anonymous Single Onion Service. Tor checks this flag matches its configured hidden service anonymity mode. @@ -1668,11 +1668,11 @@ way to recreate the generated keypair and the corresponding Onion Service at a later date). - If client authorization is enabled using the "BasicAuth" flag, the - service will not be accessible to clients without valid authorization - data (configured with the "HidServAuth" option). The list of authorized - clients is specified with one or more "ClientAuth" parameters. If - "ClientBlob" is not specified for a client, a new credential will be + If client authorization is enabled using the "BasicAuth" flag (which is v2 + only), the service will not be accessible to clients without valid + authorization data (configured with the "HidServAuth" option). The list of + authorized clients is specified with one or more "ClientAuth" parameters. + If "ClientBlob" is not specified for a client, a new credential will be randomly generated and returned. Tor instances can either be in anonymous hidden service mode, or @@ -1724,7 +1724,7 @@ S: 250-PrivateKey=RSA1024:[Blob Redacted] S: 250 OK - C: ADD_ONION NEW:BEST Flags=DiscardPK,BasicAuth Port=22 + C: ADD_ONION NEW:RSA1024 Flags=DiscardPK,BasicAuth Port=22 ClientAuth=alice:[Blob Redacted] ClientAuth=bob S: 250-ServiceID=testonion1234567 S: 250-ClientAuth=bob:[Blob Redacted]

1 0

[torspec/master] control-spex: Clarify v2 vs v3 for ADD_ONION command
by nickm＠torproject.org 11 Oct '19

11 Oct '19

commit a0321ecc75c646d86b27ce88680d78cd8bebbac4 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Oct 9 10:45:20 2019 -0400 control-spex: Clarify v2 vs v3 for ADD_ONION command Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- control-spec.txt | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/control-spec.txt b/control-spec.txt index c77c335..7fde9e0 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -1604,18 +1604,18 @@ KeyType = "NEW" / ; The server should generate a key of algorithm KeyBlob "RSA1024" / ; The server should use the 1024 bit RSA key provided - in as KeyBlob + in as KeyBlob (v2). "ED25519-V3"; The server should use the ed25519 v3 key provided in as - KeyBlob + KeyBlob (v3). KeyBlob = "BEST" / ; The server should generate a key using the "best" supported algorithm (KeyType == "NEW"). [As of 0.4.2.3-alpha, ED25519-V3 is used] "RSA1024" / ; The server should generate a 1024 bit RSA key - (KeyType == "NEW") + (KeyType == "NEW") (v2). "ED25519-V3"; The server should generate an ed25519 private key - (KeyType == "NEW") + (KeyType == "NEW") (v3). String ; A serialized private key (without whitespace) Flag = @@ -1642,10 +1642,10 @@ optional HiddenServicePort "TARGET" argument). ClientName = An identifier 1 to 16 characters long, using only - characters in A-Za-z0-9+-_ (no spaces). + characters in A-Za-z0-9+-_ (no spaces) (v2 only). ClientBlob = Authorization data for the client, in an opaque format - specific to the authorization method. + specific to the authorization method (v2 only). The server reply format is: "250-ServiceID=" ServiceID CRLF @@ -1712,7 +1712,7 @@ Examples: C: ADD_ONION NEW:BEST Flags=DiscardPK Port=80 - S: 250-ServiceID=exampleonion1234 + S: 250-ServiceID=exampleoniont2pqglbny66wpovyvao3ylc23eileodtevc4b75ikpad S: 250 OK C: ADD_ONION RSA1024:[Blob Redacted] Port=80,192.168.1.1:8080 @@ -1720,8 +1720,8 @@ S: 250 OK C: ADD_ONION NEW:BEST Port=22 Port=80,8080 - S: 250-ServiceID=testonion1234567 - S: 250-PrivateKey=RSA1024:[Blob Redacted] + S: 250-ServiceID=sampleonion4t2pqglbny66wpovyvao3ylc23eileodtevc4b75ikpad + S: 250-PrivateKey=ED25519-V3:[Blob Redacted] S: 250 OK C: ADD_ONION NEW:RSA1024 Flags=DiscardPK,BasicAuth Port=22 @@ -1733,7 +1733,7 @@ Examples with Tor in anonymous onion service mode: C: ADD_ONION NEW:BEST Flags=DiscardPK Port=22 - S: 250-ServiceID=testonion1234567 + S: 250-ServiceID=exampleoniont2pqglbny66wpovyvao3ylc23eileodtevc4b75ikpad S: 250 OK C: ADD_ONION NEW:BEST Flags=DiscardPK,NonAnonymous Port=22 @@ -1745,13 +1745,13 @@ S: 512 Tor is in non-anonymous hidden service mode C: ADD_ONION NEW:BEST Flags=DiscardPK,NonAnonymous Port=22 - S: 250-ServiceID=testonion1234567 + S: 250-ServiceID=exampleoniont2pqglbny66wpovyvao3ylc23eileodtevc4b75ikpad S: 250 OK [ADD_ONION was added in Tor 0.2.7.1-alpha.] - [ClientAuth was added in Tor 0.2.9.1-alpha.] - [NonAnonymous was added in Tor 0.2.9.3-alpha.] [MaxStreams and MaxStreamsCloseCircuit were added in Tor 0.2.7.2-alpha] + [ClientAuth was added in Tor 0.2.9.1-alpha. It is v2 only.] + [NonAnonymous was added in Tor 0.2.9.3-alpha.] [HS v3 support added 0.3.3.1-alpha] 3.28. DEL_ONION

1 0

[tor/master] hs-v3: Fix implicit ssize_t to size_t conversion
by nickm＠torproject.org 11 Oct '19

11 Oct '19

commit b356b3907a6424d9e1a14722e9729529862a698f Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Oct 2 13:19:51 2019 -0400 hs-v3: Fix implicit ssize_t to size_t conversion Found by Coverity. Fixes #31682 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket31682 | 3 +++ src/feature/hs/hs_cell.c | 26 +++++++++++++++++++++----- 2 files changed, 24 insertions(+), 5 deletions(-) diff --git a/changes/ticket31682 b/changes/ticket31682 new file mode 100644 index 000000000..9777dec1f --- /dev/null +++ b/changes/ticket31682 @@ -0,0 +1,3 @@ + o Minor bugfixes (hidden service v3, coverity): + - Fix an implicit conversion from ssize_t to size_t discovered by Coverity. + Fixes bug 31682; bugfix on 0.4.2.1-alpha. diff --git a/src/feature/hs/hs_cell.c b/src/feature/hs/hs_cell.c index 547dda3e1..3147b898b 100644 --- a/src/feature/hs/hs_cell.c +++ b/src/feature/hs/hs_cell.c @@ -495,11 +495,12 @@ build_establish_intro_dos_param(trn_cell_extension_dos_t *dos_ext, /* Build the DoS defense cell extension and put it in the given extensions * object. This can't fail. */ -static void +static int build_establish_intro_dos_extension(const hs_service_config_t *service_config, trn_cell_extension_t *extensions) { - ssize_t ret, dos_ext_encoded_len; + ssize_t ret; + size_t dos_ext_encoded_len; uint8_t *field_array; trn_cell_extension_field_t *field; trn_cell_extension_dos_t *dos_ext; @@ -526,7 +527,11 @@ build_establish_intro_dos_extension(const hs_service_config_t *service_config, service_config->intro_dos_burst_per_sec); /* Set the field with the encoded DoS extension. */ - dos_ext_encoded_len = trn_cell_extension_dos_encoded_len(dos_ext); + ret = trn_cell_extension_dos_encoded_len(dos_ext); + if (BUG(ret <= 0)) { + return -1; + } + dos_ext_encoded_len = ret; /* Set length field and the field array size length. */ trn_cell_extension_field_set_field_len(field, dos_ext_encoded_len); trn_cell_extension_field_setlen_field(field, dos_ext_encoded_len); @@ -534,7 +539,10 @@ build_establish_intro_dos_extension(const hs_service_config_t *service_config, field_array = trn_cell_extension_field_getarray_field(field); ret = trn_cell_extension_dos_encode(field_array, trn_cell_extension_field_getlen_field(field), dos_ext); - tor_assert(ret == dos_ext_encoded_len); + if (BUG(ret <= 0)) { + return -1; + } + tor_assert(ret == (ssize_t) dos_ext_encoded_len); /* Finally, encode field into the cell extension. */ trn_cell_extension_add_fields(extensions, field); @@ -546,6 +554,8 @@ build_establish_intro_dos_extension(const hs_service_config_t *service_config, /* Cleanup. DoS extension has been encoded at this point. */ trn_cell_extension_dos_free(dos_ext); + + return 0; } /* ========== */ @@ -558,6 +568,7 @@ STATIC trn_cell_extension_t * build_establish_intro_extensions(const hs_service_config_t *service_config, const hs_service_intro_point_t *ip) { + int ret; trn_cell_extension_t *extensions; tor_assert(service_config); @@ -571,9 +582,14 @@ build_establish_intro_extensions(const hs_service_config_t *service_config, if (service_config->has_dos_defense_enabled && ip->support_intro2_dos_defense) { /* This function takes care to increment the number of extensions. */ - build_establish_intro_dos_extension(service_config, extensions); + ret = build_establish_intro_dos_extension(service_config, extensions); + if (ret < 0) { + /* Return no extensions on error. */ + goto end; + } } + end: return extensions; }

1 0