April 2023 - tor-commits - lists.torproject.org

[Git][tpo/applications/tor-browser][tor-browser-102.10.0esr-12.0-1] fixup! Bug 41089: Add tor-browser build scripts + Makefile to tor-browser
by Richard Pospesel (＠richard) 14 Apr '23

14 Apr '23

Richard Pospesel pushed to branch tor-browser-102.10.0esr-12.0-1 at The Tor Project / Applications / Tor Browser Commits: 77a7ec15 by Richard Pospesel at 2023-04-14T19:56:46+00:00 fixup! Bug 41089: Add tor-browser build scripts + Makefile to tor-browser Bug 41730: Bridge lines in tools/torbrowser/bridges.js out of date - - - - - 1 changed file: - tools/torbrowser/bridges.js Changes: ===================================== tools/torbrowser/bridges.js ===================================== @@ -7,71 +7,56 @@ pref( ); pref( "extensions.torlauncher.default_bridge.obfs4.2", - "obfs4 38.229.1.78:80 C8CBDB2464FC9804A69531437BCF2BE31FDD2EE4 cert=Hmyfd2ev46gGY7NoVxA9ngrPF2zCZtzskRTzoWXbxNkzeVnGFPWmrTtILRyqCTjHR+s9dg iat-mode=1" -); -pref( - "extensions.torlauncher.default_bridge.obfs4.3", - "obfs4 38.229.33.83:80 0BAC39417268B96B9F514E7F63FA6FBA1A788955 cert=VwEFpk9F/UN9JED7XpG1XOjm/O8ZCXK80oPecgWnNDZDv5pdkhq1OpbAH0wNqOT6H6BmRQ iat-mode=1" -); -pref( - "extensions.torlauncher.default_bridge.obfs4.4", "obfs4 37.218.245.14:38224 D9A82D2F9C2F65A18407B1D2B764F130847F8B5D cert=bjRaMrr1BRiAW8IE9U5z27fQaYgOhX1UCmOpg2pFpoMvo6ZgQMzLsaTzzQNTlm7hNcb+Sg iat-mode=0" ); pref( - "extensions.torlauncher.default_bridge.obfs4.5", + "extensions.torlauncher.default_bridge.obfs4.3", "obfs4 85.31.186.98:443 011F2599C0E9B27EE74B353155E244813763C3E5 cert=ayq0XzCwhpdysn5o0EyDUbmSOx3X/oTEbzDMvczHOdBJKlvIdHHLJGkZARtT4dcBFArPPg iat-mode=0" ); pref( - "extensions.torlauncher.default_bridge.obfs4.6", + "extensions.torlauncher.default_bridge.obfs4.4", "obfs4 85.31.186.26:443 91A6354697E6B02A386312F68D82CF86824D3606 cert=PBwr+S8JTVZo6MPdHnkTwXJPILWADLqfMGoVvhZClMq/Urndyd42BwX9YFJHZnBB3H0XCw iat-mode=0" ); pref( - "extensions.torlauncher.default_bridge.obfs4.7", - "obfs4 144.217.20.138:80 FB70B257C162BF1038CA669D568D76F5B7F0BABB cert=vYIV5MgrghGQvZPIi1tJwnzorMgqgmlKaB77Y3Z9Q/v94wZBOAXkW+fdx4aSxLVnKO+xNw iat-mode=0" -); -pref( - "extensions.torlauncher.default_bridge.obfs4.8", + "extensions.torlauncher.default_bridge.obfs4.5", "obfs4 193.11.166.194:27015 2D82C2E354D531A68469ADF7F878FA6060C6BACA cert=4TLQPJrTSaDffMK7Nbao6LC7G9OW/NHkUwIdjLSS3KYf0Nv4/nQiiI8dY2TcsQx01NniOg iat-mode=0" ); pref( - "extensions.torlauncher.default_bridge.obfs4.9", + "extensions.torlauncher.default_bridge.obfs4.6", "obfs4 193.11.166.194:27020 86AC7B8D430DAC4117E9F42C9EAED18133863AAF cert=0LDeJH4JzMDtkJJrFphJCiPqKx7loozKN7VNfuukMGfHO0Z8OGdzHVkhVAOfo1mUdv9cMg iat-mode=0" ); pref( - "extensions.torlauncher.default_bridge.obfs4.10", + "extensions.torlauncher.default_bridge.obfs4.7", "obfs4 193.11.166.194:27025 1AE2C08904527FEA90C4C4F8C1083EA59FBC6FAF cert=ItvYZzW5tn6v3G4UnQa6Qz04Npro6e81AP70YujmK/KXwDFPTs3aHXcHp4n8Vt6w/bv8cA iat-mode=0" ); pref( - "extensions.torlauncher.default_bridge.obfs4.11", + "extensions.torlauncher.default_bridge.obfs4.8", "obfs4 209.148.46.65:443 74FAD13168806246602538555B5521A0383A1875 cert=ssH+9rP8dG2NLDN2XuFw63hIO/9MNNinLmxQDpVa+7kTOa9/m+tGWT1SmSYpQ9uTBGa6Hw iat-mode=0" ); pref( - "extensions.torlauncher.default_bridge.obfs4.12", + "extensions.torlauncher.default_bridge.obfs4.9", "obfs4 146.57.248.225:22 10A6CD36A537FCE513A322361547444B393989F0 cert=K1gDtDAIcUfeLqbstggjIw2rtgIKqdIhUlHp82XRqNSq/mtAjp1BIC9vHKJ2FAEpGssTPw iat-mode=0" ); pref( - "extensions.torlauncher.default_bridge.obfs4.13", + "extensions.torlauncher.default_bridge.obfs4.10", "obfs4 45.145.95.6:27015 C5B7CD6946FF10C5B3E89691A7D3F2C122D2117C cert=TD7PbUO0/0k6xYHMPW3vJxICfkMZNdkRrb63Zhl5j9dW3iRGiCx0A7mPhe5T2EDzQ35+Zw iat-mode=0" ); pref( - "extensions.torlauncher.default_bridge.obfs4.14", - "obfs4 [2a0c:4d80:42:702::1]:27015 C5B7CD6946FF10C5B3E89691A7D3F2C122D2117C cert=TD7PbUO0/0k6xYHMPW3vJxICfkMZNdkRrb63Zhl5j9dW3iRGiCx0A7mPhe5T2EDzQ35+Zw iat-mode=0" -); -pref( - "extensions.torlauncher.default_bridge.obfs4.15", + "extensions.torlauncher.default_bridge.obfs4.11", "obfs4 51.222.13.177:80 5EDAC3B810E12B01F6FD8050D2FD3E277B289A08 cert=2uplIpLQ0q9+0qMFrK5pkaYRDOe460LL9WHBvatgkuRr/SL31wBOEupaMMJ6koRE6Ld0ew iat-mode=0" ); -pref( - "extensions.torlauncher.default_bridge.obfs4.16", - "obfs4 185.100.87.30:443 5B403DFE34F4872EB027059CECAE30B0C864B3A2 cert=bWUdFUe8io9U6JkSLoGAvSAUDcB779/shovCYmYAQb/pW/iEAMZtO/lCd94OokOF909TPA iat-mode=2" -); pref( "extensions.torlauncher.default_bridge.meek-azure.1", - "meek_lite 192.0.2.2:2 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com" + "meek_lite 192.0.2.18:80 BE776A53492E1E044A26F17306E1BC46A55A1625 url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com" ); pref( "extensions.torlauncher.default_bridge.snowflake.1", - "snowflake 192.0.2.3:1 2B280B23E1107BB62ABFC40DDCC8824814F80A72" + "snowflake 192.0.2.3:80 2B280B23E1107BB62ABFC40DDCC8824814F80A72 fingerprint=2B280B23E1107BB62ABFC40DDCC8824814F80A72 url=https://snowflake-broker.torproject.net.global.prod.fastly.net/ front=cdn.sstatic.net ice=stun:stun.l.google.com:19302,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.com:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478 utls-imitate=hellorandomizedalpn" +); + +pref( + "extensions.torlauncher.default_bridge.snowflake.2", + "snowflake 192.0.2.4:80 8838024498816A039FCBBAB14E6F40A0843051FA fingerprint=8838024498816A039FCBBAB14E6F40A0843051FA url=https://snowflake-broker.torproject.net.global.prod.fastly.net/ front=cdn.sstatic.net ice=stun:stun.l.google.com:19302,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.net:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478 utls-imitate=hellorandomizedalpn" ); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/77a7ec1… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/77a7ec1… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.10.0esr-12.5-1] fixup! Bug 41089: Add tor-browser build scripts + Makefile to tor-browser
by Richard Pospesel (＠richard) 14 Apr '23

14 Apr '23

Richard Pospesel pushed to branch tor-browser-102.10.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: adfc97d5 by Richard Pospesel at 2023-04-14T19:47:31+00:00 fixup! Bug 41089: Add tor-browser build scripts + Makefile to tor-browser Bug 41730: Bridge lines in tools/torbrowser/bridges.js out of date - - - - - 1 changed file: - tools/torbrowser/bridges.js Changes: ===================================== tools/torbrowser/bridges.js ===================================== @@ -7,71 +7,56 @@ pref( ); pref( "extensions.torlauncher.default_bridge.obfs4.2", - "obfs4 38.229.1.78:80 C8CBDB2464FC9804A69531437BCF2BE31FDD2EE4 cert=Hmyfd2ev46gGY7NoVxA9ngrPF2zCZtzskRTzoWXbxNkzeVnGFPWmrTtILRyqCTjHR+s9dg iat-mode=1" -); -pref( - "extensions.torlauncher.default_bridge.obfs4.3", - "obfs4 38.229.33.83:80 0BAC39417268B96B9F514E7F63FA6FBA1A788955 cert=VwEFpk9F/UN9JED7XpG1XOjm/O8ZCXK80oPecgWnNDZDv5pdkhq1OpbAH0wNqOT6H6BmRQ iat-mode=1" -); -pref( - "extensions.torlauncher.default_bridge.obfs4.4", "obfs4 37.218.245.14:38224 D9A82D2F9C2F65A18407B1D2B764F130847F8B5D cert=bjRaMrr1BRiAW8IE9U5z27fQaYgOhX1UCmOpg2pFpoMvo6ZgQMzLsaTzzQNTlm7hNcb+Sg iat-mode=0" ); pref( - "extensions.torlauncher.default_bridge.obfs4.5", + "extensions.torlauncher.default_bridge.obfs4.3", "obfs4 85.31.186.98:443 011F2599C0E9B27EE74B353155E244813763C3E5 cert=ayq0XzCwhpdysn5o0EyDUbmSOx3X/oTEbzDMvczHOdBJKlvIdHHLJGkZARtT4dcBFArPPg iat-mode=0" ); pref( - "extensions.torlauncher.default_bridge.obfs4.6", + "extensions.torlauncher.default_bridge.obfs4.4", "obfs4 85.31.186.26:443 91A6354697E6B02A386312F68D82CF86824D3606 cert=PBwr+S8JTVZo6MPdHnkTwXJPILWADLqfMGoVvhZClMq/Urndyd42BwX9YFJHZnBB3H0XCw iat-mode=0" ); pref( - "extensions.torlauncher.default_bridge.obfs4.7", - "obfs4 144.217.20.138:80 FB70B257C162BF1038CA669D568D76F5B7F0BABB cert=vYIV5MgrghGQvZPIi1tJwnzorMgqgmlKaB77Y3Z9Q/v94wZBOAXkW+fdx4aSxLVnKO+xNw iat-mode=0" -); -pref( - "extensions.torlauncher.default_bridge.obfs4.8", + "extensions.torlauncher.default_bridge.obfs4.5", "obfs4 193.11.166.194:27015 2D82C2E354D531A68469ADF7F878FA6060C6BACA cert=4TLQPJrTSaDffMK7Nbao6LC7G9OW/NHkUwIdjLSS3KYf0Nv4/nQiiI8dY2TcsQx01NniOg iat-mode=0" ); pref( - "extensions.torlauncher.default_bridge.obfs4.9", + "extensions.torlauncher.default_bridge.obfs4.6", "obfs4 193.11.166.194:27020 86AC7B8D430DAC4117E9F42C9EAED18133863AAF cert=0LDeJH4JzMDtkJJrFphJCiPqKx7loozKN7VNfuukMGfHO0Z8OGdzHVkhVAOfo1mUdv9cMg iat-mode=0" ); pref( - "extensions.torlauncher.default_bridge.obfs4.10", + "extensions.torlauncher.default_bridge.obfs4.7", "obfs4 193.11.166.194:27025 1AE2C08904527FEA90C4C4F8C1083EA59FBC6FAF cert=ItvYZzW5tn6v3G4UnQa6Qz04Npro6e81AP70YujmK/KXwDFPTs3aHXcHp4n8Vt6w/bv8cA iat-mode=0" ); pref( - "extensions.torlauncher.default_bridge.obfs4.11", + "extensions.torlauncher.default_bridge.obfs4.8", "obfs4 209.148.46.65:443 74FAD13168806246602538555B5521A0383A1875 cert=ssH+9rP8dG2NLDN2XuFw63hIO/9MNNinLmxQDpVa+7kTOa9/m+tGWT1SmSYpQ9uTBGa6Hw iat-mode=0" ); pref( - "extensions.torlauncher.default_bridge.obfs4.12", + "extensions.torlauncher.default_bridge.obfs4.9", "obfs4 146.57.248.225:22 10A6CD36A537FCE513A322361547444B393989F0 cert=K1gDtDAIcUfeLqbstggjIw2rtgIKqdIhUlHp82XRqNSq/mtAjp1BIC9vHKJ2FAEpGssTPw iat-mode=0" ); pref( - "extensions.torlauncher.default_bridge.obfs4.13", + "extensions.torlauncher.default_bridge.obfs4.10", "obfs4 45.145.95.6:27015 C5B7CD6946FF10C5B3E89691A7D3F2C122D2117C cert=TD7PbUO0/0k6xYHMPW3vJxICfkMZNdkRrb63Zhl5j9dW3iRGiCx0A7mPhe5T2EDzQ35+Zw iat-mode=0" ); pref( - "extensions.torlauncher.default_bridge.obfs4.14", - "obfs4 [2a0c:4d80:42:702::1]:27015 C5B7CD6946FF10C5B3E89691A7D3F2C122D2117C cert=TD7PbUO0/0k6xYHMPW3vJxICfkMZNdkRrb63Zhl5j9dW3iRGiCx0A7mPhe5T2EDzQ35+Zw iat-mode=0" -); -pref( - "extensions.torlauncher.default_bridge.obfs4.15", + "extensions.torlauncher.default_bridge.obfs4.11", "obfs4 51.222.13.177:80 5EDAC3B810E12B01F6FD8050D2FD3E277B289A08 cert=2uplIpLQ0q9+0qMFrK5pkaYRDOe460LL9WHBvatgkuRr/SL31wBOEupaMMJ6koRE6Ld0ew iat-mode=0" ); -pref( - "extensions.torlauncher.default_bridge.obfs4.16", - "obfs4 185.100.87.30:443 5B403DFE34F4872EB027059CECAE30B0C864B3A2 cert=bWUdFUe8io9U6JkSLoGAvSAUDcB779/shovCYmYAQb/pW/iEAMZtO/lCd94OokOF909TPA iat-mode=2" -); pref( "extensions.torlauncher.default_bridge.meek-azure.1", - "meek_lite 192.0.2.2:2 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com" + "meek_lite 192.0.2.18:80 BE776A53492E1E044A26F17306E1BC46A55A1625 url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com" ); pref( "extensions.torlauncher.default_bridge.snowflake.1", - "snowflake 192.0.2.3:1 2B280B23E1107BB62ABFC40DDCC8824814F80A72" + "snowflake 192.0.2.3:80 2B280B23E1107BB62ABFC40DDCC8824814F80A72 fingerprint=2B280B23E1107BB62ABFC40DDCC8824814F80A72 url=https://snowflake-broker.torproject.net.global.prod.fastly.net/ front=cdn.sstatic.net ice=stun:stun.l.google.com:19302,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.com:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478 utls-imitate=hellorandomizedalpn" +); + +pref( + "extensions.torlauncher.default_bridge.snowflake.2", + "snowflake 192.0.2.4:80 8838024498816A039FCBBAB14E6F40A0843051FA fingerprint=8838024498816A039FCBBAB14E6F40A0843051FA url=https://snowflake-broker.torproject.net.global.prod.fastly.net/ front=cdn.sstatic.net ice=stun:stun.l.google.com:19302,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.net:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478 utls-imitate=hellorandomizedalpn" ); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/adfc97d… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/adfc97d… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build] Pushed new tag tbb-12.0.5-build2
by Richard Pospesel (＠richard) 14 Apr '23

14 Apr '23

Richard Pospesel pushed new tag tbb-12.0.5-build2 at The Tor Project / Applications / tor-browser-build -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/tree/tbb… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build] Pushed new branch 12.0.5-build2
by Richard Pospesel (＠richard) 14 Apr '23

14 Apr '23

Richard Pospesel pushed new branch 12.0.5-build2 at The Tor Project / Applications / tor-browser-build -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/tree/12.… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][maint-12.0] fixup! Bug 40814: Prepare stable release 12.0.5
by Richard Pospesel (＠richard) 13 Apr '23

13 Apr '23

Richard Pospesel pushed to branch maint-12.0 at The Tor Project / Applications / tor-browser-build Commits: b6a60199 by Richard Pospesel at 2023-04-12T16:06:53+00:00 fixup! Bug 40814: Prepare stable release 12.0.5 - - - - - 4 changed files: - projects/browser/Bundle-Data/Docs/ChangeLog.txt - projects/fenix/config - projects/firefox/config - projects/geckoview/config Changes: ===================================== projects/browser/Bundle-Data/Docs/ChangeLog.txt ===================================== @@ -1,4 +1,4 @@ -Tor Browser 12.0.5 - April 06 2023 +Tor Browser 12.0.5 - April 12 2023 * All Platforms * Updated Translations * Updated NoScript to 11.4.21 @@ -9,6 +9,7 @@ Tor Browser 12.0.5 - April 06 2023 * Bug 41526: "Cancel" button when establishing a connection should be grey [tor-browser] * Android * Updated GeckoView to 102.10esr + * Bug 41724: Backport Android-specific security fixes from Firefox 112 to ESR 102.10-based Tor Browser [tor-browser] * Build System * Windows * Bug 40822: The Tor Browser installer doesn't run with mandatory ASLR on (0xc000007b) [tor-browser-build] ===================================== projects/fenix/config ===================================== @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'fenix-[% c("version") %]-[% c("var/build_id") %].tar.gz' -git_hash: 'tor-browser-[% c("var/fenix_version") %]-[% c("var/torbrowser_branch") %]-2-build3' +git_hash: 'tor-browser-[% c("var/fenix_version") %]-[% c("var/torbrowser_branch") %]-2-build4' git_url: https://gitlab.torproject.org/tpo/applications/fenix.git tag_gpg_id: 1 gpg_keyring: ===================================== projects/firefox/config ===================================== @@ -15,7 +15,7 @@ var: firefox_platform_version: 102.10.0 firefox_version: '[% c("var/firefox_platform_version") %]esr' browser_branch: '12.0-1' - browser_build: 1 + browser_build: 2 branding_directory: 'browser/branding/alpha' copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' nightly_updates_osname: '[% c("var/osname") %]' ===================================== projects/geckoview/config ===================================== @@ -14,7 +14,7 @@ container: var: geckoview_version: 102.10.0esr torbrowser_branch: 12.0-1 - browser_build: 1 + browser_build: 2 copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' deps: - build-essential View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/b… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/b… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.10.0esr-12.5-1] 8 commits: fixup! Bug 40597: Implement TorSettings module
by Richard Pospesel (＠richard) 13 Apr '23

13 Apr '23

Richard Pospesel pushed to branch tor-browser-102.10.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 1222e90d by Henry Wilkes at 2023-04-13T19:07:38+00:00 fixup! Bug 40597: Implement TorSettings module Bug 41608 - Tidy up the TorConnect API for broad error states that the different UI components can share. Rename the `hasBootstrapEverFailed` to `potentiallyBlocked` as a specific failure state. Add the `hasEverFailed` boolean property as a catch-all failure state. Add an `enabled` boolean property, which just maps to whether we own the tor process. - - - - - b652316e by Henry Wilkes at 2023-04-13T19:07:39+00:00 fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser Bug 41608 - Tidy up the TorConnect API for broad error states that the different UI components can share. Just use the HasEverFailed state to determine whether to show "Try Again" or to show breadcrumbs. - - - - - 60d18fa7 by Henry Wilkes at 2023-04-13T19:07:39+00:00 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection Bug 41608 - Tidy up the TorConnect API for broad error states that the different UI components can share. No longer import TorMonitorService, and just use TorConnect instead. + Use TorConnect.enabled to determine whether to show the settings. + Use TorConnect.hasEverFailed state rather than TorMonitorService.bootstrapErrorOccurred to determine whether to show "Try Again". + Use TorConnect.potentiallyBlocked to determine whether to show the location selector. E.g. we don't want to show this if we just failed an internet connection test. - - - - - 9fe1259d by Henry Wilkes at 2023-04-13T19:07:40+00:00 fixup! Bug 40933: Add tor-launcher functionality Bug 41608 - Remove unused TorMonitorService.bootstrapErrorOccurred - - - - - d6c9dd4f by Henry Wilkes at 2023-04-13T19:07:40+00:00 fixup! Bug 40597: Implement TorSettings module Bug 41608 - Remove unused TorMonitorService.bootstrapErrorOccurred - - - - - 2a8e78df by Henry Wilkes at 2023-04-13T19:07:41+00:00 fixup! Bug 40597: Implement TorSettings module Bug 41608 - Add the canBeginBootstrap and canBeginAutoBootstrap properties to determine whether it is possible to enter the corresponding TorConnectState from the current state. Add options to openTorConnect to begin bootstrapping or auto-bootstrapping once opened. - - - - - 203f9488 by Henry Wilkes at 2023-04-13T19:07:41+00:00 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection Bug 41608 - Use TorConnect.canBeginBootstrap and TorConnect.canBeginAutoBootstrap and use bootstrapping options in openAboutTor. Selecting a location in the preferences now also opens "about:torconnect". - - - - - e109bbd2 by Henry Wilkes at 2023-04-13T19:07:42+00:00 fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser Bug 41608 - Remove the FatalError state since it is not defined in TorConnect. - - - - - 5 changed files: - browser/components/torconnect/TorConnectParent.jsm - browser/components/torconnect/content/aboutTorConnect.js - browser/components/torpreferences/content/connectionPane.js - browser/modules/TorConnect.jsm - toolkit/components/tor-launcher/TorMonitorService.jsm Changes: ===================================== browser/components/torconnect/TorConnectParent.jsm ===================================== @@ -38,7 +38,7 @@ class TorConnectParent extends JSWindowActorParent { InternetStatus: TorConnect.internetStatus, DetectedLocation: TorConnect.detectedLocation, ShowViewLog: TorConnect.logHasWarningOrError, - HasBootsrapEverFailed: TorConnect.hasBootstrapEverFailed, + HasEverFailed: TorConnect.hasEverFailed, QuickStartEnabled: TorSettings.quickstart.enabled, UIState: TorConnect.uiState, }; @@ -67,8 +67,7 @@ class TorConnectParent extends JSWindowActorParent { self.state.ErrorMessage = null; self.state.ErrorDetails = null; } - self.state.HasBootsrapEverFailed = - TorConnect.hasBootstrapEverFailed; + self.state.HasEverFailed = TorConnect.hasEverFailed; break; } case TorConnectTopics.BootstrapProgress: { @@ -89,10 +88,6 @@ class TorConnectParent extends JSWindowActorParent { self.state.ShowViewLog = true; break; } - case TorConnectTopics.FatalError: { - // TODO: handle - break; - } case TorSettingsTopics.SettingChanged: { if (aData === TorSettingsData.QuickStartEnabled) { self.state.QuickStartEnabled = obj.value; ===================================== browser/components/torconnect/content/aboutTorConnect.js ===================================== @@ -142,7 +142,6 @@ class AboutTorConnect { uiState = { currentState: UIStates.ConnectToTor, - connectIsTryAgain: false, allowAutomaticLocation: true, selectedLocation: "automatic", bootstrapCause: UIStates.ConnectToTor, @@ -389,12 +388,6 @@ class AboutTorConnect { } update_Error(state) { - if (!this.uiState.connectIsTryAgain) { - // TorConnect.hasBootstrapEverFailed remains false in case of Internet - // offline - this.uiState.connectIsTryAgain = true; - this.saveUIState(); - } if (!state.StateChanged) { return; } @@ -457,7 +450,7 @@ class AboutTorConnect { if (state?.StateChanged) { this.elements.connectButton.focus(); } - if (this.uiState.connectIsTryAgain) { + if (state.HasEverFailed) { this.setBreadcrumbsStatus( BreadcrumbStatus.Active, BreadcrumbStatus.Default, @@ -481,7 +474,7 @@ class AboutTorConnect { switch (this.uiState.bootstrapCause) { case UIStates.ConnectToTor: breadcrumbs[0] = BreadcrumbStatus.Active; - title = this.uiState.connectIsTryAgain + title = state.HasEverFailed ? TorStrings.torConnect.tryAgain : TorStrings.torConnect.torConnecting; description = TorStrings.settings.torPreferencesDescription; @@ -505,7 +498,7 @@ class AboutTorConnect { this.setTitle(title, ""); this.showConfigureConnectionLink(description); this.setProgress("", showProgressbar, state.BootstrapProgress); - if (state.HasBootsrapEverFailed) { + if (state.HasEverFailed) { this.setBreadcrumbsStatus(...breadcrumbs); } else { this.hideBreadcrumbs(); ===================================== browser/components/torpreferences/content/connectionPane.js ===================================== @@ -18,9 +18,6 @@ const { TorBridgeSource, } = ChromeUtils.import("resource:///modules/TorSettings.jsm"); -const { TorMonitorService } = ChromeUtils.import( - "resource://gre/modules/TorMonitorService.jsm" -); const { TorProtocolService } = ChromeUtils.import( "resource://gre/modules/TorProtocolService.jsm" ); @@ -197,17 +194,13 @@ const gConnectionPane = (function() { ); // wire up connect button messageBoxButton.addEventListener("click", () => { - TorConnect.beginBootstrap(); - TorConnect.openTorConnect(); + TorConnect.openTorConnect({ beginBootstrap: true }); }); this._populateMessagebox = () => { - if ( - TorConnect.shouldShowTorConnect && - TorConnect.state === TorConnectState.Configuring - ) { + if (TorConnect.canBeginBootstrap) { // set messagebox style and text - if (TorMonitorService.bootstrapErrorOccurred) { + if (TorConnect.hasEverFailed) { messageBox.parentNode.style.display = null; messageBox.className = "error"; messageBoxMessage.innerText = TorStrings.torConnect.tryAgainMessage; @@ -291,10 +284,11 @@ const gConnectionPane = (function() { TorStrings.settings.statusInternetOffline; break; } + // FIXME: What about the TorConnectState.Disabled state? if (TorConnect.state === TorConnectState.Bootstrapped) { torIcon.className = "connected"; torStatus.textContent = TorStrings.settings.statusTorConnected; - } else if (TorConnect.hasBootstrapEverFailed) { + } else if (TorConnect.potentiallyBlocked) { torIcon.className = "blocked"; torStatus.textContent = TorStrings.settings.statusTorBlocked; } else { @@ -358,7 +352,9 @@ const gConnectionPane = (function() { TorStrings.settings.bridgeChooseForMe ); chooseForMe.addEventListener("command", e => { - TorConnect.beginAutoBootstrap(location.value); + TorConnect.openTorConnect({ + beginAutoBootstrap: location.value, + }); }); this._populateLocations = () => { const currentValue = location.value; @@ -404,8 +400,8 @@ const gConnectionPane = (function() { }; this._showAutoconfiguration = () => { if ( - !TorConnect.shouldShowTorConnect || - !TorMonitorService.bootstrapErrorOccurred + !TorConnect.canBeginAutoBootstrap || + !TorConnect.potentiallyBlocked ) { locationGroup.setAttribute("hidden", "true"); return; @@ -969,7 +965,7 @@ const gConnectionPane = (function() { // whether the page should be present in about:preferences get enabled() { - return TorMonitorService.ownsTorDaemon; + return TorConnect.enabled; }, // ===================================== browser/modules/TorConnect.jsm ===================================== @@ -366,6 +366,7 @@ const TorConnect = (() => { _errorMessage: null, _errorDetails: null, _logHasWarningOrError: false, + _hasEverFailed: false, _hasBootstrapEverFailed: false, _transitionPromise: null, @@ -458,7 +459,6 @@ const TorConnect = (() => { "Error: Censorship simulation", true ); - TorMonitorService.setBootstrapError(); return; } @@ -581,7 +581,6 @@ const TorConnect = (() => { ); return; } - TorMonitorService.setBootstrapError(); } } @@ -793,6 +792,9 @@ const TorConnect = (() => { }, _changeState(newState, ...args) { + if (newState === TorConnectState.Error) { + this._hasEverFailed = true; + } const prevState = this._state; // ensure this is a valid state transition @@ -836,7 +838,7 @@ const TorConnect = (() => { console.log("TorConnect: init()"); this._callback(TorConnectState.Initial).begin(); - if (!TorMonitorService.ownsTorDaemon) { + if (!this.enabled) { // Disabled this._changeState(TorConnectState.Disabled); } else { @@ -881,15 +883,50 @@ const TorConnect = (() => { Various getters */ + /** + * Whether TorConnect is enabled. + * + * @type {boolean} + */ + get enabled() { + return TorMonitorService.ownsTorDaemon; + }, + get shouldShowTorConnect() { // TorBrowser must control the daemon return ( - TorMonitorService.ownsTorDaemon && + this.enabled && // if we have succesfully bootstraped, then no need to show TorConnect this.state !== TorConnectState.Bootstrapped ); }, + /** + * Whether bootstrapping can currently begin. + * + * The value may change with TorConnectTopics.StateChanged. + * + * @param {boolean} + */ + get canBeginBootstrap() { + return TorConnectStateTransitions.get(this.state).includes( + TorConnectState.Bootstrapping + ); + }, + + /** + * Whether auto-bootstrapping can currently begin. + * + * The value may change with TorConnectTopics.StateChanged. + * + * @param {boolean} + */ + get canBeginAutoBootstrap() { + return TorConnectStateTransitions.get(this.state).includes( + TorConnectState.AutoBootstrapping + ); + }, + get shouldQuickStart() { // quickstart must be enabled return ( @@ -939,7 +976,24 @@ const TorConnect = (() => { return this._logHasWarningOrError; }, - get hasBootstrapEverFailed() { + /** + * Whether we have ever entered the Error state. + * + * @type {boolean} + */ + get hasEverFailed() { + return this._hasEverFailed; + }, + + /** + * Whether the Bootstrapping process has ever failed, not including when it + * failed due to not being connected to the internet. + * + * This does not include a failure in AutoBootstrapping. + * + * @type {boolean} + */ + get potentiallyBlocked() { return this._hasBootstrapEverFailed; }, @@ -982,11 +1036,40 @@ const TorConnect = (() => { win.switchToTabHavingURI("about:preferences#connection", true); }, - openTorConnect() { + /** + * Open the "about:torconnect" tab. + * + * Bootstrapping or AutoBootstrapping can also be automatically triggered at + * the same time, if the current state allows for it. + * + * Bootstrapping will not be triggered if the connection is + * potentially blocked. + * + * @param {object} [options] - extra options. + * @property {boolean} [options.beginBootstrap=false] - Whether to try and + * begin Bootstrapping. + * @property {string} [options.beginAutoBootstrap] - The location to use to + * begin AutoBootstrapping, if possible. + */ + openTorConnect(options) { const win = BrowserWindowTracker.getTopWindow(); win.switchToTabHavingURI("about:torconnect", true, { ignoreQueryString: true, }); + if ( + options?.beginBootstrap && + this.canBeginBootstrap && + !this.potentiallyBlocked + ) { + this.beginBootstrap(); + } + // options.beginAutoBootstrap can be an empty string. + if ( + options?.beginAutoBootstrap !== undefined && + this.canBeginAutoBootstrap + ) { + this.beginAutoBootstrap(options.beginAutoBootstrap); + } }, viewTorLogs() { ===================================== toolkit/components/tor-launcher/TorMonitorService.jsm ===================================== @@ -74,7 +74,6 @@ const TorMonitorService = { _startTimeout: null, _isBootstrapDone: false, - _bootstrapErrorOccurred: false, _lastWarningPhase: null, _lastWarningReason: null, @@ -162,21 +161,11 @@ const TorMonitorService = { return this._isBootstrapDone; }, - get bootstrapErrorOccurred() { - return this._bootstrapErrorOccurred; - }, - clearBootstrapError() { - this._bootstrapErrorOccurred = false; this._lastWarningPhase = null; this._lastWarningReason = null; }, - // This should be used for debug only - setBootstrapError() { - this._bootstrapErrorOccurred = true; - }, - get isRunning() { return !!this._connection; }, @@ -211,7 +200,6 @@ const TorMonitorService = { } } catch (e) { // TorProcess already logs the error. - this._bootstrapErrorOccurred = true; this._lastWarningPhase = "startup"; this._lastWarningReason = e.toString(); } @@ -248,7 +236,6 @@ const TorMonitorService = { ControlConnTimings.timeoutMS ) { let s = TorLauncherUtil.getLocalizedString("tor_controlconn_failed"); - this._bootstrapErrorOccurred = true; this._lastWarningPhase = "startup"; this._lastWarningReason = s; logger.info(s); @@ -435,7 +422,6 @@ const TorMonitorService = { if (statusObj.PROGRESS === 100) { this._isBootstrapDone = true; - this._bootstrapErrorOccurred = false; try { Services.prefs.setBoolPref(Preferences.PromptAtStartup, false); } catch (e) { @@ -456,7 +442,6 @@ const TorMonitorService = { }, _notifyBootstrapError(statusObj) { - this._bootstrapErrorOccurred = true; try { Services.prefs.setBoolPref(Preferences.PromptAtStartup, true); } catch (e) { View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/9d585b… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/9d585b… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-102.10.0esr-12.5-1] fixup! Bug 41695: Warn on window maximization without letterboxing in RFPHelper module
by Richard Pospesel (＠richard) 13 Apr '23

13 Apr '23

Richard Pospesel pushed to branch base-browser-102.10.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 22054938 by hackademix at 2023-04-13T18:58:47+00:00 fixup! Bug 41695: Warn on window maximization without letterboxing in RFPHelper module - - - - - 2 changed files: - browser/app/profile/001-base-profile.js - toolkit/components/resistfingerprinting/RFPHelper.jsm Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -286,6 +286,8 @@ pref("security.remote_settings.intermediates.enabled", false); pref("dom.use_components_shim", false); // Enable letterboxing pref("privacy.resistFingerprinting.letterboxing", true); +// tor-browser#41695: how many warnings we show if user closes them without restoring the window size +pref("privacy.resistFingerprinting.resizeWarnings", 3); // Enforce Network Information API as disabled pref("dom.netinfo.enabled", false); pref("network.http.referer.defaultPolicy", 2); // Bug 32948: Make referer behavior consistent regardless of private browing mode status ===================================== toolkit/components/resistfingerprinting/RFPHelper.jsm ===================================== @@ -54,7 +54,7 @@ async function windowResizeHandler(aEvent) { if (RFPHelper.letterboxingEnabled) { return; } - if (Services.prefs.getIntPref(kPrefResizeWarnings, 3) <= 0) { + if (Services.prefs.getIntPref(kPrefResizeWarnings) <= 0) { return; } View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/2205493… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/2205493… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.10.0esr-12.5-1] fixup! Bug 41695: Warn on window maximization without letterboxing in RFPHelper module
by Richard Pospesel (＠richard) 13 Apr '23

13 Apr '23

Richard Pospesel pushed to branch tor-browser-102.10.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 9d585beb by hackademix at 2023-04-13T18:55:46+00:00 fixup! Bug 41695: Warn on window maximization without letterboxing in RFPHelper module - - - - - 2 changed files: - browser/app/profile/001-base-profile.js - toolkit/components/resistfingerprinting/RFPHelper.jsm Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -286,6 +286,8 @@ pref("security.remote_settings.intermediates.enabled", false); pref("dom.use_components_shim", false); // Enable letterboxing pref("privacy.resistFingerprinting.letterboxing", true); +// tor-browser#41695: how many warnings we show if user closes them without restoring the window size +pref("privacy.resistFingerprinting.resizeWarnings", 3); // Enforce Network Information API as disabled pref("dom.netinfo.enabled", false); pref("network.http.referer.defaultPolicy", 2); // Bug 32948: Make referer behavior consistent regardless of private browing mode status ===================================== toolkit/components/resistfingerprinting/RFPHelper.jsm ===================================== @@ -54,7 +54,7 @@ async function windowResizeHandler(aEvent) { if (RFPHelper.letterboxingEnabled) { return; } - if (Services.prefs.getIntPref(kPrefResizeWarnings, 3) <= 0) { + if (Services.prefs.getIntPref(kPrefResizeWarnings) <= 0) { return; } View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/9d585be… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/9d585be… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[torspec] branch main updated: Update Prop#329 for conflux merge request.
by gitolite role 13 Apr '23

13 Apr '23

This is an automated email from the git hooks/post-receive script. ahf pushed a commit to branch main in repository torspec. The following commit(s) were added to refs/heads/main by this push: new 8115fc7 Update Prop#329 for conflux merge request. new 142dda7 Merge remote-tracking branch 'mikeperry/conflux_mr' 8115fc7 is described below commit 8115fc7d1209c8de3cacd0d60bc92abb75a513d8 Author: Mike Perry <mikeperry-git(a)torproject.org> AuthorDate: Sat Apr 1 15:55:47 2023 +0000 Update Prop#329 for conflux merge request. --- proposals/329-traffic-splitting.txt | 680 ++++++++++++++++++++++-------------- 1 file changed, 414 insertions(+), 266 deletions(-) diff --git a/proposals/329-traffic-splitting.txt b/proposals/329-traffic-splitting.txt index b9f5dce..44f2e4e 100644 --- a/proposals/329-traffic-splitting.txt +++ b/proposals/329-traffic-splitting.txt @@ -2,14 +2,16 @@ Filename: 329-traffic-splitting.txt Title: Overcoming Tor's Bottlenecks with Traffic Splitting Author: David Goulet, Mike Perry Created: 2020-11-25 -Status: Draft +Status: Needs Revision 0. Status This proposal describes the Conflux [CONFLUX] system developed by Mashael AlSabah, Kevin Bauer, Tariq Elahi, and Ian Goldberg. It aims at improving Tor client network performance by dynamically splitting - traffic between two circuits. + traffic between two circuits. We have made several additional improvements + to the original Conflux design, by making use of congestion control + information, as well as updates from Multipath TCP literature. 1. Overview @@ -36,13 +38,17 @@ Status: Draft Tor relay queues, and not with any other bottlenecks (such as intermediate Internet routers), we can avoid this complexity merely by specifying that any paths that are constructed SHOULD NOT share any - relays. In this way, we can proceed to use the exact same congestion - control as specified in Proposal 324, for each path. - - For this reason, this proposal will focus on the traffic scheduling - algorithms, rather than coupling. We propose three candidate algorithms - that have been studied in the literature, and will compare their - performance using simulation and consensus parameters. + relays (except for the exit). This assumption is valid, because non-relay bottlenecks are managed + by TCP of client-to-relay and relay-to-relay OR connections, and not + Tor's circuit-level congestion control. In this way, we can proceed to + use the exact same congestion control as specified in [PROP324], + for each path. + + For this reason, this proposal will focus on protocol specification, and + the traffic scheduling algorithms, rather than coupling. Note that the + scheduling algorithms are currently in flux, and will be subject to + change as we tune them in Shadow, on the live network, and for future + UDP implementation (see [PROP339]). 1.2. Divergence from the initial Conflux design @@ -62,13 +68,12 @@ Status: Draft side channel, and traffic analysis risks and benefits in [RESUMPTION], [SIDE_CHANNELS] and [TRAFFIC_ANALYSIS]. - -2. Design +1.3. Design Overview The following section describes the Conflux design. Each sub-section is a building block to the multipath design that Conflux proposes. - The circuit construction is as follow: + The circuit construction is as follows: Primary Circuit (lower RTT) +-------+ +--------+ @@ -91,12 +96,21 @@ Status: Draft performance. Then, the OP needs to link the two circuits together, as described in - [LINKING_CIRCUITS], [LINKING_EXIT], and [LINKING_SERVICE]. + [CONFLUX_HANDSHAKE]. + + For ease of explanation, the primary circuit is the circuit that is + more desirable to use, as per the scheduling algorithm, and the secondary + circuit is used after the primary is blocked by congestion control. Note + that for some algorithms, this selection becomes fuzzy, but all of them + favor the circuit with lower RTT, at the beginning of transmission. - For ease of explanation, the primary circuit is the circuit with lower - RTT, and the secondary circuit is the circuit with higher RTT. Initial - RTT is measured during circuit linking, as described in - [LINKING_CIRCUITS]. RTT is continually measured using SENDME timing, as + Note also that this notion of primary vs secondary is a local property + of the current sender: each endpoint may have different notions of + primary, secondary, and current sending circuit. They also may use + different scheduling algorithms to determine this. + + Initial RTT is measured during circuit linking, as described in + [CONFLUX_HANDSHAKE]. RTT is continually measured using SENDME timing, as in Proposal 324. This means that during use, the primary circuit and secondary circuit may switch roles, depending on unrelated network congestion caused by other Tor clients. @@ -107,14 +121,14 @@ Status: Draft constraints apply to each half of the circuits (no shared relays between the legs). If, by chance, the service and the client sides end up sharing some relays, this is not catastrophic. Multipath TCP researchers - we have consulted (see [ACKNOWLEDGEMENTS]), believe Tor's congestion + we have consulted (see [ACKNOWLEDGMENTS]), believe Tor's congestion control from Proposal 324 to be sufficient in this rare case. - Only two circuits SHOULD be linked together. However, implementations - SHOULD make it easy for researchers to *test* more than two paths, as - this has been shown to assist in traffic analysis resistance[WTF_SPLIT]. - At minimum, this means not hardcoding only two circuits in the - implementation. + In the algorithms we recommend here, only two circuits will be linked together at a time. + However, implementations + SHOULD support more than two paths, as this has been shown to assist in + traffic analysis resistance[WTF_SPLIT], and will also be useful for + maintaining a desired target RTT, for UDP VoIP applications. If the number of circuits exceeds the current number of guard relays, guard relays MAY be re-used, but implementations SHOULD use the same @@ -123,6 +137,9 @@ Status: Draft Linked circuits MUST NOT be extended further once linked (ie: 'cannibalization' is not supported). + +2. Protocol Mechanics + 2.1. Advertising support for conflux 2.1.1 Relay @@ -130,26 +147,28 @@ Status: Draft We propose a new protocol version in order to advertise support for circuit linking on the relay side: - "Relay=5" -- Relay supports Conflux as in linking circuits together using - the new LINK, LINKED and SWITCH relay command. + "Conflux=1" -- Relay supports Conflux as in linking circuits together using + the new LINK, LINKED and SWITCH relay command. 2.1.2 Onion Service We propose to add a new line in order to advertise conflux support in the - onion service descriptor: + encrypted section of the onion service descriptor: - "conflux" SP max-num-circ NL + "conflux" SP max-num-circ SP desired-ux NL The "max-num-circ" value indicate the maximum number of rendezvous circuits that are allowed to be linked together. - XXX: We should let the service specify the conflux algorithm to use. - Some services may prefer latency (LowRTT), where as some may prefer - throughput (BLEST). + We let the service specify the conflux algorithm to use. Some services may + prefer latency, where as some may prefer throughput. However, clients will + also have to be able to override this request, because the high-throughput + algorithms will require more out-of-order queue memory, which may be + infeasible on mobile. The next section describes how the circuits are linked together. -2.2. Linking circuits [LINKING_CIRCUITS] +2.2. Conflux Handshake [CONFLUX_HANDSHAKE] To link circuits, we propose new relay commands that are sent on both circuits, as well as a response to confirm the join, and an ack of this @@ -161,8 +180,9 @@ Status: Draft linked. When packed cells are a reality (proposal 340), these cells SHOULD be - combined with the initial RELAY_BEGIN cell on the faster circuit leg. See - [LINKING_EXIT] and [LINKING_SERVICE] for more details on setup in each case. + combined with the initial RELAY_BEGIN cell on the faster circuit leg. + This combination also allows better enforcement against side channels. + (See [SIDE_CHANNELS]). There are other ways to do this linking that we have considered, but they seem not to be significantly better than this method, especially since we can @@ -183,7 +203,8 @@ Status: Draft Sent from the exit/service to the OP, to confirm the circuits were linked. - These cells have the following contents: + The contents of these two cells is exactly the same. They have the following + contents: VERSION [1 byte] PAYLOAD [variable, up to end of relay payload] @@ -197,18 +218,7 @@ Status: Draft NONCE [32 bytes] LAST_SEQNO_SENT [8 bytes] LAST_SEQNO_RECV [8 bytes] - ALGORITHM [1 byte] - - XXX: Should we let endpoints specify their preferred [SCHEDULING] alg - here, to override consensus params? This has benefits: eg low-memory - mobile clients can ask for an alg that is better for their reorder - queues. But it also has complexity risk, if the other endpoint does not - want to support it, because of its own memory issues. - - YES. At least for Exit circuits, we *will* want to let clients - request LowRTT or BLEST/CWND scheduling. So we need an algorithm - field here. - - XXX: We need to define rules for negotiation then, for onions and - exits vs consensus. + DESIRED_UX [1 byte] The NONCE contains a random 256-bit secret, used to associate the two circuits together. The nonce MUST NOT be shared outside of the circuit @@ -216,7 +226,28 @@ Status: Draft MUST NOT be logged to disk. The two sequence number fields are 0 upon initial link, but non-zero in - the case of a resumption attempt (See [RESUMPTION]). + the case of a reattach or resumption attempt (See [CONFLUX_SET_MANAGEMENT] + and [RESUMPTION]). + + The DESIRED_UX field allows the endpoint to request the UX properties + it wants. The other endpoint SHOULD select the best known scheduling + algorithm, for these properties. The endpoints do not need to agree + on which UX style they prefer. + + The UX properties are: + + 0 - NO_OPINION + 1 - MIN_LATENCY + 2 - LOW_MEM_LATENCY + 3 - HIGH_THROUGHPUT + 4 - LOW_MEM_THROUGHPUT + + The algorithm choice is performed by to the *sender* of data, (ie: the + receiver of the PAYLOAD). The receiver of data (sender of the PAYLOAD) + does not need to be aware of the exact algorithm in use, but MAY enforce + expected properties (particularly low queue usage, in the case of requesting + either LOW_MEM_LATENCY or LOW_MEM_THROUGHPUT). The receiver MAY close the + entire conflux set if these properties are violated. If either circuit does not receive a RELAY_CONFLUX_LINKED response, both circuits MUST be closed. @@ -229,40 +260,34 @@ Status: Draft Sent from the OP to the exit/service, to provide initial RTT measurement for the exit/service. - For timeout of the handshake, clients SHOULD use the normal SOCKS/stream - timeout already in use for RELAY_BEGIN. - - These three relay commands are send on *each* leg, to allow each endpoint to + These three relay commands are sent on *each* leg, to allow each endpoint to measure the initial RTT of each leg. - The circuit SHOULD be closed if at least one of these conditions is met: + The client SHOULD abandon and close circuit if the LINKED message takes too long to arrive. + This timeout MUST be no larger than the normal SOCKS/stream timeout in use + for RELAY_BEGIN, but MAY be the Circuit Build Timeout value, instead. + (The C-Tor implementation currently uses Circuit Build Timeout). - - Once a LINK is received, if the next cell relay command is not a - LINKED_ACK, unless the command is in a packed cell. - - Once a LINKED_ACK is received, receiving any other command than these: - * BEGIN, DATA, END, CONNECTED, RESOLVE, RESOLVED, XON, XOFF, SWITCH - - Receiving a LINKED without a LINK. - - Receiving a LINKED_ACK without having sent a LINKED. - - XXX Must define our LINK rate limiting parameters. + See [SIDE_CHANNELS] for rules for when to reject unexpected handshake cells. 2.2. Linking Circuits from OP to Exit [LINKING_EXIT] - To link exit circuits, two circuits to the same exit are built. The - client records the circuit build time of each. - - If the circuits are being built on-demand, for immediate use, the circuit - with the lower build time SHOULD use Proposal 340 to append its first RELAY - cell to the RELAY_CONFLUX_LINK, on the circuit with the lower circuit build - time. The exit MUST respond on this same leg. After that, actual RTT - measurements MUST be used to determine future transmissions, as specified in - [SCHEDULING]. + To link exit circuits, two circuits to the same exit are built. When + each circuit is opened, we ensure that congestion control has been + negotiated. If congestion control negotiation has failed, the circuit + MUST be closed. After this, the linking handshake begins. The RTT times between RELAY_CONFLUX_LINK and RELAY_CONFLUX_LINKED are - measured by the client, to determine each circuit RTT to determine primary vs - secondary circuit use, and for packet scheduling. Similarly, the exit - measures the RTT times between RELAY_CONFLUX_LINKED and - RELAY_CONFLUX_LINKED_ACK, for the same purpose. + measured by the client, to determine primary vs secondary circuit use, + and for packet scheduling. Similarly, the exit measures the RTT times + between RELAY_CONFLUX_LINKED and RELAY_CONFLUX_LINKED_ACK, for the same + purpose. + + Because of the race between initial data and the RELAY_CONFLUX_LINKED_ACK + cell, conditions can arise where an Exit needs to send data before the + slowest circuit delivers this ACK. In these cases, it should prefer the + circuit that has delivered the ACK (which will arrive immediately prior + to any data). 2.3. Linking circuits to an onion service [LINKING_SERVICE] @@ -283,10 +308,84 @@ Status: Draft Once both circuits are linked and RTT is measured, packet scheduling MUST be used, as per [SCHEDULING]. -2.4. Congestion Control Application [CONGESTION_CONTROL] +2.4. Conflux Set Management [CONFLUX_SET_MANAGEMENT] + + When managing legs, it is useful to separate sets that have completed the + link handshake from legs that are still performing the handshake. Linked + sets MAY have additional unlinked legs on the way, but these should not + be used for sending data until the handshake is complete. + + It is also useful to enforce various additional conditions on the handshake, + depending on if [RESUMPTION] is supported, and if a leg has been launched + because of an early failure, or due to a desire for replacement. + +2.4.1. Pre-Building Sets + + In C-Tor, conflux is only used via circuit prebuilding. Pre-built conflux + sets are preferred over other pre-built circuits, but if the pre-built pool + ends up empty, normal pre-built circuits are used. If those run out, regular + non-conflux circuits are built. Conflux sets are never built on-demand, but + this is strictly an implementation decision, to simplify dealing with the + C-Tor codebase. + + The consensus parameter 'cfx_max_prebuilt_set' specifies the number of + sets to pre-build. + + During upgrade, the consensus parameter 'cfx_low_exit_threshold' will be + used, so that if there is a low amount of conflux-supporting exits, only + one conflux set will be built. + +2.4.2. Set construction + + When a set is launched, legs begin the handshake in the unlinked state. + As handshakes complete, finalization is attempted, to create a linked set. + On the client, this finalization happens upon receipt of the LINKED cell. + On the exit/service, this finalization happens upon sending the LINKED_ACK. + + The initiator of this handshake considers the set fully linked once the + RELAY_CONFLUX_LINKED_ACK is sent (roughly upon receipt of the LINKED cell). + Because of the potential race between LINKED_ACK, and initial data sent by + the client, the receiver of the handshake must consider a leg linked at + the time of sending a LINKED cell. + + This means that exit legs may not have an RTT measurement, if data on the + faster leg beats the LINKED_ACK on the slower leg. The implementation MUST + account for this, by treating unmeasured legs as having infinite RTT. + + When attempting to finalize a set, this finalization should not complete + if any unlinked legs are still pending. + +2.4.3. Closing circuits + + For circuits that are unlinked, the origin SHOULD immediately relaunch a new + leg when it is closed, subject to the limits in [SIDE_CHANNELS]. + + In C-Tor, we do not support arbitrary resumption. Therefore, we perform + some additional checks upon closing circuits, to decide if we should + immediately tear down the entire set: + - If the closed leg was the current sending leg, close the set + - If the closed leg had the highest non-zero last_seq_recv/sent, close the set + - If data was in progress on a closed leg (inflight > cc_sendme_inc), then + all legs must be closed + +2.4.4. Reattaching Legs + + While C-Tor does not support arbitrary resumption, new legs *can* be + attached, so long as there is no risk of data loss from a closed leg. + This enables latency probing, which will be important for UDP VoIP. + + Currently, the C-Tor codebase checks for data loss by verifying that + the LINK/LINKED cell has a lower last_seq_sent than all current + legs' maximum last_seq_recv, and a lower last_seq_recv than all + current legs last_seq_sent. + + This check is performed on finalization, not the receipt of the cell. This + gives the data additional time to arrive. - The SENDMEs for congestion control are performed per-leg. As data - arrives, regardless of its ordering, it is counted towards SENDME +2.5. Congestion Control Application [CONGESTION_CONTROL] + + The SENDMEs for congestion control are performed per-leg. As soon as + data arrives, regardless of its ordering, it is counted towards SENDME delivery. In this way, 'cwnd - package_window' of each leg always reflects the available data to send on each leg. This is important for [SCHEDULING]. @@ -294,7 +393,13 @@ Status: Draft The Congestion control Stream XON/XOFF can be sent on either leg, and applies to the stream's transmission on both legs. -2.5. Sequencing [SEQUENCING] + In C-Tor, streams used to become blocked as soon as the OR conn + of their circuit was blocked. Because conflux can send on the other + circuit, which uses a different OR conn, this form of stream blocking + has been decoupled from the OR conn status, and only happens when + congestion control has decided that all circuits are blocked. + +2.6. Sequencing [SEQUENCING] With multiple paths for data, the problem of data re-ordering appears. In other words, cells can arrive out of order from the two circuits @@ -315,8 +420,10 @@ Status: Draft 22 -- RELAY_CONFLUX_SWITCH - Sent from the client to the exit/service when switching leg in an - already linked circuit construction. + Sent from a sending endpoint when switching leg in an + already linked circuit construction. This message is sent on the leg + that will be used for new traffic, and tells the receiver the size of + the gap since the last data (if any) sent on that leg. The cell payload format is: @@ -348,66 +455,39 @@ Status: Draft the leg should be switched in order to reset that relative sequence number to fit within 4 bytes. - In order to rate limit the use of SWITCH to prevent its use as a DropMark - side channel, the circuit SHOULD be closed if at least one of these - conditions is met: - - - The SeqNum value is below the "cc_sendme_inc" which is currently set - at 31. - - If immediately after receiving a SWITCH, another one is received. - - XXX: We should define our rate limiting. - - - If we are NOT an exit circuit. - - If the SeqNum makes our absolute sequence number to overflow. + For a discussion of rules to rate limit the usage of SWITCH as a side + channel, see [SIDE_CHANNELS]. -2.6. Resumption [RESUMPTION] +2.7. Resumption [RESUMPTION] In the event that a circuit leg is destroyed, they MAY be resumed. + Full resumption is not supported in C-Tor, but is possible to implement, + at the expense of always storing roughly a congestion window of + already-transmitted data on each endpoint, in the worst case. Simpler + forms of resumption, where there is no data loss, are supported. This + is important to support latency probing, for ensuring UDP VoIP minimum + RTT requirements are met (roughly 300-500ms, depending on VoIP + implementation). Resumption is achieved by re-using the NONCE to the same endpoint (either [LINKING_EXIT] or [LINKING_SERVICE]). The resumed path need not use the same middle and guard relays as the destroyed leg(s), but SHOULD NOT share any relays with any existing legs(s). - To provide resumption, endpoints store an absolute 64bit cell counter of - the last cell they have sent on a conflux pair (their LAST_SEQNO_SENT), - as well the last sequence number they have delivered in-order to edge - connections corresponding to a conflux pair (their LAST_SEQNO_RECV). - Additionally, endpoints MAY store the entire contents of unacked - inflight cells (ie the 'package_window' from proposal 324), for each - leg, along with information corresponding to those cells' absolute - sequence numbers. - - These 64 bit absolute counters can wrap without issue, as congestion - windows will never grow to 2^64 cells until well past the Singularity. - However, it is possible that extremely long, bulk circuits could exceed - 2^64 total sent or received cells, so endpoints SHOULD handle wrapped - sequence numbers for purposes of computing retransmit information. (But - even this case is unlikely to happen within the next decade or so). - - Upon resumption, the LAST_SEQNO_SENT and LAST_SEQNO_RECV fields are used - to convey the sequence numbers of the last cell the relay sent and - received on that leg. The other endpoint can use these sequence numbers - to determine if it received the in-flight data or not, or sent more data - since that point, up to and including this absolute sequence number. If - LAST_SEQNO_SENT has not been received, the endpoint MAY transmit the - missing data, if it still has it buffered. - - Because both endpoints get information about the other side's absolute - SENT sequence number, they will know exactly how many re-transmitted - packets to expect, if the circuit is successfully resumed. + If data loss has been detected upon a link handshake, resumption can be + achieved by sending a switch cell, which is immediately followed by the + missing data. Roughly, each endpoint must check: + - if cell.last_seq_recv < + min(max(legs.last_seq_sent),max(closed_legs.last_seq_sent)): + - send a switch cell immediately with missing data: + (last_seq_sent - cell.last_seq_recv) - Re-transmitters MUST NOT re-increment their absolute sent fields - while re-transmitting. - - If it does not have this missing data due to memory pressure, that - endpoint MUST destroy *both* legs, as this represents unrecoverable + If an endpoint does not have this missing data due to memory pressure, + that endpoint MUST destroy *both* legs, as this represents unrecoverable data loss. - Otherwise, the new circuit can be re-joined, and its RTT can be compared - to the remaining circuit to determine if the new leg is primary or - secondary. + Re-transmitters MUST NOT re-increment their absolute sent fields + while re-transmitting. It is even possible to resume conflux circuits where both legs have been collapsed using this scheme, if endpoints continue to buffer their @@ -418,13 +498,40 @@ Status: Draft given priority to be freed in any oomkiller invocation. See [MEMORY_DOS] for more oomkiller information. +2.8. Data transmission + + Most cells in Tor are circuit-specific, and should only be sent on a + circuit, even if that circuit is part of a conflux set. Cells that + are not multiplexed do not count towards the conflux sequence numbers. + + However, in addition to the obvious RELAY_COMMAND_DATA, a subset of cells + MUST ALSO be multiplexed, so that their ordering is preserved when they + arrive at the other end. These cells do count towards conflux sequence + numbers, and are handled in the out-of-order queue, to preserve ordered + delivery: + RELAY_COMMAND_BEGIN + RELAY_COMMAND_DATA + RELAY_COMMAND_END + RELAY_COMMAND_CONNECTED + RELAY_COMMAND_RESOLVE + RELAY_COMMAND_RESOLVED + RELAY_COMMAND_XOFF + RELAY_COMMAND_XON + + Currently, this set is the same as the set of cells that have stream ID, + but the property that enforces this is that these cells must be ordered + with respect to all data on the circuit. It is not impossible that future + cells could be invented that don't have stream IDs, but yet must still + arrive in order with respect to circuit data cells. Prop#253 is one + possible example of such a thing (though we won't be implementing that). + 3. Traffic Scheduling [SCHEDULING] In order to load balance the traffic between the two circuits, the original conflux paper used only RTT. However, with Proposal 324, we will have accurate information on the instantaneous available bandwidth - of each circuit leg, as 'cwnd - package_window' (see Section 3 of + of each circuit leg, as 'cwnd - inflight' (see Section 3 of Proposal 324). Some additional RTT optimizations are also useful, to improve @@ -438,6 +545,13 @@ Status: Draft important details on how this selection can be changed, to reduce website traffic fingerprinting. + XXX: These sections are not accurate, and are subject to change + during the alpha process, via Shadow simulation. We need to specify + candidate algorithms for the UX properties. The latency algorithms + will be related to LOWRTT_TOR, and the throughput algorithms related + to BLEST_TOR, but significant changes will arise during evaluation, + and possibly also live deployment iteration. + 3.1. LowRTT Scheduling [LOWRTT_TOR] This scheduling algorithm is based on the original [CONFLUX] paper, with @@ -473,6 +587,10 @@ Status: Draft 3.2. BLEST Scheduling [BLEST_TOR] + XXX: We want an algorithm that only uses cwnd instead. This algorithm + has issues if the primary cwnd grows while the secondary does not. + Expect this section to change. + [BLEST] attempts to predict the availability of the primary circuit, and use this information to reorder transmitted data, to minimize head-of-line blocking in the recipient (and thus minimize out-of-order @@ -528,51 +646,6 @@ Status: Draft blocking occurs. Because it is expensive and takes significant time to signal this over Tor, we omit this. - XXX: We may want a third algorithm that only uses cwnd, for comparison. - The above algorithm may have issues if the primary cwnd grows while the - secondary does not. Expect this section to change. - - XXX: See [REORDER_SIGNALING] section if we want this lambda feedback. - -3.3. Reorder queue signaling [REORDER_SIGNALING] - - Reordering is fairly simple task. By following using the sequence - number field in [SEQUENCING], endpoints can know how many cells are - still in flight on the other leg. - - To reorder them properly, a buffer of out of order cells needs to be - kept. On the Exit side, this can quickly become overwhelming - considering ten of thousands of possible circuits can be held open - leading to gigabytes of memory being used. There is a clear potential - memory DoS vector in this case, covered in more detail in - [MEMORY_DOS]. - - Luckily, [BLEST_TOR] and the form of [LOWRTT_TOR] that only uses the - primary circuit will minimize or eliminate this out-of-order buffer. - - XXX: The remainder of this section may be over-complicating things... We - only need these concepts if we want to use BLEST's lambda feedback. Though - turning this into some kind of receive window that indicates remaining - reorder buffer size may also help with the total_send_window also noted - in BLEST_TOR. - - The default for this queue size is governed by the 'cflx_reorder_client' - and 'cflx_reorder_srv' consensus parameters (see [CONSENSUS_PARAMS]). - 'cflx_reorder_srv' applies to Exits and onion services. Both parameters - can be overridden by Torrc, to larger or smaller than the consensus - parameter. (Low memory clients may want to lower it; SecureDrop onion - services or other high-upload services may want to raise it). - - When the reorder queue hits this size, a RELAY_CONFLUX_XOFF is sent down - the circuit leg that has data waiting in the queue and use of that leg - SHOULD cease, until it drains to half of this value, at which point an - RELAY_CONFLUX_XON is sent. Note that this is different than the stream - XON/XOFF from Proposal 324. - - XXX: [BLEST] actually does not cease use of a path in this case, but - instead uses this signal to adjust the lambda parameter, which biases - traffic away from that leg. - 4. Security Considerations @@ -586,67 +659,122 @@ Status: Draft pressure. This prevents resumption while data is in flight, but will not otherwise harm operation. - For reorder buffers, adversaries can potentially impact this at any - point, but most obviously and most severely from the client position. - - In particular, clients can lie about sequence numbers, sending cells - with sequence numbers such that the next expected sequence number is - never sent. They can do this repeatedly on many circuits, to exhaust - memory at exits. - - One option is to only allow actual traffic splitting in the downstream - direction, towards clients, and always use the primary circuit for - everything in the upstream direction. However, the ability to support - conflux from the client to the exit shows promise against traffic - analysis (see [WTF_SPLIT]). - - The other option is to use [BLEST_TOR] from clients to exits, as it has - predictable interleaved cell scheduling, and minimizes reorder queues at - exits. If the ratios prescribed by that algorithm are not followed - within some bounds, the other endpoint can close both circuits, and free - the queue memory. - - This still leaves the possibility that intermediate relays may block a - leg, allowing cells to traverse only one leg, thus still accumulating at - the reorder queue. Clients can also spoof sequence numbers similarly, to - make it appear that they are following [BLEST_TOR], without actually - sending any data on one of the legs. - - To handle either of these cases, when a relay is under memory pressure, - the circuit OOM killer SHOULD free and close circuits with the oldest - reorder queue data, first. This heuristic was shown to be best during - the [SNIPER] attack OOM killer iteration cycle. - -4.2. Side Channels [SIDE_CHANNELS] - - Two potential side channels may be introduced by the use of Conflux: - 1. RTT leg-use bias by altering SENDME latency + In terms of adversarial issues, clients can lie about sequence numbers, + sending cells with sequence numbers such that the next expected sequence + number is never sent. They can do this repeatedly on many circuits, to + exhaust memory at exits. Intermediate relays may also block a leg, allowing + cells to traverse only one leg, thus still accumulating at the reorder queue. + + In C-Tor we will mitigate this in three ways: via the OOM killer, by the + ability for exits to request that clients use the LOW_MEM_LATENCY UX + behavior, and by rate limiting the frequency of switching under the + LOW_MEM_LATENCY UX style. + + When a relay is under memory pressure, the circuit OOM killer SHOULD free + and close circuits with the oldest reorder queue data, first. This heuristic + was shown to be best during the [SNIPER] attack OOM killer iteration cycle. + + The rate limiting under LOW_MEM_LATENCY will be heuristic driven, based + on data from Shadow simulations, and live network testing. It is possible that + other algorithms may be able to be similarly rate limited. + +4.2. Protocol Side Channels [SIDE_CHANNELS] + + To understand the decisions we make below with respect to handling + potential side channels, it is important to understand a bit of the history + of the Tor threat model. + + Tor's original threat model completely disregarded all traffic analysis, + including protocol side channels, assuming that they were all equally + effective, and that diversity of relays was what provided protection. + Numerous attack papers have proven this to be an over-generalization. + + Protocol side channels are most severe when a circuit is known to be silent, + because stateful protocol behavior prevents other normal cells from ever being + sent. In these cases, it is trivial to inject a packet count pattern that has + zero false positives. These kinds of side channels are made use of in the + Guard discovery literature, such as [ONION_FOUND], and [DROPMARK]. It is even + more trivial to manipulate the AES-CTR cipherstream, as per [RACOON23], until + we implement [PROP308]. + + However, because we do not want to make this problem worse, it is extremely + important to be mindful of ways that an adversary can inject new cell + commands, as well as ways that the adversary can spawn new circuits + arbitrarily. + + It is also important, though slightly less so, to be mindful of the uniqueness + of new handshakes, as handshakes can be used to classify usage (such as via + Onion Service Circuit Fingerprinting). Handshake side channels are only + weakly defended, via padding machines for onion services. These padding + machines will need to be improved, and this is also scheduled for arti. + + Finally, usage-based traffic analysis need to be considered. This includes + things like website traffic fingerprinting, and is covered in + [TRAFFIC_ANALYSIS]. + +4.2.1. Cell Injection Side Channel Mitigations + + To avoid [DROPMARK] attacks, several checks must be performed, depending + on the cell type. The circuit MUST be closed if any of these checks fail. + + RELAY_CONFLUX_LINK: + - Ensure conflux is enabled + - Ensure the circuit is an Exit (or Service Rend) circuit + - Ensure that no previous LINK cell has arrived on this circuit + + RELAY_CONFLUX_LINKED: + - Ensure conflux is enabled + - Ensure the circuit is client-side + - Ensure this is an unlinked circuit that sent a LINK command + - Ensure that the nonce matches the nonce used in the LINK command + - Ensure that the cell came from the expected hop + + RELAY_CONFLUX_LINKED_ACK: + - Ensure conflux is enabled + - Ensure that this circuit is not client-side + - Ensure that the circuit has successfully received its LINK cell + - Ensure that this circuit has not received a LINKED_ACK yet + + RELAY_CONFLUX_SWITCH + - If Prop#340 is in use, this cell MUST be packed with a valid + multiplexed RELAY_COMMAND cell. + - XXX: Additional rate limiting per algorithm, after tuning. + +4.2.2. Guard Discovery Side Channel Mitigations + + In order to mitigate potential guard discovery by malicious exits, + clients MUST NOT retry failed unlinked circuit legs for a set more than + 'cfx_max_unlinked_leg_retry' times. + +4.2.3. Usage-Based Side Channel Discussion + + After we have solved all of the zero false positive protocol side + channels in Tor, our attention can turn to more subtle, usage-based + side channels. + + Two potential usage side channels may be introduced by the use of Conflux: + 1. Delay-based side channels, by manipulating switching 2. Location info leaks through the use of both leg's latencies - For RTT and leg-use bias, Guard relays could delay legs to introduce a - pattern into the delivery of cells at the exit relay, by varying the - latency of SENDME cells (every 100th cell) to change the distribution of - traffic to send information. This attack could be performed in either - direction of traffic, to bias traffic load off of a particular Guard. - If an adversary controls both Guards, it could in theory send a binary - signal more easily, by alternating delays on each. - - However, this risk weighs against the potential benefits against traffic - fingerprinting, as per [WTF_SPLIT]. Additionally, even ignoring - cryptographic tagging attacks, this side channel provides significantly - lower information over time than inter-packet-delay based side channels - that are already available to Guards and routers along the path to the - Guard. - - Tor currently provides no defenses against already existing - single-circuit delay-based side channels, though both circuit padding - and [BACKLIT] are potential options it could conceivably deploy. The - [BACKLIT] paper also has an excellent review of the various methods that - have been studied for such single circuit side channels, and the - [BACKLIT] style RTT monitoring could be used to protect against these - conflux side channels as well. Circuit padding can also help to obscure - which cells are SENDMEs, since circuit padding is not counted towards - SENDME totals. + To perform delay-based side channels, Exits can simply disregard the RTT + or cwnd when deciding to switch legs, thus introducing a pattern of gaps that + the Guard node can detect. Guard relays can also delay legs to introduce a + pattern into the delivery of cells at the exit relay, by varying the latency + of SENDME cells (every 31st cell) to change the distribution of traffic to + send information. This attack could be performed in either direction of + traffic, to bias traffic load off of a particular Guard. If an adversary + controls both Guards, it could in theory send a binary signal, by + alternating delays on each. + + However, Tor currently provides no defenses against already existing + single-circuit delay-based (or stop-and-start) side channels. It is already + the case that on a single circuit, either the Guard or the Exit can simply + withhold sending traffic, as per a recognizable pattern. This class of + attacks, and a possible defense for them, is discussed in [BACKLIT]. + + However, circuit padding can also help to obscure these side channels, + even if tuned for website fingerprinting. See [TRAFFIC_ANALYSIS] for more + details there. The second class of side channel is where the Exit relay may be able to use the two legs to further infer more information about client @@ -658,29 +786,17 @@ Status: Draft or if it proves possible possible to mitigate single-circuit side channels, but not conflux side channels. - In all cases, all of these side channels appear less severe for onion - service traffic, due to the higher path variability due to relay - selection, as well as the end-to-end nature of conflux in that case. - Thus, we separate our ability to enable/disable conflux for onion - services from Exits. - 4.3. Traffic analysis [TRAFFIC_ANALYSIS] Even though conflux shows benefits against traffic analysis in [WTF_SPLIT], these gains may be moot if the adversary is able to perform packet counting and timing analysis at guards to guess which specific - circuits are linked. In particular, the 3 way handshake in + circuits are linked. In particular, the 3 way handshake in [LINKING_CIRCUITS] may be quite noticeable. - As one countermeasure, it may be possible to eliminate the third leg - (RELAY_CIRCUIT_LINKED_ACK) by computing the exit/service RTT via - measuring the time between CREATED/REND_JOINED and RELAY_CIRCUIT_LINK, - but this will introduce cross-component complexity into Tor's protocol - that could quickly become unwieldy and fragile. - Additionally, the conflux handshake may make onion services stand out more, regardless of the number of stages in the handshake. For this - reason, it may be more wise to simply address these issues with circuit + reason, it may be wise to simply address these issues with circuit padding machines during circuit setup (see padding-spec.txt). Additional traffic analysis considerations arise when combining conflux @@ -698,9 +814,10 @@ Status: Draft capability. [RESUMPTION] with buffering of the inflight unacked package_window data, for retransmit, is a partial mitigation, if endpoints buffer this data for retransmission for a brief time even if - both legs close. This seems more feasible for onion services, which are - more vulnerable to this attack. However, if the adversary controls the - client, they will notice the resumption re-link, and still obtain + both legs close. This buffering seems more feasible for onion services, + which are more vulnerable to this attack. However, if the adversary + controls the client and is attacking the service in this way, they + will notice the resumption re-link at their client, and still obtain confirmation that way. It seems the only way to fully mitigate these kinds of attacks is with @@ -713,29 +830,42 @@ Status: Draft provide similar RST injection resistance, and resumption at Guard/Bridge nodes, as well. +5. Consensus Parameters [CONSENSUS] -5. System Interactions + - cfx_enabled + - Values: 0=off, 1=on + - Description: Emergency off switch, in case major issues are discovered. - - congestion control - - EWMA and KIST - - CBT and number of guards - - Onion service circ obfuscation - - Future UDP (may increase need for UDP to buffer before dropping) - - Padding (no sequence numbers on padding cells, as per [SEQUENCING]) - - Also, any padding machines may need re-tuning - - No 'cannibalization' of linked circuits + - cfx_low_exit_threshold + - Range: 0-10000 + - Description: Fraction out of 10000 that represents the fractional rate of + exits that must support protover 5. If the fraction is below this + amount, the number of pre-built sets is restricted to 1. + + - cfx_max_linked_set + - Range: 0-255 + - Description: The total number of linked sets that can be created. 255 + means "unlimited". + - cfx_max_prebuilt_set + - Range: 0-255 + - Description: The maximum number of pre-built conflux sets to make. + This value is overridden by the 'cfx_low_exit_threshold' criteria. -6. Consensus and Torrc Parameters [CONSENSUS] + - cfx_max_unlinked_leg_retry + - Range: 0-255 + - Description: The maximum number of times to retry an unlinked leg that + fails during build or link, to mitigate guard discovery attacks. - - conflux_circs - - Number of conflux circuits + - cfx_num_legs_set + - Range: 0-255 + - Description: The number of legs to link in a set. - - conflux_sched_exits, conflux_sched_clients, conflux_sched_service - - Three forms of LOWRTT_TOR, and BLEST_TOR + - cfx_send_pct + - XXX: Experimental tuning parameter. Subject to change/removal. - - ConfluxOnionService - - ConfluxOnionCircs + - cfx_drain_pct + - XXX: Experimental tuning parameter. Subject to change/removal. 7. Tuning Experiments [EXPERIMENTS] @@ -807,7 +937,7 @@ A.2. Alternative RTT measurement [ALTERNATIVE_RTT] We should not add more. -Appendix B: Acknowledgments [ACKNOWLEDGEMENTS] +Appendix B: Acknowledgments [ACKNOWLEDGMENTS] Thanks to Per Hurtig for helping us with the framing of the MPTCP problem space. @@ -856,3 +986,21 @@ References: [DROPMARK] https://www.petsymposium.org/2018/files/papers/issue2/popets-2018-0011.pdf + +[RACCOON23] + https://archives.seul.org/or/dev/Mar-2012/msg00019.html + +[ONION_FOUND] + https://www.researchgate.net/publication/356421302_From_Onion_Not_Found_to_… + +[VANGUARDS_ADDON] + https://github.com/mikeperry-tor/vanguards/blob/master/README_TECHNICAL.md + +[PROP324] + https://gitlab.torproject.org/tpo/core/torspec/-/blob/main/proposals/324-rt… + +[PROP339] + https://gitlab.torproject.org/tpo/core/torspec/-/blob/main/proposals/339-ud… + +[PROP308] + https://gitlab.torproject.org/tpo/core/torspec/-/blob/main/proposals/308-co… -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor] branch main updated (447775a5e0 -> 2bb8988629)
by gitolite role 13 Apr '23

13 Apr '23

This is an automated email from the git hooks/post-receive script. ahf pushed a change to branch main in repository tor. from 447775a5e0 Merge branch 'maint-0.4.7' new a9fc6c937c protover: Support Relay=5 for Conflux (prop329) new 45432175fe trunnel: Add Conflux related cell definition new 8b185b2ac3 Prop#329 Cells: Building and parsing parsing conflux commands new 0d14d6b44a Prop#329 Tests: Add tests for conflux cells. new eac2bad86b Prop#329 params: Consensus parameter and torrc handling new a1794ef687 Prop#329 Headers: Header files for conflux new 2bd1eca78c Prop#329 Algs: Conflux multiplexed cell receive handling new e0881a669a Prop#329 Algs: Conflux multiplexed cell sending decision algs new b999051e44 Prop#329 OOM: Handle freeing conflux queues on OOM new cf715a56f1 Prop#329 sendme: Adjust sendme sending and tracking for conflux new a4ee0c29ee Prop#329: Add purposes for conflux circuits new 21c861bfa3 Refactor stream blocking due to channel cell queues new 2f865b4bba Prop#329 streams: Handle stream usage with conflux new 336a24754d Prop#329 Pool: Handle linking, unlinking, and relaunching conflux circuit legs. new 46e473f43e Prop#329 Pool: Avoid sharing Guards and Middles between circuits. new 39c2927d6f Prop#329 Pool: Handle pre-building and using conflux sets. new 8d4781e730 Prop#329 Tests: Add tests for the conflux pool new 731a50c8c4 Prop#329: Add conflux to build new 7c70f713c3 Avoid closing dirty circs with active half-edges new 2bb8988629 Fix cases where edge connections can stall. The 20 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: doc/man/tor.1.txt | 6 + src/app/config/config.c | 1 + src/app/config/or_options_st.h | 4 + src/app/main/shutdown.c | 2 + src/app/main/subsystem_list.c | 2 + src/core/mainloop/connection.c | 27 +- src/core/mainloop/connection.h | 1 + src/core/mainloop/mainloop.c | 12 +- src/core/mainloop/mainloop.h | 2 +- src/core/or/circuit_st.h | 29 +- src/core/or/circuitbuild.c | 80 +- src/core/or/circuitbuild.h | 9 +- src/core/or/circuitlist.c | 35 + src/core/or/circuitlist.h | 9 +- src/core/or/circuitpadding.c | 7 +- src/core/or/circuituse.c | 75 +- src/core/or/circuituse.h | 7 + src/core/or/conflux.c | 1008 ++++++++++++++++ src/core/or/conflux.h | 84 ++ src/core/or/conflux_cell.c | 355 ++++++ src/core/or/conflux_cell.h | 50 + src/core/or/conflux_params.c | 281 +++++ src/core/or/conflux_params.h | 29 + src/core/or/conflux_pool.c | 1999 +++++++++++++++++++++++++++++++ src/core/or/conflux_pool.h | 46 + src/core/or/conflux_st.h | 157 +++ src/core/or/conflux_sys.c | 37 + src/core/or/conflux_sys.h | 23 + src/core/or/conflux_util.c | 393 ++++++ src/core/or/conflux_util.h | 59 + src/core/or/congestion_control_common.c | 14 +- src/core/or/congestion_control_common.h | 2 +- src/core/or/congestion_control_flow.c | 47 +- src/core/or/congestion_control_flow.h | 2 - src/core/or/connection_edge.c | 35 +- src/core/or/connection_edge.h | 1 + src/core/or/cpath_build_state_st.h | 2 + src/core/or/edge_connection_st.h | 13 +- src/core/or/include.am | 13 + src/core/or/or.h | 12 + src/core/or/or_circuit_st.h | 12 +- src/core/or/origin_circuit_st.h | 11 +- src/core/or/protover.c | 4 + src/core/or/protover.h | 3 + src/core/or/relay.c | 383 ++++-- src/core/or/versions.c | 7 + src/feature/client/circpathbias.c | 13 +- src/feature/client/entrynodes.c | 42 +- src/feature/client/entrynodes.h | 14 +- src/feature/nodelist/networkstatus.c | 2 + src/feature/nodelist/node_select.h | 2 + src/feature/nodelist/nodelist.c | 11 +- src/feature/nodelist/nodelist.h | 1 + src/feature/nodelist/routerlist.c | 5 + src/feature/relay/dns.c | 4 + src/test/fakecircs.c | 10 +- src/test/include.am | 2 + src/test/test.c | 2 + src/test/test.h | 2 + src/test/test_conflux_cell.c | 60 + src/test/test_conflux_pool.c | 1338 +++++++++++++++++++++ src/trunnel/conflux.c | 1158 ++++++++++++++++++ src/trunnel/conflux.h | 422 +++++++ src/trunnel/conflux.trunnel | 66 + src/trunnel/include.am | 9 +- 65 files changed, 8327 insertions(+), 226 deletions(-) create mode 100644 src/core/or/conflux.c create mode 100644 src/core/or/conflux.h create mode 100644 src/core/or/conflux_cell.c create mode 100644 src/core/or/conflux_cell.h create mode 100644 src/core/or/conflux_params.c create mode 100644 src/core/or/conflux_params.h create mode 100644 src/core/or/conflux_pool.c create mode 100644 src/core/or/conflux_pool.h create mode 100644 src/core/or/conflux_st.h create mode 100644 src/core/or/conflux_sys.c create mode 100644 src/core/or/conflux_sys.h create mode 100644 src/core/or/conflux_util.c create mode 100644 src/core/or/conflux_util.h create mode 100644 src/test/test_conflux_cell.c create mode 100644 src/test/test_conflux_pool.c create mode 100644 src/trunnel/conflux.c create mode 100644 src/trunnel/conflux.h create mode 100644 src/trunnel/conflux.trunnel -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 20