tor-commits June 2011

tor-commits@lists.torproject.org

14 participants
716 discussions

[arm/master] Fixed calculation of maximum printable menu items.
by atagar＠torproject.org 04 Jun '11

04 Jun '11

commit 8941c87182b6050b6dc713cc7c920ae2e755648f Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Fri May 27 18:06:00 2011 +0500 Fixed calculation of maximum printable menu items. --- src/cli/menu.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/cli/menu.py b/src/cli/menu.py index 315d349..0395abb 100644 --- a/src/cli/menu.py +++ b/src/cli/menu.py @@ -64,7 +64,7 @@ class Menu(): titlewidth = max(map(lambda title: len(title), titles)) + 2 # total number of titles that can be printed in current width - printable = (width - 2) / titlewidth + printable = width / titlewidth - 1 top = 1 left = 1

1 0

[arm/master] Fixed typo.
by atagar＠torproject.org 04 Jun '11

04 Jun '11

commit 8b4dc162f75d5129e41f028c7253b7b265c8af76 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Fri May 27 18:00:20 2011 +0500 Fixed typo. --- src/cli/descriptorPopup.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/cli/descriptorPopup.py b/src/cli/descriptorPopup.py index e73e9fc..f75d7e6 100644 --- a/src/cli/descriptorPopup.py +++ b/src/cli/descriptorPopup.py @@ -104,7 +104,7 @@ def showDescriptorPopup(connectionPanel): """ # hides the title of the first panel on the page - contorl = controller.getController() + control = controller.getController() topPanel = control.getDisplayPanels(False)[0] topPanel.setTitleVisible(False) topPanel.redraw(True)

1 0

[arm/master] Initial commit for the menu code. Currently displays a top-bar in a
by atagar＠torproject.org 04 Jun '11

04 Jun '11

commit 5fd9b5f74a86eb7e641366ae1c0a1a47404cf873 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Fri May 27 18:01:25 2011 +0500 Initial commit for the menu code. Currently displays a top-bar in a popup and dispatches the menu entry to the callback function, which shall later on be used to determine the panel/key combination for taking specified action. --- src/cli/controller.py | 18 +++++++- src/cli/menu.py | 99 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 114 insertions(+), 3 deletions(-) diff --git a/src/cli/controller.py b/src/cli/controller.py index e94f7f6..c506302 100644 --- a/src/cli/controller.py +++ b/src/cli/controller.py @@ -17,6 +17,7 @@ import cli.graphing.bandwidthStats import cli.graphing.connStats import cli.graphing.resourceStats import cli.connections.connPanel +import cli.menu from util import connections, conf, enum, log, panel, sysTools, torConfig, torTools @@ -76,8 +77,11 @@ def initController(stdscr, startTime): # fourth page: torrc pagePanels.append([cli.torrcPanel.TorrcPanel(stdscr, cli.torrcPanel.Config.TORRC, config)]) + # top menu + menu = cli.menu.Menu() + # initializes the controller - ARM_CONTROLLER = Controller(stdscr, stickyPanels, pagePanels) + ARM_CONTROLLER = Controller(stdscr, stickyPanels, pagePanels, menu) # additional configuration for the graph panel graphPanel = ARM_CONTROLLER.getPanel("graph") @@ -131,7 +135,7 @@ class Controller: Tracks the global state of the interface """ - def __init__(self, stdscr, stickyPanels, pagePanels): + def __init__(self, stdscr, stickyPanels, pagePanels, menu): """ Creates a new controller instance. Panel lists are ordered as they appear, top to bottom on the page. @@ -140,11 +144,13 @@ class Controller: stdscr - curses window stickyPanels - panels shown at the top of each page pagePanels - list of pages, each being a list of the panels on it + menu - popup drop-down menu """ self._screen = stdscr self._stickyPanels = stickyPanels self._pagePanels = pagePanels + self._menu = menu self._page = 0 self._isPaused = False self._forceRedraw = False @@ -182,6 +188,9 @@ class Controller: self._forceRedraw = True self.setMsg() + def getMenu(self): + return self._menu + def isPaused(self): """ True if the interface is paused, false otherwise. @@ -299,7 +308,7 @@ class Controller: if attr == None: if not self._isPaused: - msg = "page %i / %i - q: quit, p: pause, h: page help" % (self._page + 1, len(self._pagePanels)) + msg = "page %i / %i - m: menu, q: quit, p: pause, h: page help" % (self._page + 1, len(self._pagePanels)) attr = curses.A_NORMAL else: msg = "Paused" @@ -507,6 +516,9 @@ def drawTorMonitor(stdscr, startTime): control.prevPage() elif key == ord('p') or key == ord('P'): control.setPaused(not control.isPaused()) + elif key == ord('m') or key == ord('M'): + menu = control.getMenu() + menu.draw() elif key == ord('q') or key == ord('Q'): # provides prompt to confirm that arm should exit if CONFIG["features.confirmQuit"]: diff --git a/src/cli/menu.py b/src/cli/menu.py new file mode 100644 index 0000000..315d349 --- /dev/null +++ b/src/cli/menu.py @@ -0,0 +1,99 @@ +""" +A drop-down menu for sending actions to panels. +""" + +import curses +from collections import namedtuple +from operator import attrgetter + +import cli.controller +import popups +from util import log, panel, uiTools + +LeafEntry = namedtuple('LeafEntry', ['title', 'callback']) +ParentEntry = namedtuple('ParentEntry', ['title', 'children']) + +class Menu(): + """Displays a popup menu and sends keys to appropriate panels""" + + def __init__(self, entry=None): + DEFAULT_ROOT = ParentEntry(title="Root", children=( + LeafEntry(title="File" , callback=self._callbackDefault), + LeafEntry(title="Logs" , callback=self._callbackDefault), + LeafEntry(title="View" , callback=self._callbackDefault), + LeafEntry(title="Graph" , callback=self._callbackDefault), + LeafEntry(title="Connections" , callback=self._callbackDefault), + LeafEntry(title="Configuration" , callback=self._callbackDefault))) + + self._selection = [0] + self._rootEntry = (entry and isinstance(entry, ParentEntry)) and entry or DEFAULT_ROOT + + def draw(self): + popup, width, height = popups.init(height=3) + if popup: + try: + popup.win.box() + + while True: + self._drawTopLevel(popup, width, height) + + popup.win.refresh() + + control = cli.controller.getController() + key = control.getScreen().getch() + + if key == curses.KEY_RIGHT: + if len(self._selection) == 1: + # selection is on top menu + self._selection[0] = (self._selection[0] + 1) % len(self._rootEntry.children) + elif key == curses.KEY_LEFT: + if len(self._selection) == 1: + # selection is on top menu + self._selection[0] = (self._selection[0] - 1) % len(self._rootEntry.children) + elif uiTools.isSelectionKey(key): + self._handleEvent() + break + + finally: + popups.finalize() + + def _drawTopLevel(self, popup, width, height): + titles = map(attrgetter('title'), self._rootEntry.children) + + # width per title is set according to the longest title + titlewidth = max(map(lambda title: len(title), titles)) + 2 + + # total number of titles that can be printed in current width + printable = (width - 2) / titlewidth + + top = 1 + left = 1 + for (index, entry) in enumerate(self._rootEntry.children[:printable]): + titleformat = curses.A_NORMAL + + if index == self._selection[0]: + titleformat = curses.A_STANDOUT + + popup.win.addch(top, left, curses.ACS_VLINE) + left = left + 1 + popup.win.addstr(top, left, entry.title.center(titlewidth), titleformat) + left = left + titlewidth + + popup.win.addch(top, left, curses.ACS_VLINE) + left = left + 1 + + def _handleEvent(self): + entry = self._rootEntry + + for index in self._selection: + if isinstance(entry, ParentEntry): + entry = entry.children[index] + else: + break + + if isinstance(entry, LeafEntry): + entry.callback(entry) + + def _callbackDefault(self, entry): + log.log(log.NOTICE, "%s selected" % entry.title) +

1 0

[arm/master] fix: updating bandwidth graph on shutdown
by atagar＠torproject.org 04 Jun '11

04 Jun '11

commit 3cfa3533d3ce1e2ac24b382bc310710c5e02ee00 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu May 26 08:22:43 2011 -0700 fix: updating bandwidth graph on shutdown If we have accounting and shut down Tor the accounting section should say "Connection Closed...". However, this wasn't happening unless we forced a redraw, such as by changing pages. This change makes the bandwidthStats initiate a redraw itself on controller status changes. --- src/cli/graphing/bandwidthStats.py | 4 ++++ src/cli/graphing/graphPanel.py | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/src/cli/graphing/bandwidthStats.py b/src/cli/graphing/bandwidthStats.py index d378c45..4e033f6 100644 --- a/src/cli/graphing/bandwidthStats.py +++ b/src/cli/graphing/bandwidthStats.py @@ -87,6 +87,10 @@ class BandwidthStats(graphPanel.GraphStats): if eventType == torTools.State.INIT and self._config["features.graph.bw.accounting.show"]: self.isAccounting = conn.getInfo('accounting/enabled') == '1' + + # redraws to reflect changes (this especially noticeable when we have + # accounting and shut down since it then gives notice of the shutdown) + if self._graphPanel and self.isSelected: self._graphPanel.redraw(True) def prepopulateFromState(self): """ diff --git a/src/cli/graphing/graphPanel.py b/src/cli/graphing/graphPanel.py index b48f82b..5fa1262 100644 --- a/src/cli/graphing/graphPanel.py +++ b/src/cli/graphing/graphPanel.py @@ -221,7 +221,7 @@ class GraphStats(TorCtl.PostEventListener): self.secondaryCounts[i].insert(0, 0) del self.secondaryCounts[i][self.maxCol + 1:] - if isRedraw: self._graphPanel.redraw(True) + if isRedraw and self._graphPanel: self._graphPanel.redraw(True) class GraphPanel(panel.Panel): """

1 0

[arm/master] fix: var misspelling crashed descriptor popup
by atagar＠torproject.org 04 Jun '11

04 Jun '11

commit 823630f38f2cdc616dcd9907ff9be75584366126 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu May 26 07:27:25 2011 -0700 fix: var misspelling crashed descriptor popup --- src/cli/descriptorPopup.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/cli/descriptorPopup.py b/src/cli/descriptorPopup.py index e73e9fc..f75d7e6 100644 --- a/src/cli/descriptorPopup.py +++ b/src/cli/descriptorPopup.py @@ -104,7 +104,7 @@ def showDescriptorPopup(connectionPanel): """ # hides the title of the first panel on the page - contorl = controller.getController() + control = controller.getController() topPanel = control.getDisplayPanels(False)[0] topPanel.setTitleVisible(False) topPanel.redraw(True)

1 0

[arm/master] fix: installation wasn't adding uninstall script
by atagar＠torproject.org 04 Jun '11

04 Jun '11

commit 8b8b4230ce305d8aadc4eebc36b4bd9506bd096f Author: Damian Johnson <atagar(a)torproject.org> Date: Thu May 26 07:02:37 2011 -0700 fix: installation wasn't adding uninstall script The uninstall wasn't among the set of non-python resources copied into /usr/share/arm during installation. --- setup.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/setup.py b/setup.py index cb0069f..cdda907 100644 --- a/setup.py +++ b/setup.py @@ -90,7 +90,7 @@ setup(name='arm', data_files=[("/usr/bin", ["arm"]), ("/usr/share/man/man1", [manFilename]), (docPath, ["armrc.sample"]), - ("/usr/share/arm", ["src/settings.cfg"])], + ("/usr/share/arm", ["src/settings.cfg", "src/uninstall"])], ) # Cleans up the temporary compressed man page.

1 0

r24803: {website} match the vidalia 0.3.0 filename to the tarball on the serve (website/trunk/projects/en)
by Andrew Lewman 04 Jun '11

04 Jun '11

Author: phobos Date: 2011-06-04 11:41:40 +0000 (Sat, 04 Jun 2011) New Revision: 24803 Modified: website/trunk/projects/en/vidalia.wml Log: match the vidalia 0.3.0 filename to the tarball on the server. Modified: website/trunk/projects/en/vidalia.wml =================================================================== --- website/trunk/projects/en/vidalia.wml 2011-06-04 11:40:40 UTC (rev 24802) +++ website/trunk/projects/en/vidalia.wml 2011-06-04 11:41:40 UTC (rev 24803) @@ -91,7 +91,7 @@ (<a href="https://archive.torproject.org/tor-package-archive/technology-preview/vidal…">sig</a>) </li> <li> - <a href="../dist/vidalia/vidalia-0.3.0.tar.gz">Source Tarball</a> + <a href="../dist/vidalia/vidalia-0.3.0-alpha.tar.gz">Source Tarball</a> (<a href="../dist/vidalia/vidalia-0.3.0-alpha.tar.gz.asc">sig</a>) </li> </ul>

1 0

r24802: {website} fix a grammar mistake. (website/trunk/projects/en)
by Andrew Lewman 04 Jun '11

04 Jun '11

Author: phobos Date: 2011-06-04 11:40:40 +0000 (Sat, 04 Jun 2011) New Revision: 24802 Modified: website/trunk/projects/en/vidalia.wml Log: fix a grammar mistake. Modified: website/trunk/projects/en/vidalia.wml =================================================================== --- website/trunk/projects/en/vidalia.wml 2011-06-04 03:00:06 UTC (rev 24801) +++ website/trunk/projects/en/vidalia.wml 2011-06-04 11:40:40 UTC (rev 24802) @@ -80,7 +80,7 @@ <h4>Alpha Releases</h4> The most recent alpha release is: 0.3.0 - WARNING this are very alpha bundles. + WARNING these are very alpha bundles. <ul> <li> <a href="https://archive.torproject.org/tor-package-archive/technology-preview/vidal…">Windows Installer</a>

1 0

[torbutton/master] Bug 3345: Make Google Captcha redirect work again.
by mikeperry＠torproject.org 04 Jun '11

04 Jun '11

commit e42dc36ceb914766c3337a655b4998f07407ddfb Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Fri Jun 3 20:00:19 2011 -0700 Bug 3345: Make Google Captcha redirect work again. --- src/chrome/content/torbutton.js | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 401443a..720e281 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -3035,7 +3035,8 @@ function torbutton_check_google_captcha(subject, topic, data) { redirURI.init(Ci.nsIStandardURL.URLTYPE_STANDARD, 80, redir, subject.URI.originCharset, null); redirURI = redirURI.QueryInterface(Components.interfaces.nsIURI); - if (redirURI.host == "sorry.google.com") { + if (redirURI.host == "sorry.google.com" + || redirURI.path.match("^/sorry/")) { var browser = null; if(m_tb_ff3 && subject.notificationCallbacks) { // Arg. google.timers.load.t is fucking us up!

1 0

r24801: {} Write down my thoughts on a simplified product package roadm (projects/roadmaps)
by Andrew Lewman 04 Jun '11

04 Jun '11

Author: phobos Date: 2011-06-04 03:00:06 +0000 (Sat, 04 Jun 2011) New Revision: 24801 Added: projects/roadmaps/proposed-package-roadmap.txt Log: Write down my thoughts on a simplified product package roadmap. Added: projects/roadmaps/proposed-package-roadmap.txt =================================================================== --- projects/roadmaps/proposed-package-roadmap.txt (rev 0) +++ projects/roadmaps/proposed-package-roadmap.txt 2011-06-04 03:00:06 UTC (rev 24801) @@ -0,0 +1,132 @@ +Proposed Package Roadmap + +I've been thinking about how we can simplify our product list and get +back to focusing on what we're good at producing. At the same time, +getting more people involved in each others products can get us back +to the idea we had at the 2010 Potsdam meeting where we had primary and +secondary developers for each product. + +I propose we radically simplify our packages to the following four, for +all operating systems we support: + +1. tor-client. This is the tor browser bundle. +2. tor-relay. This is the tor binary with geoipdb, pre-configured as +a non-exit relay. +3. tor-exit-relay. This is the tor binary with geoipdb, pre-configured +as an exit relay. +4. tor-bridge. This is the tor binary with geoipdb, pre-configured as +a publishing bridge. + +Why? + +We support a dizzying array of packages for an ever increasing number of +operating systems. Some packages you install, some are setup via native +operating system packaging systems, some are just download and run. +Developing a standard set of packages that contain the same things on +different OSes should be possible. Users currently have to configure +their software in varying ways, and then interact with their operating +system and network devices to help the Tor network. We should make it +very easy to get tor running as the user wishes. + +It would make the user choice clear. "I want to run tor as" can be +answered by which package they download and install. There is minimal +configuration to be done, and the packages should just work 'out of the +box'. + +This could also reduce support load. Instead of supporting a billion +apps and configs that may or may not be as anonymous/private as TBB, we +just support TBB. TBB becomes the focus on making it as zero-footprint +and anonymous as possible. + +(Where does this leave TAILS? If one wants to 'torify' everything, then +use TAILS; in a virtual machine, natively, whatever. If downloading TBB +sucks, downloading TAILS would be horrible. thandy updater for TAILS, +or does that defeat the point of a read-only OS?) + +What does this mean practically for each major operating system we +support? + +Microsoft Windows + +1. tor-client. The same TBB we ship today. +2. tor-relay. Vidalia and tor pre-configured as a non-exit relay. Look +at the current bridge-by-default bundle, just change the vidalia.conf to +be a non-exit relay. +3. tor-exit-relay. Vidalia and tor pre-configured as an exit relay. Look +at the current bridge-by-default bundle, just change the vidalia.conf to +be an exit relay. +4. tor-bridge. Vidalia and tor pre-configured as a bridge. Look +at the current bridge-by-default bundle. + +Apple OS X + +1. tor-client. The same TBB we ship today. +2. tor-relay. Vidalia and tor pre-configured as a non-exit relay. +Using TBB portable tor and vidalia, ship a vidalia.conf to be a non-exit +relay. +3. tor-exit-relay. Vidalia and tor pre-configured as an exit relay. +Using TBB portable tor and vidalia, ship a vidalia.conf to be an exit +relay. +4. tor-bridge. Vidalia and tor pre-configured as a bridge. +Using TBB portable tor and vidalia, ship a vidalia.conf to be a bridge. + +GNU/Linux (deb and rpm) + +1. tor-client. The same TBB we ship today. +2. tor-relay. Create tor-relay.(deb|rpm) that includes geoipdb and a +pre-configured torrc that is for a non-exit relay. +3. tor-exit-relay. Create tor-exit-relay.(deb|rpm) that includes geoipdb and a +pre-configured torrc that is for an exit relay. +4. tor-bridge. Create tor-bridge.(deb|rpm) that includes geoipdb and a +pre-configured torrc that is for a bridge. + +Obvious issues (to me) + +1. If a user wants to run both a tor-client and +tor-(relay|exit-relay|bridge) on the same host, we run into port +conflicts. At a minimum, the tor socks port, 9050 and control port, +9051 show up right away. For the tor-(relay|exit-relay|bridge) +packages, one can disable the socks port altogether, and just leave the +control port. I believe there is some work to make vidalia and tor +negotiate a control port number and choose that, assuming nothing else +uses it. This could be true for tor-* on start. It can default to +9050/9051, but if already taken, pick the next free port for socks and +control. + +Alternatively, each package chooses a different socksport/control port +combination. + +2. Users will still run into firewalls, NAT routers, and the like while +trying to get their tor relay working. This is the same situation we +have now, but it grossly simplifies the ability to get tor working. +Step 1: install tor package of your choice +Step 2: fight with your firewall/nat port-forwards +If we get upnp working in tor itself, this may or may not make it easier +for the users. + +3. The conversion from legacy to new packaging could be a mess. Relay +operators used to doing things one way will have to change. Users used +to installing tor and then configuring their apps will have to adjust. + +4. Installing a new tbb for every new release sucks, especially in +places with little bandwidth. Getting thandy working would solve this +issue. Having standardized packages for tor-clients may also make +thandy deployment easier, as it's the same software in each package, +just different binaries. + +5. The *BSD ports system would need to create different ports, or offer +make options that enable the different configs for non-exit, exit, and +bridge relay. This is also true for fink/macports. + +Of course, users should be able to create their own packages, based on +our published packaging scripts. + +Conclusion + +While a migration to a new set of packages could be painful, the world +after the flag day would get easier and easier over time. The package +sets are simplified, nearly all of our problems with configuring tor as +a relay or bridge go away, and it simplifies product management to +defined channels. We can then focus on security, anonymity, and +usability fixes for each of the defined channels. Improvements are +pushed out across all operating systems for each channel. Property changes on: projects/roadmaps/proposed-package-roadmap.txt ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:eol-style + native

1 0

← Newer
1
...
61
62
63
64
65
66
67
...
72
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits June 2011