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

[tor/master] Fix memory leak when sending configuration-changed event
by nickm＠torproject.org 19 Apr '13

19 Apr '13

commit 0a9c17a61ad7193a051c53ea2a0cb91e012f014e Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 17 11:34:15 2013 -0400 Fix memory leak when sending configuration-changed event Fix for bug #8718; bugfix on 0.2.3.3-alpha. --- changes/bug8716 | 3 +++ src/or/config.c | 3 ++- src/or/control.c | 2 +- src/or/control.h | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/changes/bug8716 b/changes/bug8716 new file mode 100644 index 0000000..74c74f8 --- /dev/null +++ b/changes/bug8716 @@ -0,0 +1,3 @@ + o Minor bugfixes (memory leak): + - Fix a memory leak that would occur whenever a configuration + option changed. Fixes bug #8718; bugfix on 0.2.3.3-alpha. diff --git a/src/or/config.c b/src/or/config.c index 16eadf9..236955b 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -785,12 +785,13 @@ set_options(or_options_t *new_val, char **msg) tor_free(line); } } else { - smartlist_add(elements, (char*)options_format.vars[i].name); + smartlist_add(elements, tor_strdup(options_format.vars[i].name)); smartlist_add(elements, NULL); } } } control_event_conf_changed(elements); + SMARTLIST_FOREACH(elements, char *, cp, tor_free(cp)); smartlist_free(elements); } diff --git a/src/or/control.c b/src/or/control.c index fc7bae2..417f6c6 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -4347,7 +4347,7 @@ control_event_guard(const char *nickname, const char *digest, * a smartlist_t containing (key, value, ...) pairs in sequence. * <b>value</b> can be NULL. */ int -control_event_conf_changed(smartlist_t *elements) +control_event_conf_changed(const smartlist_t *elements) { int i; char *result; diff --git a/src/or/control.h b/src/or/control.h index f301ce9..943d67e 100644 --- a/src/or/control.h +++ b/src/or/control.h @@ -71,7 +71,7 @@ int control_event_server_status(int severity, const char *format, ...) CHECK_PRINTF(2,3); int control_event_guard(const char *nickname, const char *digest, const char *status); -int control_event_conf_changed(smartlist_t *elements); +int control_event_conf_changed(const smartlist_t *elements); int control_event_buildtimeout_set(const circuit_build_times_t *cbt, buildtimeout_set_event_t type); int control_event_signal(uintptr_t signal);

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.4'
by nickm＠torproject.org 19 Apr '13

19 Apr '13

commit ab3d5c049032651a9c9164262f9a8f81de9709d4 Merge: 1b5320b e35ca13 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 18 21:42:39 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' changes/bug8716 | 3 +++ src/or/config.c | 3 ++- src/or/control.c | 2 +- src/or/control.h | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-)

1 0

[tor/maint-0.2.4] Merge remote-tracking branch 'public/bug8716_023' into maint-0.2.4
by nickm＠torproject.org 19 Apr '13

19 Apr '13

commit e35ca135282c6b833f51543988580bd860b49be6 Merge: 06efbbb 0a9c17a Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 18 21:33:53 2013 -0400 Merge remote-tracking branch 'public/bug8716_023' into maint-0.2.4 changes/bug8716 | 3 +++ src/or/config.c | 3 ++- src/or/control.c | 2 +- src/or/control.h | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-)

1 0

[tor/maint-0.2.4] Fix memory leak when sending configuration-changed event
by nickm＠torproject.org 19 Apr '13

19 Apr '13

commit 0a9c17a61ad7193a051c53ea2a0cb91e012f014e Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 17 11:34:15 2013 -0400 Fix memory leak when sending configuration-changed event Fix for bug #8718; bugfix on 0.2.3.3-alpha. --- changes/bug8716 | 3 +++ src/or/config.c | 3 ++- src/or/control.c | 2 +- src/or/control.h | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/changes/bug8716 b/changes/bug8716 new file mode 100644 index 0000000..74c74f8 --- /dev/null +++ b/changes/bug8716 @@ -0,0 +1,3 @@ + o Minor bugfixes (memory leak): + - Fix a memory leak that would occur whenever a configuration + option changed. Fixes bug #8718; bugfix on 0.2.3.3-alpha. diff --git a/src/or/config.c b/src/or/config.c index 16eadf9..236955b 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -785,12 +785,13 @@ set_options(or_options_t *new_val, char **msg) tor_free(line); } } else { - smartlist_add(elements, (char*)options_format.vars[i].name); + smartlist_add(elements, tor_strdup(options_format.vars[i].name)); smartlist_add(elements, NULL); } } } control_event_conf_changed(elements); + SMARTLIST_FOREACH(elements, char *, cp, tor_free(cp)); smartlist_free(elements); } diff --git a/src/or/control.c b/src/or/control.c index fc7bae2..417f6c6 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -4347,7 +4347,7 @@ control_event_guard(const char *nickname, const char *digest, * a smartlist_t containing (key, value, ...) pairs in sequence. * <b>value</b> can be NULL. */ int -control_event_conf_changed(smartlist_t *elements) +control_event_conf_changed(const smartlist_t *elements) { int i; char *result; diff --git a/src/or/control.h b/src/or/control.h index f301ce9..943d67e 100644 --- a/src/or/control.h +++ b/src/or/control.h @@ -71,7 +71,7 @@ int control_event_server_status(int severity, const char *format, ...) CHECK_PRINTF(2,3); int control_event_guard(const char *nickname, const char *digest, const char *status); -int control_event_conf_changed(smartlist_t *elements); +int control_event_conf_changed(const smartlist_t *elements); int control_event_buildtimeout_set(const circuit_build_times_t *cbt, buildtimeout_set_event_t type); int control_event_signal(uintptr_t signal);

1 0

r26162: {website} Mention obfsproxy's git repository in obfsproxy page. (website/trunk/projects/en)
by George Kadianakis 19 Apr '13

19 Apr '13

Author: asn Date: 2013-04-19 00:22:37 +0000 (Fri, 19 Apr 2013) New Revision: 26162 Modified: website/trunk/projects/en/obfsproxy.wml Log: Mention obfsproxy's git repository in obfsproxy page. Modified: website/trunk/projects/en/obfsproxy.wml =================================================================== --- website/trunk/projects/en/obfsproxy.wml 2013-04-18 09:46:05 UTC (rev 26161) +++ website/trunk/projects/en/obfsproxy.wml 2013-04-19 00:22:37 UTC (rev 26162) @@ -52,6 +52,10 @@ href="https://trac.torproject.org/projects/tor/query?status=accepted&status=assig…">ticket</a> on our bug tracker for any bugs you find or features you would like to see added in future releases. + <br> + Also feel free to look or poke at + <a href="https://gitweb.torproject.org/pluggable-transports/obfsproxy.git">the source code</a> + and send us back any improvements you make. </p> <a id="morebridges"></a>

1 0

[torsocks/master] Update .travis.yml
by ioerror＠torproject.org 19 Apr '13

19 Apr '13

commit e34a134274dd4cf62a8a4866f0fdf0f0da01369e Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Thu Apr 18 16:46:47 2013 -0700 Update .travis.yml --- .travis.yml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/.travis.yml b/.travis.yml index d252dcd..bfeeb01 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,5 +8,5 @@ branches: - master before_install: - sudo apt-get update -qq - - sudo apt-get install -qq autotools-dev debhelper pkg-config autotools hardening-wrapper + - sudo apt-get install -qq autotools-dev pkg-config hardening-wrapper automake autoconf script: ./configure && make

1 0

[torsocks/master] Update ChangeLog and trigger travis-ci build about adding travis yaml
by ioerror＠torproject.org 18 Apr '13

18 Apr '13

commit 0e85fdcb56c6f7663cfb6a57f564353ef25f166d Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Thu Apr 18 16:21:10 2013 -0700 Update ChangeLog and trigger travis-ci build about adding travis yaml --- ChangeLog | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7bf9253..805168f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Torsocks 1.4 +XXX + o Added .travis.yml for travis-ci integration: + + https://travis-ci.org/ioerror/torsocks + Torsocks 1.3 2013-02-11 Jacob Appelbaum <jacob(a)appelbaum.net>

1 0

[torsocks/master] Add .travis.yml for https://travis-ci.org/ioerror/torsocks integration
by ioerror＠torproject.org 18 Apr '13

18 Apr '13

commit e0bf65b5d3ca0e28b827c08d80b0fe1841d5a149 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Thu Apr 18 16:09:17 2013 -0700 Add .travis.yml for https://travis-ci.org/ioerror/torsocks integration --- .travis.yml | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..d252dcd --- /dev/null +++ b/.travis.yml @@ -0,0 +1,12 @@ +language: c +before_script: ./autogen.sh +compiler: + - clang + - gcc +branches: + only: + - master +before_install: + - sudo apt-get update -qq + - sudo apt-get install -qq autotools-dev debhelper pkg-config autotools hardening-wrapper +script: ./configure && make

1 0

[tor-launcher/master] Limit the size of the in-memory tor log (1000 entries by default).
by brade＠torproject.org 18 Apr '13

18 Apr '13

commit 145b993d7691750a8041a80254a9fa6cb903afe2 Author: Kathy Brade <brade(a)torproject.org> Date: Thu Apr 18 17:09:47 2013 -0400 Limit the size of the in-memory tor log (1000 entries by default). Controlled by hidden pref: extensions.torlauncher.max_tor_log_entries --- src/components/tl-protocol.js | 9 +++++++++ src/defaults/preferences/prefs.js | 1 + 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/src/components/tl-protocol.js b/src/components/tl-protocol.js index 94ab21d..d1a8f84 100644 --- a/src/components/tl-protocol.js +++ b/src/components/tl-protocol.js @@ -72,6 +72,8 @@ TorProtocolService.prototype = kServiceName : "Tor Launcher Protocol Service", kClassID: Components.ID("{4F476361-23FB-43EF-A427-B36A14D3208E}"), + kPrefMaxTorLogEntries: "extensions.torlauncher.max_tor_log_entries", + // nsISupports implementation. QueryInterface: function(aIID) { @@ -1173,6 +1175,13 @@ TorProtocolService.prototype = let logObj = { date: now, type: eventType, msg: msg }; if (!this.mTorLog) this.mTorLog = []; + else + { + var maxEntries = + TorLauncherUtil.getIntPref(this.kPrefMaxTorLogEntries, 0); + if ((maxEntries > 0) && (this.mTorLog.length >= maxEntries)) + this.mTorLog.splice(0, 1); + } this.mTorLog.push(logObj); break; case "STATUS_CLIENT": diff --git a/src/defaults/preferences/prefs.js b/src/defaults/preferences/prefs.js index d9ea4d1..2a4799d 100644 --- a/src/defaults/preferences/prefs.js +++ b/src/defaults/preferences/prefs.js @@ -1,5 +1,6 @@ pref("extensions.torlauncher.loglevel", 4); // 1=verbose, 2=debug, 3=info, 4=note, 5=warn pref("extensions.torlauncher.logmethod", 1); // 0=stdout, 1=errorconsole, 2=debuglog +pref("extensions.torlauncher.max_tor_log_entries", 1000); pref("extensions.torlauncher.control_host", "127.0.0.1"); pref("extensions.torlauncher.control_port", 9151);

1 0

[tor-launcher/master] Add bridge relay help button to network settings dialog.
by brade＠torproject.org 18 Apr '13

18 Apr '13

commit 56a7e93004b1eaaeec3d66ca1f41bf623af3802c Author: Kathy Brade <brade(a)torproject.org> Date: Thu Apr 18 16:41:52 2013 -0400 Add bridge relay help button to network settings dialog. --- src/chrome/content/.network-settings.js.swp | Bin 0 -> 32768 bytes src/chrome/content/network-settings.js | 91 ++++++++++++++++++++------- src/chrome/content/network-settings.xul | 27 ++++++--- src/chrome/locale/en/network-settings.dtd | 5 ++ src/chrome/locale/en/torlauncher.properties | 1 + src/chrome/skin/network-settings.css | 14 ++++ 6 files changed, 106 insertions(+), 32 deletions(-) diff --git a/src/chrome/content/.network-settings.js.swp b/src/chrome/content/.network-settings.js.swp new file mode 100644 index 0000000..ce49066 Binary files /dev/null and b/src/chrome/content/.network-settings.js.swp differ diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js index 97e26d6..f8dd976 100644 --- a/src/chrome/content/network-settings.js +++ b/src/chrome/content/network-settings.js @@ -46,6 +46,8 @@ var gTorProcessService = null; var gObsService = null; var gIsInitialBootstrap = false; var gIsBootstrapComplete = false; +var gRestoreAfterHelpPanelID = null; +var gRestoreAfterCancelBtnLabel = null; function initDialog() @@ -85,14 +87,14 @@ function initDialog() if (TorLauncherUtil.shouldStartAndOwnTor && !gTorProcessService.TorIsProcessReady) { - showOrHideSettings(false, true); // Show "Waiting for tor to start" + showPanel("startingTor"); gObsService.addObserver(gObserver, kTorProcessReadyTopic, false); gObsService.addObserver(gObserver, kTorProcessExitedTopic, false); gObsService.addObserver(gObserver, kTorProcessDidNotStartTopic, false); } else { - showOrHideSettings(true, false); + showPanel("settings"); readTorSettings(); } @@ -109,11 +111,11 @@ var gObserver = { if (kTorProcessReadyTopic == aTopic) { - showOrHideSettings(true, false); + showPanel("settings"); readTorSettings(); } else if (kTorProcessDidNotStartTopic == aTopic) - showOrHideSettings(false, false); + showPanel("errorPanel"); else close(); } @@ -137,7 +139,7 @@ function readTorSettings() if (!didSucceed) { // Unable to communicate with tor. Hide settings and display an error. - showOrHideSettings(false, false); + showPanel("errorPanel"); setTimeout(function() { @@ -153,42 +155,45 @@ function readTorSettings() } -function showOrHideSettings(aShow, aIsStartingTor) +function showPanel(aPanelID) { - showOrHideElem("settings", aShow); - showOrHideElem("startingTor", !aShow && aIsStartingTor); + var deckElem = document.getElementById("deck"); + if (deckElem) + deckElem.selectedPanel = document.getElementById(aPanelID); - var okBtn = document.documentElement.getButton("accept"); - if (okBtn) - { - if (aShow) - { - okBtn.removeAttribute("hidden"); - okBtn.focus(); - } - else - okBtn.setAttribute("hidden", true); - } + showOrHideButton("accept", (aPanelID == "settings"), true); + showOrHideButton("extra1", (aPanelID != "bridgeHelp"), false); } -function showOrHideElem(aID, aShow) +function showOrHideButton(aID, aShow, aFocus) { if (!aID) return; - var e = document.getElementById(aID); - if (e) + var btn = document.documentElement.getButton(aID); + if (btn) { if (aShow) - e.removeAttribute("hidden"); + { + btn.removeAttribute("hidden"); + if (aFocus) + btn.focus() + } else - e.setAttribute("hidden", true); + btn.setAttribute("hidden", true); } } + function onCancel() { + if (gRestoreAfterHelpPanelID) // Is help open? + { + closeHelp(); + return false; + } + if (gIsInitialBootstrap) try { var obsSvc = Cc["@mozilla.org/observer-service;1"] @@ -208,6 +213,44 @@ function onCopyLog() } +function onOpenHelp() +{ + if (gRestoreAfterHelpPanelID) // Already open? + return; + + var deckElem = document.getElementById("deck"); + if (!deckElem) + return; + + gRestoreAfterHelpPanelID = deckElem.selectedPanel.id; + var cancelBtn = document.documentElement.getButton("cancel"); + if (cancelBtn) + { + gRestoreAfterCancelBtnLabel = cancelBtn.label; + cancelBtn.label = TorLauncherUtil.getLocalizedString("done"); + } + else + gRestoreAfterCancelBtnLabel = null; + + showPanel("bridgeHelp"); +} + + +function closeHelp() +{ + if (!gRestoreAfterHelpPanelID) // Already closed? + return; + + var cancelBtn = document.documentElement.getButton("cancel"); + if (cancelBtn && gRestoreAfterCancelBtnLabel) + cancelBtn.label = gRestoreAfterCancelBtnLabel; + gRestoreAfterCancelBtnLabel = null; + + showPanel(gRestoreAfterHelpPanelID); + gRestoreAfterHelpPanelID = null; +} + + // Returns true if successful. function initProxySettings() { diff --git a/src/chrome/content/network-settings.xul b/src/chrome/content/network-settings.xul index 6e6c882..ddd2b86 100644 --- a/src/chrome/content/network-settings.xul +++ b/src/chrome/content/network-settings.xul @@ -16,19 +16,20 @@ title="&torsettings.dialog.title;" windowtype="TorLauncher:NetworkSettings" persist="screenX screenY" - buttons="accept,cancel,extra1" + buttons="accept,cancel,extra1,help" buttonlabelextra1="&torsettings.copyLog;" ondialogaccept="return applySettings();" ondialogcancel="return onCancel();" ondialogextra1="onCopyLog();" + ondialoghelp="onOpenHelp();" onload="initDialog();"> <script type="application/x-javascript" src="chrome://torlauncher/content/network-settings.js"/> - <stack> + <deck id="deck"> <vbox id="settings"> - <vbox flex="1"> + <vbox> <hbox id="tbb-header"> <vbox> <spacer flex="1" /> @@ -95,7 +96,7 @@ </groupbox> </vbox> - <vbox flex="1"> + <vbox> <checkbox id="useFirewallPorts" groupboxID="firewallSpecificSettings" label="&torsettings.firewall.checkbox;" oncommand="toggleElemUI(this)"/> @@ -108,14 +109,17 @@ </groupbox> </vbox> - <vbox flex="1"> + <vbox> <checkbox id="useBridges" groupboxID="bridgeSpecificSettings" label="&torsettings.useBridges.checkbox;" oncommand="toggleElemUI(this);" /> <groupbox id="bridgeSpecificSettings"> <hbox> <vbox flex="1"> - <label value="&torsettings.useBridges.label;" control="bridgeList"/> + <hbox align="center"> + <button dlgtype="help"/> + <label value="&torsettings.useBridges.label;" control="bridgeList"/> + </hbox> <textbox id="bridgeList" multiline="true" rows="4" /> </vbox> <!-- @@ -132,7 +136,7 @@ </groupbox> </vbox> </vbox> - <vbox id="startingTor" flex="1"> + <vbox id="startingTor"> <spring flex="1" /> <hbox> <spring flex="1" /> @@ -141,6 +145,13 @@ </hbox> <spring flex="1" /> </vbox> - </stack> + <vbox id="bridgeHelp"> + <hbox align="middle"><label>&torsettings.bridgeHelpTitle;</label></hbox> + <description>&torsettings.bridgeHelp1;</description> + <description>&torsettings.bridgeHelp2;</description> + <description>&torsettings.bridgeHelp3;</description> + </vbox> + <vbox id="errorPanel"/> + </deck> <spring /> </dialog> diff --git a/src/chrome/locale/en/network-settings.dtd b/src/chrome/locale/en/network-settings.dtd index 3382b17..99ea45c 100644 --- a/src/chrome/locale/en/network-settings.dtd +++ b/src/chrome/locale/en/network-settings.dtd @@ -21,3 +21,8 @@ <!ENTITY torsettings.useBridges.checkbox "My ISP blocks connections to the Tor network"> <!ENTITY torsettings.useBridges.label "Enter one or more bridge relays in the form address:port."> <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> +<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> +<!ENTITY torsettings.bridgeHelp1 "Bridge relays (or 'bridges' for short) are Tor relays that aren't listed in the main directory. Since there is no complete public list of them, even if your ISP is filtering connections to all the known Tor relays they probably won't be able to block all the bridges."> +<!ENTITY torsettings.bridgeHelp2 "To obtain some bridge relays, use a web browser to visit the following page: https://bridges.torproject.org"> + +<!ENTITY torsettings.bridgeHelp3 "Another way to find public bridge addresses is to send mail to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message. However, so we can make it harder for an attacker to learn lots of bridge addresses, you must send this request from an email address at one of the following domains: gmail.com or yahoo.com."> diff --git a/src/chrome/locale/en/torlauncher.properties b/src/chrome/locale/en/torlauncher.properties index 0453faa..362f122 100644 --- a/src/chrome/locale/en/torlauncher.properties +++ b/src/chrome/locale/en/torlauncher.properties @@ -25,3 +25,4 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.connect=Connect torlauncher.quit=Quit torlauncher.quit_win=Exit +torlauncher.done=Done diff --git a/src/chrome/skin/network-settings.css b/src/chrome/skin/network-settings.css index e165bca..32cdd07 100644 --- a/src/chrome/skin/network-settings.css +++ b/src/chrome/skin/network-settings.css @@ -41,3 +41,17 @@ dialog.initialBootstrap #tbb-header { font-size: 120%; font-weight: bold; } + +#bridgeHelp { + margin: 30px; +} + +#bridgeHelp label { + font-size: 120%; + font-weight: bold; + margin: 0px 0px 20px 0px; +} + +#bridgeHelp description { + margin-bottom: 15px; +}

1 0