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

[tor-browser/tor-browser-68.2.0esr-9.5-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 01 Nov '19

01 Nov '19

commit b9e148eb996515e18ce47cd42f18b6dd967c1cbd Author: Georg Koppen <gk(a)torproject.org> Date: Fri Oct 11 17:51:32 2019 +0000 fixup! TB4: Tor Browser's Firefox preference overrides. --- browser/app/profile/000-tor-browser.js | 36 +--------------------------------- 1 file changed, 1 insertion(+), 35 deletions(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 23a64c0cf2d3..9f2537df5557 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -21,7 +21,6 @@ pref("startup.homepage_override_url", "https://blog.torproject.org/category/tags pref("app.update.promptWaitTime", 3600); pref("app.update.badge", true); pref("app.update.notifyDuringDownload", true); -pref("extensions.hotfix.id", ""); // Bug 16837: Disable hotfix updates as they may cause compat issues #ifndef XP_MACOSX // Disable staged updates on platforms other than macOS. @@ -50,7 +49,6 @@ pref("browser.cache.disk.enable", false); pref("browser.cache.offline.enable", false); pref("permissions.memory_only", true); pref("network.cookie.lifetimePolicy", 2); -pref("browser.download.manager.retention", 1); pref("security.nocertdb", true); // Disk activity: TBB Directory Isolation @@ -71,7 +69,6 @@ pref("browser.send_pings", false); pref("geo.enabled", false); pref("geo.wifi.uri", ""); pref("browser.search.suggest.enabled", false); -pref("browser.safebrowsing.enabled", false); pref("browser.safebrowsing.malware.enabled", false); pref("browser.safebrowsing.phishing.enabled", false); pref("browser.safebrowsing.downloads.enabled", false); @@ -84,15 +81,9 @@ pref("browser.safebrowsing.provider.google4.updateURL", ""); pref("browser.safebrowsing.provider.google4.gethashURL", ""); pref("browser.safebrowsing.provider.mozilla.updateURL", ""); pref("browser.safebrowsing.provider.mozilla.gethashURL", ""); -pref("browser.download.manager.scanWhenDone", false); // prevents AV remote reporting of downloads pref("extensions.ui.lastCategory", "addons://list/extension"); -pref("datareporting.healthreport.service.enabled", false); // Yes, all three of these must be set pref("datareporting.healthreport.uploadEnabled", false); pref("datareporting.policy.dataSubmissionEnabled", false); -// Don't fetch a localized remote page that Tor Browser interacts with, see -// #16727. And, yes, it is "reportUrl" and not "reportURL". -pref("datareporting.healthreport.about.reportUrl", "data:text/plain,"); -pref("datareporting.healthreport.about.reportUrlUnified", "data:text/plain,"); // Make sure Unified Telemetry is really disabled, see: #18738. pref("toolkit.telemetry.unified", false); pref("toolkit.telemetry.enabled", false); @@ -105,19 +96,14 @@ pref("services.sync.engine.prefs", false); // Never sync prefs, addons, or tabs pref("services.sync.engine.addons", false); pref("services.sync.engine.tabs", false); pref("extensions.getAddons.cache.enabled", false); // https://blog.mozilla.org/addons/how-to-opt-out-of-add-on-metadata-updates/ -pref("browser.newtabpage.preload", false); // Bug 16316 - Avoid potential confusion over tiles for now. pref("browser.newtabpage.enabled", false); -pref("browser.search.countryCode", "US"); // The next three prefs disable GeoIP search lookups (#16254) -pref("browser.search.region", "US"); +pref("browser.search.region", "US"); // The next two prefs disable GeoIP search lookups (#16254) pref("browser.search.geoip.url", ""); pref("browser.fixup.alternate.enabled", false); // Bug #16783: Prevent .onion fixups // Make sure there is no Tracking Protection active in Tor Browser, see: #17898. pref("privacy.trackingprotection.pbmode.enabled", false); // Disable the Pocket extension (Bug #18886 and #31602) -pref("browser.pocket.enabled", false); pref("extensions.pocket.enabled", false); -pref("browser.pocket.api", ""); -pref("browser.pocket.site", ""); pref("network.http.referer.hideOnionSource", true); // Disable ServiceWorkers by default @@ -139,7 +125,6 @@ pref("general.useragent.vendor", ""); pref("general.useragent.vendorSub", ""); pref("dom.enable_performance", false); pref("browser.zoom.siteSpecific", false); -pref("intl.charset.default", "windows-1252"); pref("browser.link.open_newwindow.restriction", 0); // Bug 9881: Open popups in new tabs (to avoid fullscreen popups) pref("dom.gamepad.enabled", false); // bugs.torproject.org/13023 // Disable video statistics fingerprinting vector (bug 15757) @@ -149,10 +134,8 @@ pref("media.benchmark.vp9.threshold", 0); // Disable device sensors as possible fingerprinting vector (bug 15758) pref("device.sensors.enabled", false); pref("dom.enable_resource_timing", false); // Bug 13024: To hell with this API -pref("dom.enable_user_timing", false); // Bug 16336: To hell with this API pref("privacy.resistFingerprinting", true); pref("privacy.resistFingerprinting.block_mozAddonManager", true); // Bug 26114 -pref("dom.event.highrestimestamp.enabled", true); // Bug #17046: "Highres" (but truncated) timestamps prevent uptime leaks pref("privacy.suppressModifierKeyEvents", true); // Bug #17009: Suppress ALT and SHIFT events" pref("ui.use_standins_for_native_colors", true); // https://bugzilla.mozilla.org/232227 pref("privacy.use_utc_timezone", true); @@ -221,14 +204,12 @@ pref("browser.eme.ui.enabled", false); pref("media.gmp-widevinecdm.visible", false); pref("media.gmp-widevinecdm.enabled", false); pref("media.eme.enabled", false); -pref("media.eme.apiVisible", false); pref("media.mediadrm-widevinecdm.visible", false); // WebIDE can bypass proxy settings for remote debugging. It also downloads // some additional addons that we have not reviewed. Turn all that off. pref("devtools.webide.autoinstallADBHelper", false); pref("devtools.webide.autoinstallFxdtAdapters", false); pref("devtools.webide.enabled", false); -pref("devtools.appmanager.enabled", false); // The in-browser debugger for debugging chrome code is not coping with our // restrictive DNS look-up policy. We use "127.0.0.1" instead of "localhost" as // a workaround. See bug 16523 for more details. @@ -302,18 +283,6 @@ pref("browser.search.geoSpecificDefaults", false); pref("browser.search.order.extra.1", "DuckDuckGo"); pref("browser.search.order.extra.2", "YouTube"); -// Audio_data is deprecated in future releases, but still present -// in FF24. This is a dangerous combination (spotted by iSec) -pref("media.audio_data.enabled", false); - -// If true, remote JAR files will not be opened, regardless of content type -// Patch written by Jeff Gibat (iSEC). -pref("network.jar.block-remote-files", true); - -// Disable RC4 fallback. This will go live in Firefox 44, Chrome and IE/Edge: -// https://blog.mozilla.org/security/2015/09/11/deprecating-the-rc4-cipher/ -pref("security.tls.unrestricted_rc4_fallback", false); - // Enforce certificate pinning, see: https://bugs.torproject.org/16206 pref("security.cert_pinning.enforcement_level", 2); @@ -326,9 +295,6 @@ pref("security.enterprise_roots.enabled", false); // Don't ping Mozilla for MitM detection, see bug 32321 pref("security.certerrors.mitm.priming.enabled", false); -// Enforce SHA1 deprecation, see: bug 18042. -pref("security.pki.sha1_enforcement_level", 2); - // Disable the language pack signing check for now on macOS, see #31942 #ifdef XP_MACOSX pref("extensions.langpacks.signatures.required", false);

1 0

[tor-browser-build/maint-9.0] Bug 32342 - Store omni.ja after recreating apk
by gk＠torproject.org 01 Nov '19

01 Nov '19

commit f9d0383fb9e7585e8476029913c1a22572fa042e Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri Nov 1 13:38:19 2019 +0000 Bug 32342 - Store omni.ja after recreating apk --- projects/tor-browser/build.android | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/projects/tor-browser/build.android b/projects/tor-browser/build.android index 2c1c3b2..5148c36 100644 --- a/projects/tor-browser/build.android +++ b/projects/tor-browser/build.android @@ -54,5 +54,9 @@ cd tmp zip_args => '$apk', }) %] +# omni.ja was likely deflated in the above zipping operation. It must be stored, instead. +zip $apk -d assets/omni.ja +zip -Z store $apk assets/omni.ja + # Sign a QA build. This apk is not a debug version and doesn't contain a debug flag in the manifest java -jar /usr/share/apksigner/apksigner.jar sign --verbose --min-sdk-version [% c("var/android_min_api") %] --ks $rootdir/android-qa.keystore --out $qa_apk --in $apk --ks-key-alias androidqakey --key-pass pass:android --ks-pass pass:android

1 0

[tor-browser-build/maint-9.0] Release preparations for 9.0.1
by gk＠torproject.org 01 Nov '19

01 Nov '19

commit 3d5f4308312bdece464dba6b55ef0be33f6bb257 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Nov 1 15:21:58 2019 +0000 Release preparations for 9.0.1 Changelog update and versions bump --- projects/firefox/config | 2 +- .../tor-browser/Bundle-Data/Docs/ChangeLog.txt | 22 ++++++++++++++++++++++ projects/tor-launcher/config | 2 +- rbm.conf | 6 +++--- 4 files changed, 27 insertions(+), 5 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index 47d70a1..c3bd1f2 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build1' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build2' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git git_submodule: 1 diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index e2e668f..e19b00e 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,25 @@ +Tor Browser 9.0.1 -- November 4 2019 + * All Platforms + * Update NoScript to 11.0.4 + * Bug 21004: Don't block JavaScript on onion services on medium security + * Bug 27307: NoScript marks HTTP onions as not secure + * Bug 30783: Fundraising banner for EOY 2019 campain + * Bug 32321: Don't ping Mozilla for Man-in-the-Middle-detection + * Bug 27268: Preferences clean-up + * Windows + OS X + Linux + * Update Tor Launcher to 0.2.20.2 + * Bug 32164: Trim each received log line from tor + * Translations update + * Bug 31803: Replaced about:debugging logo with flat version + * Bug 31764: Fix for error when navigating via 'Paste and go' + * Bug 32169: Fix TB9 Wikipedia address bar search + * Bug 32210: Hide the tor pane when using a system tor + * Bug 31658: Use builtin --panel-disabled-color for security level text + * Bug 32188: Fix localization on about:preferences#tor + * Bug 32184: Red dot is shown while downloading an update + * Android + * Bug 32342: Crash when changing the browser locale + Tor Browser 9.0 -- October 22 2019 * All Platforms * Update Firefox to 68.2.0esr diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config index c4010e7..5eef2e2 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.2.20.1 +version: 0.2.20.2 git_url: https://git.torproject.org/tor-launcher.git git_hash: '[% c("version") %]' gpg_keyring: torbutton.gpg diff --git a/rbm.conf b/rbm.conf index 926e3aa..dc43b62 100644 --- a/rbm.conf +++ b/rbm.conf @@ -24,10 +24,10 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '9.0' - torbrowser_build: 'build2' + torbrowser_version: '9.0.1' + torbrowser_build: 'build1' torbrowser_incremental_from: - - 8.5.5 + - 9.0 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[tor-browser/tor-browser-68.2.0esr-9.0-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 01 Nov '19

01 Nov '19

commit 5e83d0a74e4d5ccaef5275e3cc0bfe36e77e9315 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Oct 11 17:51:32 2019 +0000 fixup! TB4: Tor Browser's Firefox preference overrides. --- browser/app/profile/000-tor-browser.js | 36 +--------------------------------- 1 file changed, 1 insertion(+), 35 deletions(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 1a4f6c9bff97..baf5c8e765de 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -21,7 +21,6 @@ pref("startup.homepage_override_url", "https://blog.torproject.org/category/tags pref("app.update.promptWaitTime", 3600); pref("app.update.badge", true); pref("app.update.notifyDuringDownload", true); -pref("extensions.hotfix.id", ""); // Bug 16837: Disable hotfix updates as they may cause compat issues #ifndef XP_MACOSX // Disable staged updates on platforms other than macOS. @@ -50,7 +49,6 @@ pref("browser.cache.disk.enable", false); pref("browser.cache.offline.enable", false); pref("permissions.memory_only", true); pref("network.cookie.lifetimePolicy", 2); -pref("browser.download.manager.retention", 1); pref("security.nocertdb", true); // Disk activity: TBB Directory Isolation @@ -71,7 +69,6 @@ pref("browser.send_pings", false); pref("geo.enabled", false); pref("geo.wifi.uri", ""); pref("browser.search.suggest.enabled", false); -pref("browser.safebrowsing.enabled", false); pref("browser.safebrowsing.malware.enabled", false); pref("browser.safebrowsing.phishing.enabled", false); pref("browser.safebrowsing.downloads.enabled", false); @@ -84,15 +81,9 @@ pref("browser.safebrowsing.provider.google4.updateURL", ""); pref("browser.safebrowsing.provider.google4.gethashURL", ""); pref("browser.safebrowsing.provider.mozilla.updateURL", ""); pref("browser.safebrowsing.provider.mozilla.gethashURL", ""); -pref("browser.download.manager.scanWhenDone", false); // prevents AV remote reporting of downloads pref("extensions.ui.lastCategory", "addons://list/extension"); -pref("datareporting.healthreport.service.enabled", false); // Yes, all three of these must be set pref("datareporting.healthreport.uploadEnabled", false); pref("datareporting.policy.dataSubmissionEnabled", false); -// Don't fetch a localized remote page that Tor Browser interacts with, see -// #16727. And, yes, it is "reportUrl" and not "reportURL". -pref("datareporting.healthreport.about.reportUrl", "data:text/plain,"); -pref("datareporting.healthreport.about.reportUrlUnified", "data:text/plain,"); // Make sure Unified Telemetry is really disabled, see: #18738. pref("toolkit.telemetry.unified", false); pref("toolkit.telemetry.enabled", false); @@ -105,19 +96,14 @@ pref("services.sync.engine.prefs", false); // Never sync prefs, addons, or tabs pref("services.sync.engine.addons", false); pref("services.sync.engine.tabs", false); pref("extensions.getAddons.cache.enabled", false); // https://blog.mozilla.org/addons/how-to-opt-out-of-add-on-metadata-updates/ -pref("browser.newtabpage.preload", false); // Bug 16316 - Avoid potential confusion over tiles for now. pref("browser.newtabpage.enabled", false); -pref("browser.search.countryCode", "US"); // The next three prefs disable GeoIP search lookups (#16254) -pref("browser.search.region", "US"); +pref("browser.search.region", "US"); // The next two prefs disable GeoIP search lookups (#16254) pref("browser.search.geoip.url", ""); pref("browser.fixup.alternate.enabled", false); // Bug #16783: Prevent .onion fixups // Make sure there is no Tracking Protection active in Tor Browser, see: #17898. pref("privacy.trackingprotection.pbmode.enabled", false); // Disable the Pocket extension (Bug #18886 and #31602) -pref("browser.pocket.enabled", false); pref("extensions.pocket.enabled", false); -pref("browser.pocket.api", ""); -pref("browser.pocket.site", ""); pref("network.http.referer.hideOnionSource", true); // Disable ServiceWorkers by default @@ -139,7 +125,6 @@ pref("general.useragent.vendor", ""); pref("general.useragent.vendorSub", ""); pref("dom.enable_performance", false); pref("browser.zoom.siteSpecific", false); -pref("intl.charset.default", "windows-1252"); pref("browser.link.open_newwindow.restriction", 0); // Bug 9881: Open popups in new tabs (to avoid fullscreen popups) pref("dom.gamepad.enabled", false); // bugs.torproject.org/13023 // Disable video statistics fingerprinting vector (bug 15757) @@ -149,10 +134,8 @@ pref("media.benchmark.vp9.threshold", 0); // Disable device sensors as possible fingerprinting vector (bug 15758) pref("device.sensors.enabled", false); pref("dom.enable_resource_timing", false); // Bug 13024: To hell with this API -pref("dom.enable_user_timing", false); // Bug 16336: To hell with this API pref("privacy.resistFingerprinting", true); pref("privacy.resistFingerprinting.block_mozAddonManager", true); // Bug 26114 -pref("dom.event.highrestimestamp.enabled", true); // Bug #17046: "Highres" (but truncated) timestamps prevent uptime leaks pref("privacy.suppressModifierKeyEvents", true); // Bug #17009: Suppress ALT and SHIFT events" pref("ui.use_standins_for_native_colors", true); // https://bugzilla.mozilla.org/232227 pref("privacy.use_utc_timezone", true); @@ -221,14 +204,12 @@ pref("browser.eme.ui.enabled", false); pref("media.gmp-widevinecdm.visible", false); pref("media.gmp-widevinecdm.enabled", false); pref("media.eme.enabled", false); -pref("media.eme.apiVisible", false); pref("media.mediadrm-widevinecdm.visible", false); // WebIDE can bypass proxy settings for remote debugging. It also downloads // some additional addons that we have not reviewed. Turn all that off. pref("devtools.webide.autoinstallADBHelper", false); pref("devtools.webide.autoinstallFxdtAdapters", false); pref("devtools.webide.enabled", false); -pref("devtools.appmanager.enabled", false); // The in-browser debugger for debugging chrome code is not coping with our // restrictive DNS look-up policy. We use "127.0.0.1" instead of "localhost" as // a workaround. See bug 16523 for more details. @@ -304,18 +285,6 @@ pref("browser.search.geoSpecificDefaults", false); pref("browser.search.order.extra.1", "DuckDuckGo"); pref("browser.search.order.extra.2", "YouTube"); -// Audio_data is deprecated in future releases, but still present -// in FF24. This is a dangerous combination (spotted by iSec) -pref("media.audio_data.enabled", false); - -// If true, remote JAR files will not be opened, regardless of content type -// Patch written by Jeff Gibat (iSEC). -pref("network.jar.block-remote-files", true); - -// Disable RC4 fallback. This will go live in Firefox 44, Chrome and IE/Edge: -// https://blog.mozilla.org/security/2015/09/11/deprecating-the-rc4-cipher/ -pref("security.tls.unrestricted_rc4_fallback", false); - // Enforce certificate pinning, see: https://bugs.torproject.org/16206 pref("security.cert_pinning.enforcement_level", 2); @@ -328,9 +297,6 @@ pref("security.enterprise_roots.enabled", false); // Don't ping Mozilla for MitM detection, see bug 32321 pref("security.certerrors.mitm.priming.enabled", false); -// Enforce SHA1 deprecation, see: bug 18042. -pref("security.pki.sha1_enforcement_level", 2); - // Disable the language pack signing check for now on macOS, see #31942 #ifdef XP_MACOSX pref("extensions.langpacks.signatures.required", false);

1 0

[tor-browser/tor-browser-68.2.0esr-9.5-1] squash! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 01 Nov '19

01 Nov '19

commit 15c35b79675acbfb5949aae6d18630ce20050891 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Oct 31 16:16:31 2019 +0000 squash! TB4: Tor Browser's Firefox preference overrides. Bug 32321: Disable Mozilla's MitM pings --- browser/app/profile/000-tor-browser.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 3d0de789205b..23a64c0cf2d3 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -323,6 +323,9 @@ pref("security.family_safety.mode", 0); // Don't allow MitM via enterprise roots, see bug 30681 pref("security.enterprise_roots.enabled", false); +// Don't ping Mozilla for MitM detection, see bug 32321 +pref("security.certerrors.mitm.priming.enabled", false); + // Enforce SHA1 deprecation, see: bug 18042. pref("security.pki.sha1_enforcement_level", 2);

1 0

[tor-browser/tor-browser-68.2.0esr-9.0-1] squash! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 01 Nov '19

01 Nov '19

commit a467e27614c9632cd847a3fd3d1487ae57a87cc2 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Oct 31 16:16:31 2019 +0000 squash! TB4: Tor Browser's Firefox preference overrides. Bug 32321: Disable Mozilla's MitM pings --- browser/app/profile/000-tor-browser.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 1501edf47b90..1a4f6c9bff97 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -325,6 +325,9 @@ pref("security.family_safety.mode", 0); // Don't allow MitM via enterprise roots, see bug 30681 pref("security.enterprise_roots.enabled", false); +// Don't ping Mozilla for MitM detection, see bug 32321 +pref("security.certerrors.mitm.priming.enabled", false); + // Enforce SHA1 deprecation, see: bug 18042. pref("security.pki.sha1_enforcement_level", 2);

1 0

[tor/master] core: Add missing include in destroy_cell_queue_st.h
by nickm＠torproject.org 01 Nov '19

01 Nov '19

commit 4c950226582f4b7d71559b23d7eaf510964859d2 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Oct 22 11:03:11 2019 -0400 core: Add missing include in destroy_cell_queue_st.h Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/core/or/destroy_cell_queue_st.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/core/or/destroy_cell_queue_st.h b/src/core/or/destroy_cell_queue_st.h index fc817c1b4..3c4df050c 100644 --- a/src/core/or/destroy_cell_queue_st.h +++ b/src/core/or/destroy_cell_queue_st.h @@ -12,6 +12,8 @@ #ifndef DESTROY_CELL_QUEUE_ST_H #define DESTROY_CELL_QUEUE_ST_H +#include "core/or/cell_queue_st.h" + /** A single queued destroy cell. */ struct destroy_cell_t { TOR_SIMPLEQ_ENTRY(destroy_cell_t) next;

1 0

[tor/master] test: Add testcase setup object for test_cmux
by nickm＠torproject.org 01 Nov '19

01 Nov '19

commit 839bc4814e8f99a15709994645bfa61f010d6dc0 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Oct 22 10:37:35 2019 -0400 test: Add testcase setup object for test_cmux Also remove a scheduler_init() from a test and MOCK the appropriate function so the test can pass. This is done in order to minimize initialization functions in the unit test and try to only go through the testcase setup object. Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/test/test_circuitmux.c | 49 +++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 46 insertions(+), 3 deletions(-) diff --git a/src/test/test_circuitmux.c b/src/test/test_circuitmux.c index a2b3e62fe..75bb4df5f 100644 --- a/src/test/test_circuitmux.c +++ b/src/test/test_circuitmux.c @@ -17,6 +17,16 @@ #include <math.h> +/** + * MOCKED functions. + */ +static void +scheduler_release_channel_mock(channel_t *chan) +{ + (void) chan; + return; +} + /* XXXX duplicated function from test_circuitlist.c */ static channel_t * new_fake_channel(void) @@ -44,7 +54,7 @@ test_cmux_destroy_cell_queue(void *arg) packed_cell_t *pc = NULL; destroy_cell_t *dc = NULL; - scheduler_init(); + MOCK(scheduler_release_channel, scheduler_release_channel_mock); (void) arg; @@ -82,6 +92,8 @@ test_cmux_destroy_cell_queue(void *arg) channel_free(ch); packed_cell_free(pc); tor_free(dc); + + UNMOCK(scheduler_release_channel); } static void @@ -125,9 +137,40 @@ test_cmux_compute_ticks(void *arg) ; } +static void * +cmux_setup_test(const struct testcase_t *tc) +{ + static int whatever; + + (void) tc; + + cell_ewma_initialize_ticks(); + return &whatever; +} + +static int +cmux_cleanup_test(const struct testcase_t *tc, void *ptr) +{ + (void) tc; + (void) ptr; + + circuitmux_ewma_free_all(); + + return 1; +} + +static struct testcase_setup_t cmux_test_setup = { + .setup_fn = cmux_setup_test, + .cleanup_fn = cmux_cleanup_test, +}; + +#define TEST_CMUX(name) \ + { #name, test_cmux_##name, TT_FORK, &cmux_test_setup, NULL } + struct testcase_t circuitmux_tests[] = { - { "destroy_cell_queue", test_cmux_destroy_cell_queue, TT_FORK, NULL, NULL }, - { "compute_ticks", test_cmux_compute_ticks, TT_FORK, NULL, NULL }, + TEST_CMUX(compute_ticks), + TEST_CMUX(destroy_cell_queue), + END_OF_TESTCASES };

1 0

[tor/master] cmux: Move circuitmux_s object into header in private section
by nickm＠torproject.org 01 Nov '19

01 Nov '19

commit 7678022e85736fc8a78b2a4252bf55db0043f1c5 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Oct 22 11:03:57 2019 -0400 cmux: Move circuitmux_s object into header in private section Step needed in order to access members of the object for unit tests. Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/core/or/circuitmux.c | 56 ++---------------------------------------------- src/core/or/circuitmux.h | 56 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 54 deletions(-) diff --git a/src/core/or/circuitmux.c b/src/core/or/circuitmux.c index b2628bec3..f92a53eb2 100644 --- a/src/core/or/circuitmux.c +++ b/src/core/or/circuitmux.c @@ -69,14 +69,14 @@ * made to attach all existing circuits to the new policy. **/ +#define CIRCUITMUX_PRIVATE + #include "core/or/or.h" #include "core/or/channel.h" #include "core/or/circuitlist.h" #include "core/or/circuitmux.h" #include "core/or/relay.h" -#include "core/or/cell_queue_st.h" -#include "core/or/destroy_cell_queue_st.h" #include "core/or/or_circuit_st.h" /* @@ -84,12 +84,6 @@ */ /* - * Map of muxinfos for circuitmux_t to use; struct is defined below (name - * of struct must match HT_HEAD line). - */ -typedef struct chanid_circid_muxinfo_map chanid_circid_muxinfo_map_t; - -/* * Hash table entry (yeah, calling it chanid_circid_muxinfo_s seems to * break the hash table code). */ @@ -103,49 +97,6 @@ typedef struct chanid_circid_muxinfo_t chanid_circid_muxinfo_t; typedef struct circuit_muxinfo_s circuit_muxinfo_t; /* - * Structures for circuitmux.c - */ - -struct circuitmux_s { - /* Keep count of attached, active circuits */ - unsigned int n_circuits, n_active_circuits; - - /* Total number of queued cells on all circuits */ - unsigned int n_cells; - - /* - * Map from (channel ID, circuit ID) pairs to circuit_muxinfo_t - */ - chanid_circid_muxinfo_map_t *chanid_circid_map; - - /** List of queued destroy cells */ - destroy_cell_queue_t destroy_cell_queue; - /** Boolean: True iff the last cell to circuitmux_get_first_active_circuit - * returned the destroy queue. Used to force alternation between - * destroy/non-destroy cells. - * - * XXXX There is no reason to think that alternating is a particularly good - * approach -- it's just designed to prevent destroys from starving other - * cells completely. - */ - unsigned int last_cell_was_destroy : 1; - /** Destroy counter: increment this when a destroy gets queued, decrement - * when we unqueue it, so we can test to make sure they don't starve. - */ - int64_t destroy_ctr; - - /* - * Circuitmux policy; if this is non-NULL, it can override the built- - * in round-robin active circuits behavior. This is how EWMA works in - * the new circuitmux_t world. - */ - const circuitmux_policy_t *policy; - - /* Policy-specific data */ - circuitmux_policy_data_t *policy_data; -}; - -/* * This struct holds whatever we want to store per attached circuit on a * circuitmux_t; right now, just the count of queued cells and the direction. */ @@ -221,9 +172,6 @@ chanid_circid_entry_hash(chanid_circid_muxinfo_t *a) ((unsigned int)(a->chan_id & 0xffffffff))); } -/* Declare the struct chanid_circid_muxinfo_map type */ -HT_HEAD(chanid_circid_muxinfo_map, chanid_circid_muxinfo_t); - /* Emit a bunch of hash table stuff */ HT_PROTOTYPE(chanid_circid_muxinfo_map, chanid_circid_muxinfo_t, node, chanid_circid_entry_hash, chanid_circid_entries_eq) diff --git a/src/core/or/circuitmux.h b/src/core/or/circuitmux.h index 67cd9bcdd..c68c31b29 100644 --- a/src/core/or/circuitmux.h +++ b/src/core/or/circuitmux.h @@ -158,5 +158,61 @@ void circuitmux_mark_destroyed_circids_usable(circuitmux_t *cmux, MOCK_DECL(int, circuitmux_compare_muxes, (circuitmux_t *cmux_1, circuitmux_t *cmux_2)); +#ifdef CIRCUITMUX_PRIVATE + +#include "core/or/destroy_cell_queue_st.h" + +/* + * Map of muxinfos for circuitmux_t to use; struct is defined below (name + * of struct must match HT_HEAD line). + */ +typedef HT_HEAD(chanid_circid_muxinfo_map, chanid_circid_muxinfo_t) + chanid_circid_muxinfo_map_t; + +/* + * Structures for circuitmux.c + */ + +struct circuitmux_s { + /* Keep count of attached, active circuits */ + unsigned int n_circuits, n_active_circuits; + + /* Total number of queued cells on all circuits */ + unsigned int n_cells; + + /* + * Map from (channel ID, circuit ID) pairs to circuit_muxinfo_t + */ + chanid_circid_muxinfo_map_t *chanid_circid_map; + + /** List of queued destroy cells */ + destroy_cell_queue_t destroy_cell_queue; + /** Boolean: True iff the last cell to circuitmux_get_first_active_circuit + * returned the destroy queue. Used to force alternation between + * destroy/non-destroy cells. + * + * XXXX There is no reason to think that alternating is a particularly good + * approach -- it's just designed to prevent destroys from starving other + * cells completely. + */ + unsigned int last_cell_was_destroy : 1; + /** Destroy counter: increment this when a destroy gets queued, decrement + * when we unqueue it, so we can test to make sure they don't starve. + */ + int64_t destroy_ctr; + + /* + * Circuitmux policy; if this is non-NULL, it can override the built- + * in round-robin active circuits behavior. This is how EWMA works in + * the new circuitmux_t world. + */ + const circuitmux_policy_t *policy; + + /* Policy-specific data */ + circuitmux_policy_data_t *policy_data; +}; + +#endif /* CIRCUITMUX_PRIVATE */ + #endif /* !defined(TOR_CIRCUITMUX_H) */

1 0

[tor/master] test: Remove circuitmux/destroy_cell_queue code duplication
by nickm＠torproject.org 01 Nov '19

01 Nov '19

commit d2e51aca7da8851e81d4ed0edb2a093652817385 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Oct 22 10:46:13 2019 -0400 test: Remove circuitmux/destroy_cell_queue code duplication This also rename a function to improve code clarity. Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/test/test_circuitmux.c | 36 ++++++++---------------------------- 1 file changed, 8 insertions(+), 28 deletions(-) diff --git a/src/test/test_circuitmux.c b/src/test/test_circuitmux.c index 75bb4df5f..cb57b1bd6 100644 --- a/src/test/test_circuitmux.c +++ b/src/test/test_circuitmux.c @@ -5,39 +5,22 @@ #define CIRCUITMUX_PRIVATE #define CIRCUITMUX_EWMA_PRIVATE #define RELAY_PRIVATE + #include "core/or/or.h" #include "core/or/channel.h" #include "core/or/circuitmux.h" #include "core/or/circuitmux_ewma.h" +#include "core/or/destroy_cell_queue_st.h" #include "core/or/relay.h" #include "core/or/scheduler.h" -#include "test/test.h" -#include "core/or/destroy_cell_queue_st.h" +#include "test/fakechans.h" +#include "test/test.h" #include <math.h> -/** - * MOCKED functions. - */ -static void -scheduler_release_channel_mock(channel_t *chan) -{ - (void) chan; - return; -} - -/* XXXX duplicated function from test_circuitlist.c */ -static channel_t * -new_fake_channel(void) -{ - channel_t *chan = tor_malloc_zero(sizeof(channel_t)); - channel_init(chan); - return chan; -} - static int -has_queued_writes(channel_t *c) +mock_has_queued_writes_true(channel_t *c) { (void) c; return 1; @@ -58,12 +41,10 @@ test_cmux_destroy_cell_queue(void *arg) (void) arg; - cmux = circuitmux_alloc(); - tt_assert(cmux); ch = new_fake_channel(); - circuitmux_set_policy(cmux, &ewma_policy); - ch->has_queued_writes = has_queued_writes; + ch->has_queued_writes = mock_has_queued_writes_true; ch->wide_circ_ids = 1; + cmux = ch->cmux; circ = circuitmux_get_first_active_circuit(cmux, &cq); tt_ptr_op(circ, OP_EQ, NULL); @@ -88,8 +69,7 @@ test_cmux_destroy_cell_queue(void *arg) tt_int_op(circuitmux_num_cells(cmux), OP_EQ, 2); done: - circuitmux_free(cmux); - channel_free(ch); + free_fake_channel(ch); packed_cell_free(pc); tor_free(dc);

1 0