- tor-commits - lists.torproject.org

[arm/master] Wizard hooks for configuring system wide torrc
by atagar＠torproject.org 06 Aug '11

06 Aug '11

commit ec49c74ba52d9410d6f108a4e76dfad063d40500 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Jul 27 12:10:02 2011 -0700 Wizard hooks for configuring system wide torrc Providing an option to apply the wizard config to the system wide torrc if it's available (user has already done the --init prep). --- src/cli/wizard.py | 98 +++++++++++++++++++++++++++++++++++++++++++++++------ src/settings.cfg | 4 ++ 2 files changed, 91 insertions(+), 11 deletions(-) diff --git a/src/cli/wizard.py b/src/cli/wizard.py index 08e9d0b..31f2f70 100644 --- a/src/cli/wizard.py +++ b/src/cli/wizard.py @@ -24,7 +24,7 @@ TORRC_TEMPLATE = "resources/torrcTemplate.txt" RelayType = enum.Enum("RESUME", "RELAY", "EXIT", "BRIDGE", "CLIENT") # all options that can be configured -Options = enum.Enum("DIVIDER", "CONTROL", "NICKNAME", "CONTACT", "NOTIFY", "BANDWIDTH", "LIMIT", "CLIENT", "LOWPORTS", "PORTFORWARD", "STARTUP", "RSHUTDOWN", "CSHUTDOWN", "NOTICE", "POLICY", "WEBSITES", "EMAIL", "IM", "MISC", "PLAINTEXT", "DISTRIBUTE", "BRIDGED", "BRIDGE1", "BRIDGE2", "BRIDGE3", "REUSE") +Options = enum.Enum("DIVIDER", "CONTROL", "NICKNAME", "CONTACT", "NOTIFY", "BANDWIDTH", "LIMIT", "CLIENT", "LOWPORTS", "PORTFORWARD", "SYSTEM", "STARTUP", "RSHUTDOWN", "CSHUTDOWN", "NOTICE", "POLICY", "WEBSITES", "EMAIL", "IM", "MISC", "PLAINTEXT", "DISTRIBUTE", "BRIDGED", "BRIDGE1", "BRIDGE2", "BRIDGE3", "REUSE") RelayOptions = {RelayType.RELAY: (Options.NICKNAME, Options.CONTACT, Options.NOTIFY, @@ -34,7 +34,8 @@ RelayOptions = {RelayType.RELAY: (Options.NICKNAME, Options.LOWPORTS, Options.PORTFORWARD, Options.STARTUP, - Options.RSHUTDOWN), + Options.RSHUTDOWN, + Options.SYSTEM), RelayType.EXIT: (Options.NICKNAME, Options.CONTACT, Options.NOTIFY, @@ -45,6 +46,7 @@ RelayOptions = {RelayType.RELAY: (Options.NICKNAME, Options.PORTFORWARD, Options.STARTUP, Options.RSHUTDOWN, + Options.SYSTEM, Options.DIVIDER, Options.NOTICE, Options.POLICY, @@ -60,13 +62,15 @@ RelayOptions = {RelayType.RELAY: (Options.NICKNAME, Options.LOWPORTS, Options.PORTFORWARD, Options.STARTUP, - Options.RSHUTDOWN), + Options.RSHUTDOWN, + Options.SYSTEM), RelayType.CLIENT: (Options.BRIDGED, Options.BRIDGE1, Options.BRIDGE2, Options.BRIDGE3, Options.REUSE, - Options.CSHUTDOWN)} + Options.CSHUTDOWN, + Options.SYSTEM)} # option sets CUSTOM_POLICIES = (Options.WEBSITES, Options.EMAIL, Options.IM, Options.MISC, Options.PLAINTEXT) @@ -95,6 +99,12 @@ VERSION_REQUIREMENTS = {Options.PORTFORWARD: "0.2.3.1-alpha"} TOR_DEFAULTS = {Options.BANDWIDTH: "5 MB", Options.REUSE: "10 minutes"} +# path for the torrc to be placed if replacing the torrc for the system wide +# tor instance +SYSTEM_DROP_PATH = "/var/lib/tor-arm/torrc" +OVERRIDE_SCRIPT = "/usr/share/arm/resources/torrcOverride/override.py" +OVERRIDE_SETUID_SCRIPT = "/usr/bin/torrc-override" + CONFIG = {"wizard.message.role": "", "wizard.message.relay": "", "wizard.message.exit": "", @@ -306,6 +316,13 @@ def showWizard(): if not sysTools.isAvailable("tor-fw-helper"): disabledOpt.append(Options.PORTFORWARD) + # If we haven't run 'resources/torrcOverride/override.py --init' or lack + # permissions then we aren't able to deal with the system wide tor instance. + # Also drop the optoin if we aren't installed since override.py won't be at + # the expected path. + if not os.path.exists(SYSTEM_DROP_PATH) or not os.path.exists(OVERRIDE_SCRIPT): + disabledOpt.append(Options.SYSTEM) + while True: if relayType == None: selection = promptRelayType(relaySelection) @@ -331,16 +348,26 @@ def showWizard(): 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): - shutil.copy(torrcLocation, torrcLocation + "_bak") - isBackedUp = True + try: + shutil.copy(torrcLocation, torrcLocation + "_bak") + isBackedUp = True + except IOError, exc: + log.log(log.WARN, "Unable to backup the torrc: %s" % exc) # writes the torrc contents - torrcFile = open(torrcLocation, "w") - torrcFile.write(generatedTorrc) - torrcFile.close() + try: + torrcFile = open(torrcLocation, "w") + torrcFile.write(generatedTorrc) + torrcFile.close() + except IOError, exc: + log.log(log.ERR, "Unable to make torrc: %s" % exc) + break # logs where we placed the torrc msg = "Tor configuration placed at '%s'" % torrcLocation @@ -367,7 +394,53 @@ def showWizard(): msg = "Exit notice placed at '%s/index.html'. Some of the sections are specific to US relay operators so please change the \"FIXME\" sections if this is inappropriate." % dst log.log(log.NOTICE, msg) - if manager.isTorrcAvailable(): + runCommand, exitCode = None, 1 + + if isSystemReplace: + # running override.py needs root so... + # - if running as root (bad user, no biscuit!) then run it directly + # - if the setuid binary is available at '/usr/bin/torrc-override' + # then use that + # - attempt sudo in case passwordless sudo is available + # - if all of the above fail then log instructions + + if os.geteuid() == 0: runCommand = OVERRIDE_SCRIPT + elif os.path.exists(OVERRIDE_SETUID_SCRIPT): runCommand = OVERRIDE_SETUID_SCRIPT + else: + # The -n argument to sudo is *supposed* to be available starting + # with 1.7.0 [1] however this is a dirty lie (Ubuntu 9.10 uses + # 1.7.0 and even has the option in its man page, but it doesn't + # work). Instead checking for version 1.7.1. + # + # [1] http://www.sudo.ws/pipermail/sudo-users/2009-January/003889.html + + sudoVersionResult = sysTools.call("sudo -V") + + # version output looks like "Sudo version 1.7.2p7" + if len(sudoVersionResult) == 1 and sudoVersionResult.count(" ") >= 2: + versionNum = 0 + + for comp in sudoVersionResult[0].split(" ")[2].split("."): + if comp and comp[0].isdigit(): + versionNum = (10 * versionNum) + int(comp) + else: + # invalid format + log.log(log.INFO, "Unrecognized sudo version string: %s" % sudoVersionResult[0]) + versionNum = 0 + break + + if versionNum >= 171: + runCommand = "sudo -n %s" % OVERRIDE_SCRIPT + else: + log.log(log.INFO, "Insufficient sudo version for the -n argument") + + if runCommand: exitCode = os.system("%s > /dev/null 2>&1" % runCommand) + + if exitCode != 0: + msg = "Tor needs root permissions to replace the system wide torrc. To continue...\n- open another terminal\n- run \"sudo %s\"\n- press 'x' here to tell tor to reload" % OVERRIDE_SCRIPT + log.log(log.NOTICE, msg) + else: torTools.getConn().reload() + elif manager.isTorrcAvailable(): # If we're connected to a managed instance then just need to # issue a sighup to pick up the new settings. Otherwise starts # a new tor instance. @@ -603,9 +676,12 @@ def getTorrc(relayType, config, disabledOpt): dataDir = cli.controller.getController().getDataDirectory() templateOptions["NOTICE_PATH"] = "%sexitNotice/index.html" % dataDir templateOptions["LOG_ENTRY"] = "notice file %stor_log" % dataDir - templateOptions["DATA_DIR"] = "%stor_data" % dataDir templateOptions["USERNAME"] = getpass.getuser() + # using custom data directory, unless this is for a system wide instance + if not config[Options.SYSTEM].getValue() or Options.SYSTEM in disabledOpt: + templateOptions["DATA_DIR"] = "%stor_data" % dataDir + policyCategories = [] if not config[Options.POLICY].getValue(): policyCategories = ["web", "mail", "im", "misc"] diff --git a/src/settings.cfg b/src/settings.cfg index 750ae9e..9154ed5 100644 --- a/src/settings.cfg +++ b/src/settings.cfg @@ -354,6 +354,7 @@ wizard.toggle Portforward => Enabled, Disabled wizard.toggle Startup => Yes, No wizard.toggle Rshutdown => Yes, No wizard.toggle Cshutdown => Yes, No +wizard.toggle System => Yes, No wizard.toggle Notice => Yes, No wizard.toggle Policy => Custom, Default wizard.toggle Websites => Allow, Block @@ -383,6 +384,7 @@ wizard.default Bandwidth => 5 MB/s wizard.default Startup => true wizard.default Rshutdown => false wizard.default Cshutdown => true +wizard.default System => true wizard.default Client => false wizard.default Lowports => true wizard.default Portforward => true @@ -421,6 +423,7 @@ wizard.label.opt Portforward => Port Forwarding wizard.label.opt Startup => Run At Startup wizard.label.opt Rshutdown => Shutdown With Arm wizard.label.opt Cshutdown => Shutdown With Arm +wizard.label.opt System => Use System Instance wizard.label.opt Notice => Disclaimer Notice wizard.label.opt Policy => Exit Policy wizard.label.opt Websites => Web Browsing @@ -452,6 +455,7 @@ wizard.description.opt Portforward => If needed, attempts NAT traversal using UP wizard.description.opt Startup => Runs Tor in the background when the system starts. wizard.description.opt Rshutdown => When you quit arm the Tor process is stopped thirty seconds later. This delay is so people using you can gracefully switch their circuits. wizard.description.opt Cshutdown => Stops the Tor process when you quit arm. +wizard.description.opt System => Use the system wide tor instance rather than making one of our own. wizard.description.opt Notice => Provides a disclaimer that this is an exit on port 80 (http://www.atagar.com/exitNotice) wizard.description.opt Policy => Ports allowed to exit from your relay. The default policy allows for common services while limiting the chance of getting a DMCA takedown for torrent traffic (http://www.atagar.com/exitPolicy) wizard.description.opt Websites => General Internet browsing including HTTP (80), HTTPS (443), common alternatives (81, 8008), and proxies (3128, 8080)

1 0

[arm/master] fix: avoiding setresuid/gid if unavailable
by atagar＠torproject.org 06 Aug '11

06 Aug '11

commit 4a1604958c6da5862c344f4d7ba6f0e0560daa23 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Aug 6 15:35:00 2011 -0700 fix: avoiding setresuid/gid if unavailable The os.setresuid and os.setresgid functions are only available in Python 2.7 and later. Arm aims for 2.5 compatability so using os.setreuid/gid if running a prior version. This, unfortunately, means that the saved uid is not reduced which might be a vulnerability - hopefully Jake will know of an alternative if this is a concern. --- src/resources/torrcOverride/override.py | 26 +++++++++++++++++++++++--- 1 files changed, 23 insertions(+), 3 deletions(-) diff --git a/src/resources/torrcOverride/override.py b/src/resources/torrcOverride/override.py index b99ae95..8261eab 100755 --- a/src/resources/torrcOverride/override.py +++ b/src/resources/torrcOverride/override.py @@ -145,6 +145,13 @@ def remove(): print " unsuccessful: %s" % exc def replaceTorrc(): + # TODO: The setresgid and setresuid functions are only available in + # python 2.7 (arm aims for 2.5 compatability). I'm not spotting a method + # for setting the saved user id without it, though. :/ + + majorVersion, minorVersion = sys.version_info[:2] + canSetSavedUid = majorVersion >= 3 or (majorVersion == 2 and minorVersion >= 7) + orig_uid = os.getuid() orig_euid = os.geteuid() @@ -168,7 +175,13 @@ def replaceTorrc(): # drop to the unprivileged group, and lose the rest of the groups os.setgid(dropped_gid) os.setegid(dropped_egid) - os.setresgid(dropped_gid, dropped_egid, dropped_gid) + + if canSetSavedUid: + # only usable in python 2.7 or later + os.setresgid(dropped_gid, dropped_egid, dropped_gid) + else: + os.setregid(dropped_gid, dropped_egid) + os.setgroups([dropped_gid]) # make a tempfile and write out the contents @@ -192,8 +205,15 @@ def replaceTorrc(): # I believe this drops os.setfsuid os.setfsgid stuff # Clear all other supplemental groups for dropped_uid os.setgroups([dropped_gid]) - os.setresgid(dropped_gid, dropped_egid, dropped_gid) - os.setresuid(dropped_uid, dropped_euid, dropped_uid) + + if canSetSavedUid: + # only usable in python 2.7 or later + os.setresgid(dropped_gid, dropped_egid, dropped_gid) + os.setresuid(dropped_uid, dropped_euid, dropped_uid) + else: + os.setregid(dropped_gid, dropped_egid) + os.setreuid(dropped_uid, dropped_euid) + os.setgid(dropped_gid) os.setegid(dropped_egid) os.setuid(dropped_uid)

1 0

[arm/master] fix: torrc validation arg doesn't need root check
by atagar＠torproject.org 06 Aug '11

06 Aug '11

commit c8de18c201814f4acfee6d64904c4c7335077846 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Jul 27 13:39:38 2011 -0700 fix: torrc validation arg doesn't need root check --- src/resources/torrcOverride/override.py | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/resources/torrcOverride/override.py b/src/resources/torrcOverride/override.py index dffa3a5..b99ae95 100755 --- a/src/resources/torrcOverride/override.py +++ b/src/resources/torrcOverride/override.py @@ -315,6 +315,17 @@ if __name__ == "__main__": print "This is a script specifically for configuring Linux" sys.exit(1) + if len(sys.argv) == 3 and sys.argv[1] == "--validate": + torrcFile = open(sys.argv[2]) + torrcContents = torrcFile.readlines() + torrcFile.close() + + isValid = isWizardGenerated(torrcContents) + if isValid: print "torrc validated" + else: print "torrc invalid" + + sys.exit(0) + # check that we're running effectively as root if os.geteuid() != 0: print "This script needs to be run as root" @@ -326,14 +337,6 @@ if __name__ == "__main__": init() elif len(sys.argv) == 2 and sys.argv[1] == "--remove": remove() - elif len(sys.argv) == 3 and sys.argv[1] == "--validate": - torrcFile = open(sys.argv[2]) - torrcContents = torrcFile.readlines() - torrcFile.close() - - isValid = isWizardGenerated(torrcContents) - if isValid: print "torrc validated" - else: print "torrc invalid" else: print HELP_MSG sys.exit(1)

1 0

[arm/master] fix: GUARD event support
by atagar＠torproject.org 06 Aug '11

06 Aug '11

commit ce2ff76cc352309ac4450d6dc9f94e1db7da4983 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Aug 3 09:01:48 2011 -0700 fix: GUARD event support The log panel wasn't receiving GUARD events, causing them to be silently dropped. Also doing better parsing for timestamp entries. --- src/cli/logPanel.py | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) diff --git a/src/cli/logPanel.py b/src/cli/logPanel.py index bb47517..f39617d 100644 --- a/src/cli/logPanel.py +++ b/src/cli/logPanel.py @@ -533,7 +533,18 @@ class TorEventObserver(TorCtl.PostEventListener): self._notify(event, ", ".join(idlistStr)) def address_mapped_event(self, event): - self._notify(event, "%s, %s -> %s" % (event.when, event.from_addr, event.to_addr)) + whenLabel, gmtExpiryLabel = "", "" + + if event.when: + whenLabel = time.strftime("%H:%M %m/%d/%Y", event.when) + + # TODO: torctl is getting an 'error' and 'gmt_expiry' attribute so display + # those when they become available + # + #if event.gmt_expiry: + # gmtExpiryLabel = time.strftime("%H:%M %m/%d/%Y", event.gmt_expiry) + + self._notify(event, "%s, %s -> %s" % (whenLabel, event.from_addr, event.to_addr)) def ns_event(self, event): # NetworkStatus params: nickname, idhash, orhash, ip, orport (int), @@ -545,6 +556,10 @@ class TorEventObserver(TorCtl.PostEventListener): msg = ", ".join(["%s (%s)" % (ns.idhex, ns.nickname) for ns in event.nslist]) self._notify(event, "Listed (%i): %s" % (len(event.nslist), msg), "magenta") + def guard_event(self, event): + msg = "%s (%s), STATUS: %s" % (event.idhex, event.nick, event.status) + self._notify(event, msg, "yellow") + def unknown_event(self, event): msg = "(%s) %s" % (event.event_name, event.event_string) self.callback(LogEntry(event.arrived_at, "UNKNOWN", msg, "red"))

1 0

[arm/master] fix: misparsing sudo version string
by atagar＠torproject.org 06 Aug '11

06 Aug '11

commit d1c16ba280d925b7b0724e8c47dca959a46c19d5 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Aug 6 16:24:46 2011 -0700 fix: misparsing sudo version string --- src/cli/wizard.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/cli/wizard.py b/src/cli/wizard.py index ff4e5cf..f0c14a8 100644 --- a/src/cli/wizard.py +++ b/src/cli/wizard.py @@ -417,7 +417,7 @@ def showWizard(): sudoVersionResult = sysTools.call("sudo -V") # version output looks like "Sudo version 1.7.2p7" - if len(sudoVersionResult) == 1 and sudoVersionResult.count(" ") >= 2: + if len(sudoVersionResult) == 1 and sudoVersionResult[0].count(" ") >= 2: versionNum = 0 for comp in sudoVersionResult[0].split(" ")[2].split("."):

1 0

[arm/master] fix: detecting for /var/lib/tor-arm
by atagar＠torproject.org 06 Aug '11

06 Aug '11

commit 4f88292730be74ede753b2bdc9c1fdcbb9437106 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Aug 6 16:14:07 2011 -0700 fix: detecting for /var/lib/tor-arm The '/var/lib/tor-arm' directory lack read permissions for the user we're running as, so checking for '/var/lib/tor-arm/torrc' always fails. This is just meant to determine if we're run the 'override.py --init' prep so detecting for the directory is fine. --- src/cli/wizard.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/cli/wizard.py b/src/cli/wizard.py index 6d9d488..ff4e5cf 100644 --- a/src/cli/wizard.py +++ b/src/cli/wizard.py @@ -320,7 +320,7 @@ def showWizard(): # permissions then we aren't able to deal with the system wide tor instance. # Also drop the optoin if we aren't installed since override.py won't be at # the expected path. - if not os.path.exists(SYSTEM_DROP_PATH) or not os.path.exists(OVERRIDE_SCRIPT): + if not os.path.exists(os.path.dirname(SYSTEM_DROP_PATH)) or not os.path.exists(OVERRIDE_SCRIPT): disabledOpt.append(Options.SYSTEM) while True:

1 0

[arm/master] Merge branch 'torrc-override'
by atagar＠torproject.org 06 Aug '11

06 Aug '11

commit 5b4c2765384045de454f33f390886a56483a6979 Merge: ce2ff76 d1c16ba Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Aug 6 16:37:52 2011 -0700 Merge branch 'torrc-override' src/cli/wizard.py | 100 ++++++++- src/resources/torrcOverride/override.c | 50 +++++ src/resources/torrcOverride/override.h | 1 + src/resources/torrcOverride/override.py | 363 +++++++++++++++++++++++++++++++ src/settings.cfg | 4 + 5 files changed, 506 insertions(+), 12 deletions(-)

1 0

[tor/master] Handle storing much longer socks4 authentication data.
by nickm＠torproject.org 06 Aug '11

06 Aug '11

commit e511a3a4dd4cacd8d2cd4f076ea321f75e5dfd22 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 5 18:56:30 2011 -0400 Handle storing much longer socks4 authentication data. --- src/or/or.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/or/or.h b/src/or/or.h index e7670bb..eb271b5 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -2524,7 +2524,7 @@ typedef struct origin_circuit_t { char *dest_address; int session_group; unsigned nym_epoch; - uint8_t socks_username_len; + size_t socks_username_len; uint8_t socks_password_len; /* Note that the next two values are NOT NUL-terminated; see socks_username_len and socks_password_len for their lengths. */ @@ -3404,7 +3404,7 @@ struct socks_request_t { unsigned int got_auth : 1; /**< Have we received any authentication data? */ /** Number of bytes in username; 0 if username is NULL */ - uint8_t usernamelen; + size_t usernamelen; /** Number of bytes in password; 0 if password is NULL */ uint8_t passwordlen; /** The negotiated username value if any (for socks5), or the entire

1 0

[tor/master] Merge remote-tracking branch 'public/bug3683'
by nickm＠torproject.org 06 Aug '11

06 Aug '11

commit ce878874615cb1d1c1636d6706a20c77e90342a3 Merge: d690a99 413574a Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 5 20:21:27 2011 -0400 Merge remote-tracking branch 'public/bug3683' src/or/buffers.c | 10 ++++++- src/or/circuitlist.c | 10 ++++++- src/or/connection_edge.c | 60 ++++++++++++++++++++++++++++++++++++--------- src/or/or.h | 6 ++++- 4 files changed, 69 insertions(+), 17 deletions(-)

1 0

[tor/master] Clear socks auth fields before free
by nickm＠torproject.org 06 Aug '11

06 Aug '11

commit 413574ad388d1f5bb756e818beb5ea9837b03bc3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 5 19:07:33 2011 -0400 Clear socks auth fields before free --- src/or/buffers.c | 10 ++++++++-- src/or/circuitlist.c | 10 ++++++++-- src/or/connection_edge.c | 10 ++++++++-- 3 files changed, 24 insertions(+), 6 deletions(-) diff --git a/src/or/buffers.c b/src/or/buffers.c index 5b9e55e..488289c 100644 --- a/src/or/buffers.c +++ b/src/or/buffers.c @@ -1532,8 +1532,14 @@ socks_request_free(socks_request_t *req) { if (!req) return; - tor_free(req->username); - tor_free(req->password); + if (req->username) { + memset(req->username, 0x10, req->usernamelen); + tor_free(req->username); + } + if (req->password) { + memset(req->password, 0x04, req->passwordlen); + tor_free(req->password); + } memset(req, 0xCC, sizeof(socks_request_t)); tor_free(req); } diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index 48c5afc..2222a25 100644 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@ -552,8 +552,14 @@ circuit_free(circuit_t *circ) rend_data_free(ocirc->rend_data); tor_free(ocirc->dest_address); - tor_free(ocirc->socks_username); - tor_free(ocirc->socks_password); + if (ocirc->socks_username) { + memset(ocirc->socks_username, 0x12, ocirc->socks_username_len); + tor_free(ocirc->socks_username); + } + if (ocirc->socks_password) { + memset(ocirc->socks_password, 0x06, ocirc->socks_password_len); + tor_free(ocirc->socks_password); + } } else { or_circuit_t *ocirc = TO_OR_CIRCUIT(circ); /* Remember cell statistics for this circuit before deallocating. */ diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 83102ba..ae2dfd2 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -3569,8 +3569,14 @@ circuit_clear_isolation(origin_circuit_t *circ) tor_free(circ->dest_address); circ->session_group = -1; circ->nym_epoch = 0; - tor_free(circ->socks_username); - tor_free(circ->socks_password); + if (circ->socks_username) { + memset(circ->socks_username, 0x11, circ->socks_username_len); + tor_free(circ->socks_username); + } + if (circ->socks_password) { + memset(circ->socks_password, 0x05, circ->socks_password_len); + tor_free(circ->socks_password); + } circ->socks_username_len = circ->socks_password_len = 0; }

1 0