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

[arm/master] Dropping isValidIpAddress()
by atagar＠torproject.org 22 Sep '13

22 Sep '13

commit 4cb6013833c95da11d61a080e87035951b9060b3 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Sep 21 17:48:26 2013 -0700 Dropping isValidIpAddress() Unused function. We alredy swapped over to stem's more tested version earlier. --- arm/util/connections.py | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/arm/util/connections.py b/arm/util/connections.py index 38fdf70..65ba52b 100644 --- a/arm/util/connections.py +++ b/arm/util/connections.py @@ -107,21 +107,6 @@ CONFIG = conf.config_dict("arm", { PORT_USAGE = {} -def isValidIpAddress(ipStr): - """ - Returns true if input is a valid IPv4 address, false otherwise. - """ - - # checks if theres four period separated values - if not ipStr.count(".") == 3: return False - - # checks that each value in the octet are decimal values between 0-255 - for ipComp in ipStr.split("."): - if not ipComp.isdigit() or int(ipComp) < 0 or int(ipComp) > 255: - return False - - return True - def isIpAddressPrivate(ipAddr): """ Provides true if the IP address belongs on the local network or belongs to

1 0

[arm/master] Making use of stem's is_private_address()
by atagar＠torproject.org 22 Sep '13

22 Sep '13

commit 47c55e2bca002ee9dab805ca3762f46112f60f0a Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Sep 21 17:53:53 2013 -0700 Making use of stem's is_private_address() Dropping our isIpAddressPrivate() in favor of stem's new, tested is_private_address() alternative. --- arm/connections/connEntry.py | 14 ++++++++------ arm/util/connections.py | 24 ------------------------ 2 files changed, 8 insertions(+), 30 deletions(-) diff --git a/arm/connections/connEntry.py b/arm/connections/connEntry.py index bd83cca..e052a59 100644 --- a/arm/connections/connEntry.py +++ b/arm/connections/connEntry.py @@ -6,10 +6,12 @@ Connection panel entries related to actual connections to or from the system import time import curses -from arm.util import connections, torTools, uiTools +from arm.util import torTools, uiTools from arm.connections import entries -from stem.util import conf, enum, str_tools +from stem.util import conf, connection, enum, str_tools + +from arm.util.connections import ipToInt, getPortUsage # Connection Categories: # Inbound Relay connection, coming to us. @@ -183,7 +185,7 @@ class ConnectionEntry(entries.ConnectionPanelEntry): elif attr == entries.SortAttr.UPTIME: return connLine.startTime elif attr == entries.SortAttr.COUNTRY: - if connections.isIpAddressPrivate(self.lines[0].foreign.getIpAddr()): return "" + if connection.is_private_address(self.lines[0].foreign.getIpAddr()): return "" else: return connLine.foreign.getLocale("") else: return entries.ConnectionPanelEntry.getSortValue(self, attr, listingType) @@ -251,7 +253,7 @@ class ConnectionLine(entries.ConnectionPanelLine): self.includeExpandedIpAddr = includeExpandedIpAddr # cached immutable values used for sorting - self.sortIpAddr = connections.ipToInt(self.foreign.getIpAddr()) + self.sortIpAddr = ipToInt(self.foreign.getIpAddr()) self.sortPort = int(self.foreign.getPort()) def getListingEntry(self, width, currentTime, listingType): @@ -809,7 +811,7 @@ class ConnectionLine(entries.ConnectionPanelLine): spaceAvailable = maxLength - len(dstAddress) - 3 if self.getType() == Category.EXIT and includePort: - purpose = connections.getPortUsage(self.foreign.getPort()) + purpose = getPortUsage(self.foreign.getPort()) if purpose: # BitTorrent is a common protocol to truncate, so just use "Torrent" @@ -821,7 +823,7 @@ class ConnectionLine(entries.ConnectionPanelLine): purpose = uiTools.cropStr(purpose, spaceAvailable, endType = uiTools.Ending.HYPHEN) dstAddress += " (%s)" % purpose - elif not connections.isIpAddressPrivate(self.foreign.getIpAddr()): + elif not connection.is_private_address(self.foreign.getIpAddr()): extraInfo = [] conn = torTools.getConn() diff --git a/arm/util/connections.py b/arm/util/connections.py index 65ba52b..1c18233 100644 --- a/arm/util/connections.py +++ b/arm/util/connections.py @@ -107,30 +107,6 @@ CONFIG = conf.config_dict("arm", { PORT_USAGE = {} -def isIpAddressPrivate(ipAddr): - """ - Provides true if the IP address belongs on the local network or belongs to - loopback, false otherwise. These include: - Private ranges: 10.*, 172.16.* - 172.31.*, 192.168.* - Loopback: 127.* - - Arguments: - ipAddr - IP address to be checked - """ - - # checks for any of the simple wildcard ranges - if ipAddr.startswith("10.") or ipAddr.startswith("192.168.") or ipAddr.startswith("127."): - return True - - # checks for the 172.16.* - 172.31.* range - if ipAddr.startswith("172.") and ipAddr.count(".") == 3: - secondOctet = ipAddr[4:ipAddr.find(".", 4)] - - if secondOctet.isdigit() and int(secondOctet) >= 16 and int(secondOctet) <= 31: - return True - - return False - def ipToInt(ipAddr): """ Provides an integer representation of the ip address, suitable for sorting.

1 0

[arm/master] Dropping ipToInt() helper
by atagar＠torproject.org 22 Sep '13

22 Sep '13

commit 853bf8ba88feb863e2949ce1a91bbd19e0815b70 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Sep 21 18:04:10 2013 -0700 Dropping ipToInt() helper The connection util's ipToInt() helper was only used in a single spot. This method strikes me as being too specialized to fit in stem so simply moving it to where it's used. --- arm/connections/connEntry.py | 11 +++++++++-- arm/util/connections.py | 16 ---------------- 2 files changed, 9 insertions(+), 18 deletions(-) diff --git a/arm/connections/connEntry.py b/arm/connections/connEntry.py index e052a59..681f5ec 100644 --- a/arm/connections/connEntry.py +++ b/arm/connections/connEntry.py @@ -11,7 +11,7 @@ from arm.connections import entries from stem.util import conf, connection, enum, str_tools -from arm.util.connections import ipToInt, getPortUsage +from arm.util.connections import getPortUsage # Connection Categories: # Inbound Relay connection, coming to us. @@ -253,7 +253,14 @@ class ConnectionLine(entries.ConnectionPanelLine): self.includeExpandedIpAddr = includeExpandedIpAddr # cached immutable values used for sorting - self.sortIpAddr = ipToInt(self.foreign.getIpAddr()) + + ip_value = 0 + + for comp in self.foreign.getIpAddr().split("."): + ip_value *= 255 + ip_value += int(comp) + + self.sortIpAddr = ip_value self.sortPort = int(self.foreign.getPort()) def getListingEntry(self, width, currentTime, listingType): diff --git a/arm/util/connections.py b/arm/util/connections.py index 1c18233..bdb3c3f 100644 --- a/arm/util/connections.py +++ b/arm/util/connections.py @@ -107,22 +107,6 @@ CONFIG = conf.config_dict("arm", { PORT_USAGE = {} -def ipToInt(ipAddr): - """ - Provides an integer representation of the ip address, suitable for sorting. - - Arguments: - ipAddr - ip address to be converted - """ - - total = 0 - - for comp in ipAddr.split("."): - total *= 255 - total += int(comp) - - return total - def getPortUsage(port): """ Provides the common use of a given port. If no useage is known then this

1 0

[arm/master] Removing unused REQ_EVENTS dict
by atagar＠torproject.org 22 Sep '13

22 Sep '13

commit 3d8670523e9ef273336ccb94dfebc6bc32f286dc Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Sep 21 17:06:59 2013 -0700 Removing unused REQ_EVENTS dict Our old TorCtl-based codebase needed to play a funky dance to get the event types we needed, but also allow users to customize what they wanted for the log panel. Stem has a much better API in this reguard so we can just add separate listeners for both and it hanles the SETEVENT calls for us. The REQ_EVENTS is legacy from those old, dark times. We no longer use it so it can be safely removed. --- arm/controller.py | 8 -------- arm/util/torTools.py | 6 ------ 2 files changed, 14 deletions(-) diff --git a/arm/controller.py b/arm/controller.py index b6b1b9f..68b9146 100644 --- a/arm/controller.py +++ b/arm/controller.py @@ -514,12 +514,6 @@ def start_arm(start_time): :param float start_time: unix timestamp for when arm was started """ - # adds events needed for arm functionality to the torTools REQ_EVENTS - # mapping (they're then included with any setControllerEvents call, and log - # a more helpful error if unavailable) - - torTools.REQ_EVENTS["BW"] = "bandwidth graph won't function" - if not CONFIG["startup.blindModeEnabled"]: # The DisableDebuggerAttachment will prevent our connection panel from really # functioning. It'll have circuits, but little else. If this is the case then @@ -530,8 +524,6 @@ def start_arm(start_time): if controller.get_conf("DisableDebuggerAttachment", None) == "1": log.notice("Tor is preventing system utilities like netstat and lsof from working. This means that arm can't provide you with connection information. You can change this by adding 'DisableDebuggerAttachment 0' to your torrc and restarting tor. For more information see...\nhttps://trac.torproject.org/3313") connections.getResolver("tor").setPaused(True) - else: - torTools.REQ_EVENTS["CIRC"] = "may cause issues in identifying client connections" # Configures connection resoultions. This is paused/unpaused according to # if Tor's connected or not. diff --git a/arm/util/torTools.py b/arm/util/torTools.py index 8c7631e..7c0a108 100644 --- a/arm/util/torTools.py +++ b/arm/util/torTools.py @@ -26,12 +26,6 @@ CONFIG = conf.config_dict("arm", { "tor.chroot": "", }) -# events used for controller functionality: -# NEWDESC, NS, and NEWCONSENSUS - used for cache invalidation -REQ_EVENTS = {"NEWDESC": "information related to descriptors will grow stale", - "NS": "information related to the consensus will grow stale", - "NEWCONSENSUS": "information related to the consensus will grow stale"} - # Logs issues and notices when fetching the path prefix if true. This is # only done once for the duration of the application to avoid pointless # messages.

1 0

[stem/master] Adding a get_vote() method to the DescriptorDownloader
by atagar＠torproject.org 22 Sep '13

22 Sep '13

commit f40c912ecb8fdb542a7bd12e7a440e5301ea9798 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Sep 21 17:41:13 2013 -0700 Adding a get_vote() method to the DescriptorDownloader Stem is frequently being used for answering questions concerning directory authorities, so adding a method to more intuitively get their votes. --- stem/descriptor/remote.py | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/stem/descriptor/remote.py b/stem/descriptor/remote.py index 6b4a6da..4b04767 100644 --- a/stem/descriptor/remote.py +++ b/stem/descriptor/remote.py @@ -534,6 +534,25 @@ class DescriptorDownloader(object): return self.query(resource + '.z', **query_args) + def get_vote(self, authority, **query_args): + """ + Provides the present vote for a given directory authority. + + :param stem.descriptor.remote.DirectoryAuthority authority: authority for which to retrieve a vote for + :param query_args: additional arguments for the + :class:`~stem.descriptor.remote.Query` constructor + + :returns: :class:`~stem.descriptor.remote.Query` for the router status + entries + """ + + resource = '/tor/status-vote/current/authority' + + if not 'endpoint' in query_args: + query_args['endpoints'] = [(authority.address, authority.dir_port)] + + return self.query(resource + '.z', **query_args) + def get_key_certificates(self, authority_v3idents = None, **query_args): """ Provides the key certificates for authorities with the given fingerprints.

1 0

[stem/master] Adding a is_private_address() function to stem.util.connection
by atagar＠torproject.org 22 Sep '13

22 Sep '13

commit aee7de80db712ab1003eb6d8ac52e78d5f0f18cc Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Sep 21 17:46:02 2013 -0700 Adding a is_private_address() function to stem.util.connection Helper function for determining if an IPv4 address belongs to a private range or not. --- docs/change_log.rst | 1 + stem/util/connection.py | 35 +++++++++++++++++++++++++++++++++++ test/unit/util/connection.py | 20 ++++++++++++++++++++ 3 files changed, 56 insertions(+) diff --git a/docs/change_log.rst b/docs/change_log.rst index b7840b4..13b256d 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -65,6 +65,7 @@ The following are only available within stem's `git repository * Added :func:`stem.util.system.get_user` * Added :func:`stem.util.system.get_start_time` * Added :func:`stem.util.system.get_bsd_jail_path` + * Added :func:`stem.util.connection.is_private_address` * **Website** diff --git a/stem/util/connection.py b/stem/util/connection.py index 3bb7df0..0e4c190 100644 --- a/stem/util/connection.py +++ b/stem/util/connection.py @@ -12,6 +12,7 @@ but for now just moving the parts we need. is_valid_ipv4_address - checks if a string is a valid IPv4 address is_valid_ipv6_address - checks if a string is a valid IPv6 address is_valid_port - checks if something is a valid representation for a port + is_private_address - checks if an IPv4 address belongs to a private range or not expand_ipv6_address - provides an IPv6 address with its collapsed portions expanded get_mask_ipv4 - provides the mask representation for a given number of bits get_mask_ipv6 - provides the IPv6 mask representation for a given number of bits @@ -119,6 +120,40 @@ def is_valid_port(entry, allow_zero = False): return entry > 0 and entry < 65536 +def is_private_address(address): + """ + Checks if the IPv4 address is in a range belonging to the local network or + loopback. These include: + + * Private ranges: 10.*, 172.16.* - 172.31.*, 192.168.* + * Loopback: 127.* + + :param str address: string to be checked + + :returns: **True** if input is in a private range, **False** otherwise + + :raises: **ValueError** if the address isn't a valid IPv4 address + """ + + if not is_valid_ipv4_address(address): + raise ValueError("'%s' isn't a valid IPv4 address" % address) + + # checks for any of the simple wildcard ranges + + if address.startswith("10.") or address.startswith("192.168.") or address.startswith("127."): + return True + + # checks for the 172.16.* - 172.31.* range + + if address.startswith("172."): + second_octet = int(address.split('.')[1]) + + if second_octet >= 16 and second_octet <= 31: + return True + + return False + + def expand_ipv6_address(address): """ Expands abbreviated IPv6 addresses to their full colon separated hex format. diff --git a/test/unit/util/connection.py b/test/unit/util/connection.py index 99ee050..5d48f28 100644 --- a/test/unit/util/connection.py +++ b/test/unit/util/connection.py @@ -79,6 +79,26 @@ class TestConnection(unittest.TestCase): self.assertTrue(stem.util.connection.is_valid_port(0, allow_zero = True)) self.assertTrue(stem.util.connection.is_valid_port("0", allow_zero = True)) + def test_is_private_address(self): + """ + Checks the is_private_address function. + """ + + self.assertTrue(stem.util.connection.is_private_address('127.0.0.1')) + self.assertTrue(stem.util.connection.is_private_address('10.0.0.0')) + self.assertTrue(stem.util.connection.is_private_address('172.16.0.0')) + self.assertTrue(stem.util.connection.is_private_address('172.31.0.0')) + self.assertTrue(stem.util.connection.is_private_address('192.168.0.50')) + + self.assertFalse(stem.util.connection.is_private_address('74.125.28.103')) + self.assertFalse(stem.util.connection.is_private_address('172.15.0.0')) + self.assertFalse(stem.util.connection.is_private_address('172.32.0.0')) + + self.assertRaises(ValueError, stem.util.connection.is_private_address, '') + self.assertRaises(ValueError, stem.util.connection.is_private_address, 'blarg') + self.assertRaises(ValueError, stem.util.connection.is_private_address, '127.0.0') + self.assertRaises(ValueError, stem.util.connection.is_private_address, 'fe80:0000:0000:0000:0202:b3ff:fe1e:8329') + def test_expand_ipv6_address(self): """ Checks the expand_ipv6_address function.

1 0

[torbirdy/master] Update the locale to reflect the last commit
by sukhbir＠torproject.org 22 Sep '13

22 Sep '13

commit bd4990fe34d40b3a95d5290b30c63a7aad895e16 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Sat Sep 21 20:02:51 2013 -0400 Update the locale to reflect the last commit --- chrome/locale/en/torbirdy.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chrome/locale/en/torbirdy.dtd b/chrome/locale/en/torbirdy.dtd index de5ecf9..3e22539 100644 --- a/chrome/locale/en/torbirdy.dtd +++ b/chrome/locale/en/torbirdy.dtd @@ -35,7 +35,7 @@ <!ENTITY torbirdy.prefs.global "Global"> <!ENTITY torbirdy.prefs.imap.label "Enable push email support for IMAP accounts [default: disabled]"> <!ENTITY torbirdy.prefs.imap.key "p"> -<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled, select Local Folders]"> +<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]"> <!ENTITY torbirdy.prefs.startup_folder.key "l"> <!ENTITY torbirdy.prefs.timezone.label "Do not set Thunderbird's time zone to UTC [default: set to UTC]"> <!ENTITY torbirdy.prefs.timezone.key "z">

1 0

[torbirdy/master] Merge pull request #13 from lazlolazlolazlo/patch-1
by sukhbir＠torproject.org 22 Sep '13

22 Sep '13

commit b15dbf72e81d8d21cb2b55091889fbbb7b93501b Merge: 3da9f99 cf3bdfb Author: Sukhbir Singh <sukhbir.in(a)gmail.com> Date: Fri Sep 20 09:02:24 2013 -0700 Merge pull request #13 from lazlolazlolazlo/patch-1 Update torbirdy.dtd chrome/locale/nl/torbirdy.dtd | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)

1 0

[torbirdy/master] Merge branch 'master' of github.com:ioerror/torbirdy
by sukhbir＠torproject.org 22 Sep '13

22 Sep '13

commit a14e732892fb7a9138b62da641e6404018524689 Merge: 34907e6 b15dbf7 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Sat Sep 21 19:48:30 2013 -0400 Merge branch 'master' of github.com:ioerror/torbirdy chrome/locale/nl/torbirdy.dtd | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)

1 0

[torbirdy/master] Fix bug #7776 that did not preserve the Message Pane setting
by sukhbir＠torproject.org 22 Sep '13

22 Sep '13

commit 34907e60a8d71c673e8c8bdba0bcc4629229905a Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Sat Sep 21 19:21:23 2013 -0400 Fix bug #7776 that did not preserve the Message Pane setting --- chrome/content/overlay.js | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/chrome/content/overlay.js b/chrome/content/overlay.js index 0b3dd2e..3e8f997 100644 --- a/chrome/content/overlay.js +++ b/chrome/content/overlay.js @@ -8,15 +8,10 @@ .getService(Ci.nsIEnvironment); if (!(prefs.getBoolPref('extensions.torbirdy.startup_folder'))) { - window.loadStartFolder = function() { - var startupFolder = GetMsgFolderFromUri("mailbox://nobody@Local%20Folders"); - if (startupFolder) { - if (window.gFolderTreeView) { - gFolderTreeView.selectFolder(startupFolder); - } - } - }; - } + if (window.gFolderTreeView) { + gFolderTreeView.selectFolder = function() { return; } + } + }; window.TorBirdy = { onLoad: function() {

1 0