- tor-commits - lists.torproject.org

[arm/master] Cautioning users against running tor as root
by atagar＠torproject.org 25 Sep '11

25 Sep '11

commit b1a5794c26d02b31a32762a4ef357878f4742fb7 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Sep 24 16:14:22 2011 -0700 Cautioning users against running tor as root Notice level message at startup that cautions the user against running tor as root. --- src/starter.py | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/src/starter.py b/src/starter.py index 2347f7b..6ed516e 100644 --- a/src/starter.py +++ b/src/starter.py @@ -99,6 +99,9 @@ STANDARD_CFG_NOT_FOUND_MSG = "No armrc loaded, using defaults. You can customize # torrc entries that are scrubbed when dumping PRIVATE_TORRC_ENTRIES = ["HashedControlPassword", "Bridge", "HiddenServiceDir"] +# notices given if the user is running arm or tor as root +TOR_ROOT_NOTICE = "Tor is currently running with root permissions. This is not a good idea and shouldn't be necessary. See the 'User UID' option from Tor's man page for an easy method of reducing its permissions after startup." + def allowConnectionTypes(): """ This provides a tuple with booleans indicating if we should or shouldn't @@ -489,7 +492,14 @@ if __name__ == '__main__': # skewing the startup time results so this isn't counted initTime = time.time() - startTime controller = util.torTools.getConn() - if conn: controller.init(conn) + + if conn: + controller.init(conn) + + # give a notice if tor is running with root + if controller.getMyUser() == "root": + util.log.log(util.log.NOTICE, TOR_ROOT_NOTICE) + # fetches descriptions for tor's configuration options _loadConfigurationDescriptions(pathPrefix)

1 0

[arm/master] fix: dropping os check for startup wizard option
by atagar＠torproject.org 25 Sep '11

25 Sep '11

commit 7a187c482f306fbfbe83552cc2a618e393e357e3 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Sep 24 14:43:35 2011 -0700 fix: dropping os check for startup wizard option The startup wizard option is currently unimplemented and disabled in the setting.cfg. However, there was an os compatability check left over from when I was gonna implement it. That and its comment were confusing since the option's not implemented so commenting it out with a more up to date expanation. --- src/cli/wizard.py | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/cli/wizard.py b/src/cli/wizard.py index da4e645..86522d1 100644 --- a/src/cli/wizard.py +++ b/src/cli/wizard.py @@ -331,10 +331,15 @@ def showWizard(): if not os.path.exists(os.path.dirname(SYSTEM_DROP_PATH)) or not os.path.exists(OVERRIDE_SCRIPT): disabledOpt.append(Options.SYSTEM) + # TODO: The STARTUP option is currently disabled in the 'settings.cfg', and I + # don't currently have plans to implement it (it would be a big pita, and the + # tor deb already handles it). *If* it is implemented then I'd limit support + # for the option to Debian and Ubuntu to start with, via the following... + # Running at startup is currently only supported for Debian and Ubuntu. # Patches welcome for supporting other platforms. - if not platform.dist()[0] in ("debian", "Ubuntu"): - disabledOpt.append(Options.STARTUP) + #if not platform.dist()[0] in ("debian", "Ubuntu"): + # disabledOpt.append(Options.STARTUP) while True: if relayType == None:

1 0

[arm/master] Cautioning users against running arm as root
by atagar＠torproject.org 25 Sep '11

25 Sep '11

commit e0248705018a57c55d7c99295a66857b617a06f1 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Sep 24 16:56:26 2011 -0700 Cautioning users against running arm as root Notice level message at startup that cautions the user against running arm as root. --- src/starter.py | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/starter.py b/src/starter.py index 6ed516e..b184330 100644 --- a/src/starter.py +++ b/src/starter.py @@ -101,6 +101,7 @@ PRIVATE_TORRC_ENTRIES = ["HashedControlPassword", "Bridge", "HiddenServiceDir"] # notices given if the user is running arm or tor as root TOR_ROOT_NOTICE = "Tor is currently running with root permissions. This is not a good idea and shouldn't be necessary. See the 'User UID' option from Tor's man page for an easy method of reducing its permissions after startup." +ARM_ROOT_NOTICE = "Arm is currently running with root permissions. This is not a good idea, and will still work perfectly well if it's run with the same user as Tor (ie, starting with \"sudo -u %s arm\")." def allowConnectionTypes(): """ @@ -493,13 +494,23 @@ if __name__ == '__main__': initTime = time.time() - startTime controller = util.torTools.getConn() + torUser = None if conn: controller.init(conn) # give a notice if tor is running with root - if controller.getMyUser() == "root": + torUser = controller.getMyUser() + if torUser == "root": util.log.log(util.log.NOTICE, TOR_ROOT_NOTICE) - + + # Give a notice if arm is running with root. Querying connections usually + # requires us to have the same permissions as tor so if tor is running as + # root then drop this notice (they're already then being warned about tor + # being root, anyway). + + if torUser != "root" and os.getuid() == 0: + torUserLabel = torUser if torUser else "<tor user>" + util.log.log(util.log.NOTICE, ARM_ROOT_NOTICE % torUserLabel) # fetches descriptions for tor's configuration options _loadConfigurationDescriptions(pathPrefix)

1 0

[arm/master] fix: wizard showed wrong torrc path for sys torrc
by atagar＠torproject.org 25 Sep '11

25 Sep '11

commit 458073c58d103b8dc633b36f56d77602865911e7 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Sep 24 14:33:25 2011 -0700 fix: wizard showed wrong torrc path for sys torrc When the user opts for the generated torrc to be for the system instance the wizard shows the wrong path in the confirmation panel. --- src/cli/wizard.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/cli/wizard.py b/src/cli/wizard.py index 4cb65ad..da4e645 100644 --- a/src/cli/wizard.py +++ b/src/cli/wizard.py @@ -356,15 +356,15 @@ def showWizard(): generatedTorrc = getTorrc(relayType, config, disabledOpt) torrcLocation = manager.getTorrcPath() + isSystemReplace = not Options.SYSTEM in disabledOpt and config[Options.SYSTEM].getValue() + if isSystemReplace: torrcLocation = SYSTEM_DROP_PATH + controller.redraw() confirmationSelection = showConfirmationDialog(generatedTorrc, torrcLocation) if confirmationSelection == NEXT: log.log(log.INFO, "Writing torrc to '%s':\n%s" % (torrcLocation, generatedTorrc)) - isSystemReplace = not Options.SYSTEM in disabledOpt and config[Options.SYSTEM].getValue() - if isSystemReplace: torrcLocation = SYSTEM_DROP_PATH - # if the torrc already exists then save it to a _bak file isBackedUp = False if os.path.exists(torrcLocation) and not isSystemReplace:

1 0

[arm/master] fix: concurrency issue could crash from CIRC event
by atagar＠torproject.org 24 Sep '11

24 Sep '11

commit e884fcbd894c9e764c60e6b40c5bd3e14583352e Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Sep 24 13:03:20 2011 -0700 fix: concurrency issue could crash from CIRC event If we got a CIRC event while populating the cache of relays that we're attached to we could reset _fingerprintsAttachedCache to None while we were in the middle of populating it. Manipulation of this cache is supposed to be governed by the connection lock, so fixing that for the CIRC event's reset. --- src/util/torTools.py | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/src/util/torTools.py b/src/util/torTools.py index e59b35e..3d18fcb 100644 --- a/src/util/torTools.py +++ b/src/util/torTools.py @@ -2004,7 +2004,9 @@ class Controller(TorCtl.PostEventListener): # CIRC events aren't required, but if one's received then flush this cache # since it uses circuit-status results. + self.connLock.acquire() self._fingerprintsAttachedCache = None + self.connLock.release() self._cachedParam["circuits"] = None @@ -2085,6 +2087,10 @@ class Controller(TorCtl.PostEventListener): relayPort - orport of relay (to further narrow the results) """ + # Events can reset _fingerprintsAttachedCache to None, so all uses of this + # function need to be under the connection lock (skipping that might also + # scew with the conn usage of this function...) + # If we were provided with a string port then convert to an int (so # lookups won't mismatch based on type). if isinstance(relayPort, str): relayPort = int(relayPort)

1 0

[arm/master] fix: clarifying missing armrc message
by atagar＠torproject.org 24 Sep '11

24 Sep '11

commit 73de20de4a69bc055cf23d5852e0ac8b007af1a9 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Sep 24 12:54:39 2011 -0700 fix: clarifying missing armrc message Occasionally people are confused by the notice that no armrc was loaded, thinking that it's a problem. Trying to clarify the message (it's just supposed to inform users that they can customize arm's behavior). --- src/starter.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/starter.py b/src/starter.py index 4315f06..2347f7b 100644 --- a/src/starter.py +++ b/src/starter.py @@ -94,7 +94,7 @@ DESC_SAVE_FAILED_MSG = "Unable to save configuration descriptions (%s)" NO_INTERNAL_CFG_MSG = "Failed to load the parsing configuration. This will be problematic for a few things like torrc validation and log duplication detection (%s)" STANDARD_CFG_LOAD_FAILED_MSG = "Failed to load configuration (using defaults): \"%s\"" -STANDARD_CFG_NOT_FOUND_MSG = "No configuration found at '%s', using defaults" +STANDARD_CFG_NOT_FOUND_MSG = "No armrc loaded, using defaults. You can customize arm by placing a configuration file at '%s' (see the armrc.sample for its options)." # torrc entries that are scrubbed when dumping PRIVATE_TORRC_ENTRIES = ["HashedControlPassword", "Bridge", "HiddenServiceDir"]

1 0

[arm/master] Quiting wizard when the user presses 'q'
by atagar＠torproject.org 24 Sep '11

24 Sep '11

commit 30fc358c617ebd075119e20fd6e532150b432e24 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Sep 24 13:14:54 2011 -0700 Quiting wizard when the user presses 'q' Users could cancel the wizard by prssing esc, but it's also intuitive to expect 'q' to do the same (since that's the keybinding to quit arm entirely). Respecting this option too. This was requested by monochromec on... https://trac.torproject.org/projects/tor/ticket/3995 This also fixes a minor bug where the config options dialog wouldn't respect a cancel signal (instead looping on that dialog). --- src/cli/wizard.py | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/cli/wizard.py b/src/cli/wizard.py index 40cf632..4cb65ad 100644 --- a/src/cli/wizard.py +++ b/src/cli/wizard.py @@ -351,6 +351,7 @@ def showWizard(): selection = promptConfigOptions(relayType, config, disabledOpt) if selection == BACK: relayType = None + elif selection == CANCEL: break elif selection == NEXT: generatedTorrc = getTorrc(relayType, config, disabledOpt) @@ -536,7 +537,7 @@ def promptRelayType(initialSelection): if key == curses.KEY_UP: selection = (selection - 1) % len(options) elif key == curses.KEY_DOWN: selection = (selection + 1) % len(options) elif uiTools.isSelectionKey(key): return options[selection].getValue() - elif key == 27: return CANCEL # esc - cancel + elif key in (27, ord('q'), ord('Q')): return CANCEL # esc or q - cancel finally: cli.popups.finalize() @@ -635,7 +636,7 @@ def promptConfigOptions(relayType, config, disabledOpt): except ValueError, exc: cli.popups.showMsg(str(exc), 3) cli.controller.getController().redraw() - elif key == 27: selection, key = -1, curses.KEY_ENTER # esc - cancel + elif key in (27, ord('q'), ord('Q')): return CANCEL finally: cli.popups.finalize() @@ -857,7 +858,7 @@ def showConfirmationDialog(torrcContents, torrcLocation): if selection == 0: return CANCEL elif selection == 1: return BACK else: return NEXT - elif key == 27: return CANCEL + elif key in (27, ord('q'), ord('Q')): return CANCEL finally: cli.popups.finalize()

1 0

r25112: {website} update the ssl version of fodt mirror. (in website/trunk: . include)
by Andrew Lewman 23 Sep '11

23 Sep '11

Author: phobos Date: 2011-09-23 20:02:50 +0000 (Fri, 23 Sep 2011) New Revision: 25112 Modified: website/trunk/include/mirrors-table.wmi website/trunk/update-mirrors.pl Log: update the ssl version of fodt mirror. Modified: website/trunk/include/mirrors-table.wmi =================================================================== --- website/trunk/include/mirrors-table.wmi 2011-09-23 19:48:03 UTC (rev 25111) +++ website/trunk/include/mirrors-table.wmi 2011-09-23 20:02:50 UTC (rev 25112) @@ -163,10 +163,10 @@ <td><a href="ftp://ftp.fodt.it/pub/mirror/tor/">ftp</a></td> <td><a href="http://tor.fodt.it/dist/">http</a></td> <td><a href="http://tor.fodt.it/">http</a></td> + <td><a href="https://tor.fodt.it/dist/">https</a></td> + <td><a href="https://tor.fodt.it/">https</a></td> <td> - </td> <td> - </td> - <td> - </td> - <td> - </td> </tr> <tr> @@ -392,6 +392,23 @@ <tr> + <td>INT</td> + + <td>CoralCDN</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://www.torproject.org.nyud.net/dist/">http</a></td> + <td><a href="http://www.torproject.org.nyud.net/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>NL</td> <td>Amorphis</td> @@ -545,23 +562,6 @@ <tr> - <td>INT</td> - - <td>CoralCDN</td> - - <td>Unknown</td> - - <td> - </td> - <td><a href="http://www.torproject.org.nyud.net/dist/">http</a></td> - <td><a href="http://www.torproject.org.nyud.net/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - <td>IS</td> <td>crypto.is</td> Modified: website/trunk/update-mirrors.pl =================================================================== --- website/trunk/update-mirrors.pl 2011-09-23 19:48:03 UTC (rev 25111) +++ website/trunk/update-mirrors.pl 2011-09-23 20:02:50 UTC (rev 25112) @@ -689,11 +689,11 @@ ipv6 => "False", loadBalanced => "No", httpWebsiteMirror => "http://tor.fodt.it/", - httpsWebsiteMirror => "", + httpsWebsiteMirror => "https://tor.fodt.it/", rsyncWebsiteMirror => "", ftpWebsiteMirror => "ftp://ftp.fodt.it/pub/mirror/tor/", httpDistMirror => "http://tor.fodt.it/dist/", - httpsDistMirror => "", + httpsDistMirror => "https://tor.fodt.it/dist/", rsyncDistMirror => "", hiddenServiceMirror => "", },

1 0

r25111: {website} update factor.cc https mirror, factor location, and update a (in website/trunk: . include)
by Andrew Lewman 23 Sep '11

23 Sep '11

Author: phobos Date: 2011-09-23 19:48:03 +0000 (Fri, 23 Sep 2011) New Revision: 25111 Modified: website/trunk/include/mirrors-table.wmi website/trunk/update-mirrors.pl Log: update factor.cc https mirror, factor location, and update all mirrors Modified: website/trunk/include/mirrors-table.wmi =================================================================== --- website/trunk/include/mirrors-table.wmi 2011-09-22 15:24:59 UTC (rev 25110) +++ website/trunk/include/mirrors-table.wmi 2011-09-23 19:48:03 UTC (rev 25111) @@ -18,6 +18,23 @@ <tr> + <td>DK</td> + + <td>Zentrum der Gesundheit</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://tor.idnr.ws/dist/">http</a></td> + <td><a href="http://tor.idnr.ws/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>EE</td> <td>CyberSIDE</td> @@ -205,7 +222,7 @@ <tr> - <td>AT</td> + <td>DE</td> <td>factor.cc</td> @@ -214,8 +231,8 @@ <td> - </td> <td><a href="http://tor.factor.cc/dist/">http</a></td> <td><a href="http://tor.factor.cc/">http</a></td> - <td><a href="https://tor.factor.cc/dist/">https</a></td> - <td><a href="https://tor.factor.cc/">https</a></td> + <td><a href="https://factor.cc/tor/dist/">https</a></td> + <td><a href="https://factor.cc/tor">https</a></td> <td> - </td> <td> - </td> </tr> @@ -324,23 +341,6 @@ <tr> - <td>US</td> - - <td>AskApache</td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://tor.askapache.com/dist/">http</a></td> - <td><a href="http://tor.askapache.com/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - <td>FR</td> <td>LazyTiger</td> @@ -409,15 +409,15 @@ <tr> - <td>SE</td> + <td>US</td> - <td>homosu</td> + <td>AskApache</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.homosu.net/dist">http</a></td> - <td><a href="http://tor.homosu.net/">http</a></td> + <td><a href="http://tor.askapache.com/dist/">http</a></td> + <td><a href="http://tor.askapache.com/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -426,15 +426,15 @@ <tr> - <td>DK</td> + <td>SE</td> - <td>Zentrum der Gesundheit</td> + <td>homosu</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.idnr.ws/dist/">http</a></td> - <td><a href="http://tor.idnr.ws/">http</a></td> + <td><a href="http://tor.homosu.net/dist">http</a></td> + <td><a href="http://tor.homosu.net/">http</a></td> <td> - </td> <td> - </td> <td> - </td> Modified: website/trunk/update-mirrors.pl =================================================================== --- website/trunk/update-mirrors.pl 2011-09-22 15:24:59 UTC (rev 25110) +++ website/trunk/update-mirrors.pl 2011-09-23 19:48:03 UTC (rev 25111) @@ -700,18 +700,18 @@ mirror043 => { adminContact => "", orgName => "factor.cc", - isoCC => "AT", + isoCC => "DE", subRegion => "", - region => "AT", + region => "DE", ipv4 => "True", ipv6 => "False", loadBalanced => "No", httpWebsiteMirror => "http://tor.factor.cc/", - httpsWebsiteMirror => "https://tor.factor.cc/", + httpsWebsiteMirror => "https://factor.cc/tor", rsyncWebsiteMirror => "", ftpWebsiteMirror => "", httpDistMirror => "http://tor.factor.cc/dist/", - httpsDistMirror => "https://tor.factor.cc/dist/", + httpsDistMirror => "https://factor.cc/tor/dist/", rsyncDistMirror => "", hiddenServiceMirror => "", }

1 0

[torspec/master] Incorporate Roger's comments into proposal 184
by nickm＠torproject.org 23 Sep '11

23 Sep '11

commit 02049040cd6816ed4893a508a57b61164f9c70ea Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 22 21:41:18 2011 -0400 Incorporate Roger's comments into proposal 184 --- proposals/184-v3-link-protocol.txt | 18 +++++++++++++++++- 1 files changed, 17 insertions(+), 1 deletions(-) diff --git a/proposals/184-v3-link-protocol.txt b/proposals/184-v3-link-protocol.txt index 910f223..8af15f9 100644 --- a/proposals/184-v3-link-protocol.txt +++ b/proposals/184-v3-link-protocol.txt @@ -51,12 +51,28 @@ Design: Indicating variable-length cells. Design: Variable-length padding. We add a new variable-length cell type, "VPADDING", to be used for - padding. All Tor instances may send a DROP cell at any point that + padding. All Tor instances may send a VPADDING cell at any point that a VERSIONS cell is not required; a VPADDING cell's body may be any length; the body of a VPADDING cell MAY have any content. Upon receiving a VPADDING cell, the recipient should drop it, as with a PADDING cell. + (This does not give a way to send fewer than 5 bytes of padding. + We could add this in the future, in a new link protocol.) + + Implementations SHOULD fill the content of all padding cells + randomly. + +A note on padding: + + We do not specify any situation in which a node ought to generate + a VPADDING cell; that's left for future work. Implementors should + be aware that many schemes have been proposed for link padding + that do not in fact work as well as one would expect. We + recommend that no mainstream implementation should produce padding + in an attempt to resist traffic analysis, without real research + showing that it helps. + Interaction with proposal 176: Proposal 176 says that during the v3 handshake, no cells other

1 0