- tor-commits - lists.torproject.org

[arm/master] Added support for multiple menu levels.
by atagar＠torproject.org 04 Jun '11

04 Jun '11

commit 46a1023c71f395c62a37a30c13e14db7b851640a Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Tue May 31 02:31:23 2011 +0500 Added support for multiple menu levels. Once the menus have "dropped-down", handling of subsequent "levels" followed the same logical steps. Therefore *SecondLevel() methods have been replaced by *NLevel() equivalents. If a parent item is selected using any of the selection keys, its children are brought up instead of doing nothing. --- src/cli/menu.py | 192 +++++++++++++++++++++++++++++++++++--------------- src/util/menuItem.py | 6 +-- 2 files changed, 136 insertions(+), 62 deletions(-) diff --git a/src/cli/menu.py b/src/cli/menu.py index 69538e0..8ce97c4 100644 --- a/src/cli/menu.py +++ b/src/cli/menu.py @@ -8,7 +8,7 @@ import cli.controller import popups from util import log, panel, uiTools, menuItem -TOPLEVEL, SECONDLEVEL = range(2) +PARENTLEVEL, TOPLEVEL = (-1, 0) class Menu(): """Displays a popup menu and sends keys to appropriate panels""" @@ -22,23 +22,61 @@ class Menu(): menuItem.MenuItem(label="Clear" , callback=self._callbackDefault), menuItem.MenuItem(label="Save" , callback=self._callbackDefault), menuItem.MenuItem(label="Filter" , callback=self._callbackDefault), - menuItem.MenuItem(label="Duplicates" , callback=self._callbackDefault),)), + menuItem.MenuItem(label="Duplicates" , children=( + menuItem.MenuItem(label="Hidden" , callback=self._callbackDefault), + menuItem.MenuItem(label="Visible" , callback=self._callbackDefault),)) + )), menuItem.MenuItem(label="View" , children=( menuItem.MenuItem(label="Graph" , callback=self._callbackDefault), menuItem.MenuItem(label="Connections" , callback=self._callbackDefault), menuItem.MenuItem(label="Configuration" , callback=self._callbackDefault), menuItem.MenuItem(label="Configuration File" , callback=self._callbackDefault),)), menuItem.MenuItem(label="Graph" , children=( - menuItem.MenuItem(label="Stats" , callback=self._callbackDefault), - menuItem.MenuItem(label="Size" , callback=self._callbackDefault), - menuItem.MenuItem(label="Update Interval" , callback=self._callbackDefault), - menuItem.MenuItem(label="Bounds" , callback=self._callbackDefault),)), + menuItem.MenuItem(label="Stats" , children=( + menuItem.MenuItem(label="Bandwidth" , callback=self._callbackDefault), + menuItem.MenuItem(label="Connections" , callback=self._callbackDefault), + menuItem.MenuItem(label="Resources" , callback=self._callbackDefault), + )), + menuItem.MenuItem(label="Size" , children=( + menuItem.MenuItem(label="Increase" , callback=self._callbackDefault), + menuItem.MenuItem(label="Decrease" , callback=self._callbackDefault), + )), + menuItem.MenuItem(label="Update Interval" , children=( + menuItem.MenuItem(label="Each second" , callback=self._callbackDefault), + menuItem.MenuItem(label="5 seconds" , callback=self._callbackDefault), + menuItem.MenuItem(label="30 seconds" , callback=self._callbackDefault), + menuItem.MenuItem(label="1 minute" , callback=self._callbackDefault), + menuItem.MenuItem(label="30 minutes" , callback=self._callbackDefault), + menuItem.MenuItem(label="Hourly" , callback=self._callbackDefault), + menuItem.MenuItem(label="Daily" , callback=self._callbackDefault), + )), + menuItem.MenuItem(label="Bounds" , children=( + menuItem.MenuItem(label="Local Max" , callback=self._callbackDefault), + menuItem.MenuItem(label="Global Max" , callback=self._callbackDefault), + menuItem.MenuItem(label="Tight" , callback=self._callbackDefault), + )),)), menuItem.MenuItem(label="Connections" , children=( - menuItem.MenuItem(label="Identity" , callback=self._callbackDefault), - menuItem.MenuItem(label="Resolver" , callback=self._callbackDefault), + menuItem.MenuItem(label="Identity" , children=( + menuItem.MenuItem(label="IP" , callback=self._callbackDefault), + menuItem.MenuItem(label="Fingerprints" , callback=self._callbackDefault), + menuItem.MenuItem(label="Nicknames" , callback=self._callbackDefault), + )), + menuItem.MenuItem(label="Resolver" , children=( + menuItem.MenuItem(label="auto" , callback=self._callbackDefault), + menuItem.MenuItem(label="proc" , callback=self._callbackDefault), + menuItem.MenuItem(label="netstat" , callback=self._callbackDefault), + menuItem.MenuItem(label="ss" , callback=self._callbackDefault), + menuItem.MenuItem(label="lsof" , callback=self._callbackDefault), + menuItem.MenuItem(label="sockstat" , callback=self._callbackDefault), + menuItem.MenuItem(label="sockstat (bsd)" , callback=self._callbackDefault), + menuItem.MenuItem(label="procstat (bsd)" , callback=self._callbackDefault), + )), menuItem.MenuItem(label="Sort Order" , callback=self._callbackDefault),)), menuItem.MenuItem(label="Configuration" , children=( - menuItem.MenuItem(label="Comments" , callback=self._callbackDefault), + menuItem.MenuItem(label="Comments" , children=( + menuItem.MenuItem(label="Hidden" , callback=self._callbackDefault), + menuItem.MenuItem(label="Visible" , callback=self._callbackDefault), + )), menuItem.MenuItem(label="Reload" , callback=self._callbackDefault), menuItem.MenuItem(label="Reset Tor" , callback=self._callbackDefault),)) )) @@ -67,15 +105,12 @@ class Menu(): key = control.getScreen().getch() if key == curses.KEY_RIGHT: - if len(self._selection) == 1: - self._moveTopLevelRight(width) + self._moveTopLevelRight(width) elif key == curses.KEY_LEFT: - if len(self._selection) == 1: - self._moveTopLevelLeft(width) + self._moveTopLevelLeft(width) elif key == curses.KEY_DOWN: - if len(self._selection) == 1: - self._dropSecondLevel() - break + self._showNLevel() + break elif uiTools.isSelectionKey(key): self._handleEvent() break @@ -87,6 +122,21 @@ class Menu(): index = self._first[TOPLEVEL] + self._selection[TOPLEVEL] return self._rootItem.getChildren()[index] + def _getCurrentItem(self, level=0): + item = self._rootItem + if level == 0: + sums = [sum(values) for values in zip(self._first, self._selection)] + else: + sums = [sum(values) for values in zip(self._first[:level], self._selection[:level])] + + for index in sums: + if item.isParent(): + item = item.getChildren()[index] + else: + break + + return item + def _calculateTopLevelWidths(self, width=0): labels = [menuItem.getLabel() for menuItem in self._rootItem.getChildren()] @@ -119,6 +169,33 @@ class Menu(): return printable if printable else parent.getChildrenCount() + def _calculateNLevelWidths(self, level=0): + parent = self._getCurrentItem(level) + + if parent.isLeaf(): + return 0 + + labels = [menuItem.getLabel() for menuItem in parent.getChildren()] + + labelwidth = max(map(len, labels)) + + return labelwidth + + def _calculateNLevelHeights(self, height=0, level=0): + control = cli.controller.getController() + height, _ = control.getScreen().getmaxyx() + topSize = sum(stickyPanel.getHeight() for stickyPanel in control.getStickyPanels()) + height = height - topSize + + parent = self._getCurrentItem(level) + + if parent.isLeaf(): + return 0 + + printable = min(height - 4, parent.getChildrenCount()) + + return printable if printable else parent.getChildrenCount() + def _moveTopLevelRight(self, width): _, printable = self._calculateTopLevelWidths(width) @@ -165,12 +242,17 @@ class Menu(): popup.addch(top, left, curses.ACS_VLINE) left = left + 1 - def _dropSecondLevel(self): + def _showNLevel(self): self._first.append(0) self._selection.append(0) - labelwidth = self._calculateSecondLevelWidths() - printable = self._calculateSecondLevelHeights() + parent = self._getCurrentItem(level=PARENTLEVEL) + + if parent.isLeaf(): + return + + labelwidth = self._calculateNLevelWidths(level=PARENTLEVEL) + printable = self._calculateNLevelHeights(level=PARENTLEVEL) toplabelwidth, _ = self._calculateTopLevelWidths() left = (toplabelwidth + 2) * self._selection[TOPLEVEL] @@ -183,7 +265,7 @@ class Menu(): popup.win.erase() popup.win.box() - self._drawSecondLevel(popup, width, height) + self._drawNLevel(popup, width, height) popup.win.refresh() @@ -191,9 +273,12 @@ class Menu(): key = control.getScreen().getch() if key == curses.KEY_DOWN: - self._moveSecondLevelDown(height) + self._moveNLevelDown(height) elif key == curses.KEY_UP: - self._moveSecondLevelUp(height) + self._moveNLevelUp(height) + elif key == curses.KEY_RIGHT: + self._showNLevel() + break elif uiTools.isSelectionKey(key): self._handleEvent() self._first.pop() @@ -203,64 +288,57 @@ class Menu(): finally: popups.finalize() - def _drawSecondLevel(self, popup, width, height): - printable = self._calculateSecondLevelHeights() - parent = self._getCurrentTopLevelItem() - children = parent.getChildren()[self._first[SECONDLEVEL]:self._first[SECONDLEVEL] + printable] - - toplabelwidth, _ = self._calculateTopLevelWidths(width) + def _drawNLevel(self, popup, width, height): + printable = self._calculateNLevelHeights(level=PARENTLEVEL) + parent = self._getCurrentItem(level=PARENTLEVEL) + children = parent.getChildren()[self._first[PARENTLEVEL]:self._first[PARENTLEVEL] + printable] top = 1 left = 1 for (index, item) in enumerate(children): - labelformat = curses.A_STANDOUT if index == self._selection[SECONDLEVEL] else curses.A_NORMAL + labelformat = curses.A_STANDOUT if index == self._selection[PARENTLEVEL] else curses.A_NORMAL popup.addstr(top, left, item.getLabel(), labelformat) top = top + 1 - def _moveSecondLevelDown(self, height): - printable = self._calculateSecondLevelHeights() - parent = self._getCurrentTopLevelItem() + def _moveNLevelDown(self, height): + printable = self._calculateNLevelHeights(level=PARENTLEVEL) + parent = self._getCurrentItem(level=PARENTLEVEL) - if self._selection[SECONDLEVEL] < printable - 1: - self._selection[SECONDLEVEL] = self._selection[SECONDLEVEL] + 1 + if self._selection[PARENTLEVEL] < printable - 1: + self._selection[PARENTLEVEL] = self._selection[PARENTLEVEL] + 1 else: - self._selection[SECONDLEVEL] = 0 + self._selection[PARENTLEVEL] = 0 if printable < parent.getChildrenCount(): - self._first[SECONDLEVEL] = (self._first[SECONDLEVEL] + printable) % parent.getChildrenCount() + self._first[PARENTLEVEL] = (self._first[PARENTLEVEL] + printable) % parent.getChildrenCount() - if self._first[SECONDLEVEL] + self._selection[SECONDLEVEL] == parent.getChildrenCount(): - self._first[SECONDLEVEL] = 0 - self._selection[SECONDLEVEL] = 0 + if self._first[PARENTLEVEL] + self._selection[PARENTLEVEL] == parent.getChildrenCount(): + self._first[PARENTLEVEL] = 0 + self._selection[PARENTLEVEL] = 0 - def _moveSecondLevelUp(self, height): + def _moveNLevelUp(self, height): printable = self._calculateSecondLevelHeights() - parent = self._getCurrentTopLevelItem() + parent = self._getCurrentItem(level=PARENTLEVEL) - if self._selection[SECONDLEVEL] > 0: - self._selection[SECONDLEVEL] = self._selection[SECONDLEVEL] - 1 + if self._selection[PARENTLEVEL] > 0: + self._selection[PARENTLEVEL] = self._selection[PARENTLEVEL] - 1 else: - if self._first[SECONDLEVEL] == 0: - self._first[SECONDLEVEL] = ((parent.getChildrenCount() / printable) * printable) % parent.getChildrenCount() + if self._first[PARENTLEVEL] == 0: + self._first[PARENTLEVEL] = ((parent.getChildrenCount() / printable) * printable) % parent.getChildrenCount() else: - self._first[SECONDLEVEL] = abs(self._first[SECONDLEVEL] - printable) % parent.getChildrenCount() - self._selection[SECONDLEVEL] = parent.getChildrenCount() - self._first[SECONDLEVEL] - 1 + self._first[PARENTLEVEL] = abs(self._first[PARENTLEVEL] - printable) % parent.getChildrenCount() + self._selection[PARENTLEVEL] = parent.getChildrenCount() - self._first[PARENTLEVEL] - 1 - if self._selection[SECONDLEVEL] > printable: - self._selection[SECONDLEVEL] = printable - 1 + if self._selection[PARENTLEVEL] > printable: + self._selection[PARENTLEVEL] = printable - 1 def _handleEvent(self): - item = self._rootItem - sums = [sum(values) for values in zip(self._first, self._selection)] - - for index in sums: - if item.isParent(): - item = item.getChildren()[index] - else: - break + item = self._getCurrentItem() if item.isLeaf(): item.select() + else: + self._showNLevel() def _callbackDefault(self, item): log.log(log.NOTICE, "%s selected" % item.getLabel()) diff --git a/src/util/menuItem.py b/src/util/menuItem.py index 4800a0f..3dbf922 100644 --- a/src/util/menuItem.py +++ b/src/util/menuItem.py @@ -5,11 +5,10 @@ Menu Item class, used by the drop-down menus class MenuItem(): """Contains title, callback handler and possible children""" - def __init__(self, label=None, callback=None, children=[], parent=None): + def __init__(self, label=None, callback=None, children=[]): self._label = label self._callback = callback self._children = children - self._parent = parent def getLabel(self): return self._label @@ -23,9 +22,6 @@ class MenuItem(): def getChildren(self): return self._children - def getParent(self): - return self._parent - def getChildrenCount(self): return len(self._children)

1 0

[arm/master] fix: Remove calculateSecondLevel*() methods.
by atagar＠torproject.org 04 Jun '11

04 Jun '11

commit f7375855453621fed4919021853bdab5ec017fd6 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Tue May 31 02:38:07 2011 +0500 fix: Remove calculateSecondLevel*() methods. --- src/cli/menu.py | 23 +---------------------- 1 files changed, 1 insertions(+), 22 deletions(-) diff --git a/src/cli/menu.py b/src/cli/menu.py index 8ce97c4..5a51797 100644 --- a/src/cli/menu.py +++ b/src/cli/menu.py @@ -148,27 +148,6 @@ class Menu(): return (labelwidth, printable) - def _calculateSecondLevelWidths(self): - parent = self._getCurrentTopLevelItem() - - labels = [menuItem.getLabel() for menuItem in parent.getChildren()] - - labelwidth = max(map(len, labels)) - - return labelwidth - - def _calculateSecondLevelHeights(self, height=0): - control = cli.controller.getController() - height, _ = control.getScreen().getmaxyx() - topSize = sum(stickyPanel.getHeight() for stickyPanel in control.getStickyPanels()) - height = height - topSize - - parent = self._getCurrentTopLevelItem() - - printable = min(height - 4, parent.getChildrenCount()) - - return printable if printable else parent.getChildrenCount() - def _calculateNLevelWidths(self, level=0): parent = self._getCurrentItem(level) @@ -317,7 +296,7 @@ class Menu(): self._selection[PARENTLEVEL] = 0 def _moveNLevelUp(self, height): - printable = self._calculateSecondLevelHeights() + printable = self._calculateNLevelHeights(level=PARENTLEVEL) parent = self._getCurrentItem(level=PARENTLEVEL) if self._selection[PARENTLEVEL] > 0:

1 0

[arm/master] Minor readability improvements.
by atagar＠torproject.org 04 Jun '11

04 Jun '11

commit 69de93464909606a930451a626fbe54fc50ca387 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Wed Jun 1 16:13:26 2011 +0500 Minor readability improvements. --- src/cli/menu.py | 29 +++++++++++++++++------------ 1 files changed, 17 insertions(+), 12 deletions(-) diff --git a/src/cli/menu.py b/src/cli/menu.py index 9aadf8d..da45309 100644 --- a/src/cli/menu.py +++ b/src/cli/menu.py @@ -119,7 +119,7 @@ class Menu(): elif key == curses.KEY_LEFT: self._moveTopLevelLeft(width) elif key == curses.KEY_DOWN: - self._showNLevel() + self._cascadeNLevel() break elif key == 27: break @@ -130,6 +130,14 @@ class Menu(): finally: popups.finalize() + def _appendLevel(self): + self._first.append(0) + self._selection.append(0) + + def _removeLevel(self): + self._first.pop() + self._selection.pop() + def _getCurrentTopLevelItem(self): index = self._first[TOPLEVEL] + self._selection[TOPLEVEL] return self._rootItem.getChildren()[index] @@ -233,15 +241,14 @@ class Menu(): popup.addch(top, left, curses.ACS_VLINE) left = left + 1 - def _showNLevel(self): - self._first.append(0) - self._selection.append(0) - - parent = self._getCurrentItem(level=PARENTLEVEL) + def _cascadeNLevel(self): + parent = self._getCurrentItem() if parent.isLeaf(): return + self._appendLevel() + labelwidth = self._calculateNLevelWidths(level=PARENTLEVEL) printable = self._calculateNLevelHeights(level=PARENTLEVEL) @@ -271,16 +278,14 @@ class Menu(): elif key == curses.KEY_UP: self._moveNLevelUp(height) elif key == curses.KEY_RIGHT: - self._showNLevel() + self._cascadeNLevel() break elif key == 27: - self._first.pop() - self._selection.pop() + self._removeLevel() break elif uiTools.isSelectionKey(key): self._handleEvent() - self._first.pop() - self._selection.pop() + self._removeLevel() break finally: @@ -345,7 +350,7 @@ class Menu(): if item.isLeaf(): item.select() else: - self._showNLevel() + self._cascadeNLevel() def _callbackDefault(self, item): log.log(log.NOTICE, "%s selected" % item.getLabel())

1 0

[arm/master] Next top-level item is dropped down in case right/left arrow keys
by atagar＠torproject.org 04 Jun '11

04 Jun '11

commit 5ffd3b0506cc6acb618456ae276dd0238c1e3936 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Wed Jun 1 17:06:27 2011 +0500 Next top-level item is dropped down in case right/left arrow keys are pressed on leaf submenus. In order to let the controller redraw before next top-level item is dropped down, "menu keys" are calculated and returned back to the controller. The controller overrides its key so that menu is redrawn, redraws all other panels and sends back the "menu keys" to the new menu instance. This maintains the illusion of top-level drop-down moving right/left while screen is cleared and redrawn once in between. --- src/cli/controller.py | 6 +++++- src/cli/menu.py | 36 +++++++++++++++++++++++++++++++----- 2 files changed, 36 insertions(+), 6 deletions(-) diff --git a/src/cli/controller.py b/src/cli/controller.py index 25c3051..d073312 100644 --- a/src/cli/controller.py +++ b/src/cli/controller.py @@ -477,6 +477,8 @@ def drawTorMonitor(stdscr, startTime): # main draw loop overrideKey = None # uses this rather than waiting on user input isUnresponsive = False # flag for heartbeat responsiveness check + + menuKeys = [] while True: displayPanels = control.getDisplayPanels() @@ -514,7 +516,9 @@ def drawTorMonitor(stdscr, startTime): control.setPaused(not control.isPaused()) elif key == ord('m') or key == ord('M'): menu = cli.menu.Menu() - menu.showMenu() + menuKeys = menu.showMenu(keys=menuKeys) + if menuKeys != []: + overrideKey = ord('m') 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 index da45309..29b6f82 100644 --- a/src/cli/menu.py +++ b/src/cli/menu.py @@ -99,7 +99,10 @@ class Menu(): else: self._rootItem = DEFAULT_ROOT - def showMenu(self): + def showMenu(self, keys=[]): + keys.reverse() + returnkeys = [] + popup, width, height = popups.init(height=3) if popup: try: @@ -112,14 +115,18 @@ class Menu(): popup.win.refresh() control = cli.controller.getController() - key = control.getScreen().getch() + + if keys == []: + key = control.getScreen().getch() + else: + key = keys.pop() if key == curses.KEY_RIGHT: self._moveTopLevelRight(width) elif key == curses.KEY_LEFT: self._moveTopLevelLeft(width) elif key == curses.KEY_DOWN: - self._cascadeNLevel() + cascaded, returnkeys = self._cascadeNLevel() break elif key == 27: break @@ -130,6 +137,8 @@ class Menu(): finally: popups.finalize() + return returnkeys + def _appendLevel(self): self._first.append(0) self._selection.append(0) @@ -245,7 +254,7 @@ class Menu(): parent = self._getCurrentItem() if parent.isLeaf(): - return + return (False, []) self._appendLevel() @@ -261,6 +270,7 @@ class Menu(): self._moveNLevelDown(height) if popup.win: + returnkeys = [] try: while True: popup.win.erase() @@ -278,7 +288,19 @@ class Menu(): elif key == curses.KEY_UP: self._moveNLevelUp(height) elif key == curses.KEY_RIGHT: - self._cascadeNLevel() + cascaded, returnkeys = self._cascadeNLevel() + if cascaded == False: + index = self._first[TOPLEVEL] + self._selection[TOPLEVEL] + 1 + for i in range(index): + returnkeys.append(curses.KEY_RIGHT) + returnkeys.append(curses.KEY_DOWN) + break + elif key == curses.KEY_LEFT: + index = self._first[TOPLEVEL] + self._selection[TOPLEVEL] - 1 + index = index % self._rootItem.getChildrenCount() + for i in range(index): + returnkeys.append(curses.KEY_RIGHT) + returnkeys.append(curses.KEY_DOWN) break elif key == 27: self._removeLevel() @@ -291,6 +313,10 @@ class Menu(): finally: popups.finalize() + return (True, returnkeys) + + return (False, []) + def _drawNLevel(self, popup, width, height): printable = self._calculateNLevelHeights(level=PARENTLEVEL) parent = self._getCurrentItem(level=PARENTLEVEL)

1 0

[arm/master] Controller page isn't changed in case the required panel isn't currently
by atagar＠torproject.org 04 Jun '11

04 Jun '11

commit a2937170af8f17ff048cccc1093776f174467352 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Wed Jun 1 17:12:35 2011 +0500 Controller page isn't changed in case the required panel isn't currently being displayed. --- src/cli/menu.py | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/src/cli/menu.py b/src/cli/menu.py index 29b6f82..beceb01 100644 --- a/src/cli/menu.py +++ b/src/cli/menu.py @@ -407,8 +407,6 @@ class Menu(): return False def _callbackSet(self, panel, attr, value, key=None): - self._callbackView(panel) - control = cli.controller.getController() panel = control.getPanel(panel) @@ -427,8 +425,6 @@ class Menu(): break def _callbackPressKey(self, panel, key): - self._callbackView(panel) - control = cli.controller.getController() panel = control.getPanel(panel) panel.handleKey(key)

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