- tor-commits - lists.torproject.org

[arm/master] Python black-magic to connect lists with liststores.
by atagar＠torproject.org 11 Aug '11

11 Aug '11

commit df0e5d0ca45f0c304fab0362ce7327cea0b2df5e Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Sat Jul 23 06:20:05 2011 +0500 Python black-magic to connect lists with liststores. The ConfigPanel.confImportantContents is patched via Python property() in such a way that assigning lists to it automatically updates the liststore. The setter/getter is really ugly and hard to read, and serves only the purpose that the CLI portion does not need to be changed at all for this to work. Once library/CLI/GUI is decoupled this obscure piece of dark magic shall be gone for good. --- src/gui/configPanel.py | 25 +++++++++++++++++++++++-- src/util/gtkTools.py | 7 +++++++ 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/src/gui/configPanel.py b/src/gui/configPanel.py index 46f9aa7..e0fb8dc 100644 --- a/src/gui/configPanel.py +++ b/src/gui/configPanel.py @@ -23,14 +23,35 @@ class ConfContents(gtkTools.ListWrapper): return row -class ConfigPanel(CliConfigPanel): +class ConfigPanel(object, CliConfigPanel): def __init__(self, builder): CliConfigPanel.__init__(self, None, State.TOR) self.builder = builder listStore = self.builder.get_object('liststore_config') - self.confImportantContents = ConfContents(self.confImportantContents, listStore) + self._confImportantContents = ConfContents(self.confImportantContents, listStore) + + self.confImportantContents = self.confImportantContents[-5:] + + @property + def confImportantContents(self): + if hasattr(self, '_confImportantContents'): + return self._confImportantContents + else: + return [] + + @confImportantContents.setter + def confImportantContents(self, value): + if hasattr(self, '_confImportantContents'): + try: + self._confImportantContents.empty() + except AttributeError: + pass + for entry in value: + self._confImportantContents.append(entry) + else: + self._confImportantContents = value def pack_widgets(self): treeView = self.builder.get_object('treeview_config') diff --git a/src/util/gtkTools.py b/src/util/gtkTools.py index 2d00621..5ad321e 100644 --- a/src/util/gtkTools.py +++ b/src/util/gtkTools.py @@ -32,6 +32,10 @@ class ListWrapper(object): self.container.append(entry) gobject.idle_add(self.__model_append, entry) + def empty(self): + self.container = [] + gobject.idle_add(self.__model_clear) + def __str__(self): return str(self.container) @@ -62,6 +66,9 @@ class ListWrapper(object): row = self._create_row_from_entry(entry) self.model.append(row) + def __model_clear(self): + self.model.clear() + def __model_del(self, key): treeIter = self.model.get_iter(key) self.model.remove(treeIter)

1 0

[arm/master] Renamed graphStats to graphPanel for consistency (with cli).
by atagar＠torproject.org 11 Aug '11

11 Aug '11

commit 2192eab911b7b521b790a5c444c17422f1714d59 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Sun Jul 17 04:17:17 2011 +0500 Renamed graphStats to graphPanel for consistency (with cli). --- src/gui/graphing/__init__.py | 2 +- src/gui/graphing/bandwidthStats.py | 6 +- src/gui/graphing/graphPanel.py | 142 ++++++++++++++++++++++++++++++++++++ src/gui/graphing/graphStats.py | 142 ------------------------------------ 4 files changed, 146 insertions(+), 146 deletions(-) diff --git a/src/gui/graphing/__init__.py b/src/gui/graphing/__init__.py index acc8645..06d08ea 100644 --- a/src/gui/graphing/__init__.py +++ b/src/gui/graphing/__init__.py @@ -2,5 +2,5 @@ Graphs. """ -__all__ = ["graphStats", "bandwidthStats"] +__all__ = ["graphPanel", "bandwidthStats"] diff --git a/src/gui/graphing/bandwidthStats.py b/src/gui/graphing/bandwidthStats.py index 04dfda8..f4aa490 100644 --- a/src/gui/graphing/bandwidthStats.py +++ b/src/gui/graphing/bandwidthStats.py @@ -9,12 +9,12 @@ import gtk from TorCtl import TorCtl from starter import CONFIG -from gui.graphing import graphStats +from gui.graphing import graphPanel from util import uiTools, torTools -class BandwidthStats(graphStats.GraphStats): +class BandwidthStats(graphPanel.GraphPanel): def __init__(self, builder): - graphStats.GraphStats.__init__(self, builder) + graphPanel.GraphPanel.__init__(self, builder) conn = torTools.getConn() if not conn.isAlive(): diff --git a/src/gui/graphing/graphPanel.py b/src/gui/graphing/graphPanel.py new file mode 100644 index 0000000..16370b4 --- /dev/null +++ b/src/gui/graphing/graphPanel.py @@ -0,0 +1,142 @@ +""" +Base class for implementing graphing functionality. +""" + +import random +import sys + +from collections import deque + +import gobject +import gtk + +from TorCtl import TorCtl +from util import gtkTools, uiTools, torTools + +from cagraph.ca_graph import CaGraph +from cagraph.axis.xaxis import CaGraphXAxis +from cagraph.axis.yaxis import CaGraphYAxis +from cagraph.ca_graph_grid import CaGraphGrid +from cagraph.series.area import CaGraphSeriesArea + +GRAPH_INTERVAL = 30 + +class GraphPanel(TorCtl.PostEventListener): + def __init__(self, builder): + TorCtl.PostEventListener.__init__(self) + + self.builder = builder + + self.graphs = { 'primary' : None, 'secondary' : None } + self.data = { + 'primary' : deque([0.0] * GRAPH_INTERVAL), + 'secondary' : deque([0.0] * GRAPH_INTERVAL)} + + self.total = {'primary': 0.0, 'secondary' : 0.0} + self.ticks = {'primary': 0, 'secondary' : 0} + + def pack_widgets(self): + self._pack_graph_widget('primary') + self._pack_graph_widget('secondary') + + gobject.timeout_add(1000, self.draw_graph, 'primary') + gobject.timeout_add(1000, self.draw_graph, 'secondary') + gobject.timeout_add(1000, self.update_labels, 'primary') + gobject.timeout_add(1000, self.update_labels, 'secondary') + + def _pack_graph_widget(self, name): + graph = CaGraph() + graph.set_size_request(200, 200) + + placeholder = self.builder.get_object('placeholder_graph_%s' % name) + placeholder.pack_start(graph) + + xaxis = CaGraphXAxis(graph) + yaxis = CaGraphYAxis(graph) + + xaxis.min = 0 + xaxis.max = GRAPH_INTERVAL - 1 + xaxis.axis_style.draw_labels = False + yaxis.axis_style.label_color = (0, 0, 0) + + graph.axiss.append(xaxis) + graph.axiss.append(yaxis) + + series = CaGraphSeriesArea(graph, 0, 1) + + theme = gtkTools.Theme() + primaryColor = theme.colors['normal'] + secondaryColor = theme.colors['insensitive'] + colors = { 'primary' : (primaryColor.red_float, primaryColor.green_float, primaryColor.blue_float, 0.5), + 'secondary' : (secondaryColor.red_float, secondaryColor.green_float, secondaryColor.blue_float, 0.5) } + + series.style.point_radius = 0.0 + series.style.line_color = colors[name] + series.style.fill_color = colors[name] + + graph.seriess.append(series) + graph.grid = CaGraphGrid(graph, 0, 1) + + self.graphs[name] = graph + + return graph + + def get_graph_data(self, name): + packed_data = [] + + for (index, value) in enumerate(self.data[name]): + packed_data.append((index, value)) + + return packed_data + + def is_graph_data_zero(self, name): + data = self.data[name] + return len(data) == map(int, data).count(0) + + def draw_graph(self, name): + graph = self.graphs[name] + data = self.get_graph_data(name) + + graph.seriess[0].data = data + if not self.is_graph_data_zero(name): + + for (index, axis) in enumerate(graph.axiss): + if axis.type != 'xaxis': + graph.auto_set_yrange(index) + + graph.queue_draw() + + return True + + def update_labels(self, name): + avg = 0 + + try: + avg = self.total[name] / float(self.ticks[name]) + except ZeroDivisionError: + pass + + msg = "avg: %s/s, total: %s" % (uiTools.getSizeLabel(avg, 2, isBytes=False), + uiTools.getSizeLabel(self.total[name], 2)) + label = self.builder.get_object('label_graph_%s_bottom' % name) + label.set_text(msg) + + return True + + def update_header(self, name, msg): + label = self.builder.get_object('label_graph_%s_top' % name) + label.set_text(msg) + + def _processEvent(self, primary, secondary): + values = {'primary' : primary, 'secondary' : secondary} + + for name in ('primary', 'secondary'): + # right shift and store kbytes in left-most location + self.data[name].rotate(1) + self.data[name][0] = values[name] / 1024 + + self.total[name] = self.total[name] + values[name] + + if values[name] > 0: + self.ticks[name] = self.ticks[name] + 1 + diff --git a/src/gui/graphing/graphStats.py b/src/gui/graphing/graphStats.py deleted file mode 100644 index c7d24bb..0000000 --- a/src/gui/graphing/graphStats.py +++ /dev/null @@ -1,142 +0,0 @@ -""" -Base class for implementing graphing functionality. -""" - -import random -import sys - -from collections import deque - -import gobject -import gtk - -from TorCtl import TorCtl -from util import gtkTools, uiTools, torTools - -from cagraph.ca_graph import CaGraph -from cagraph.axis.xaxis import CaGraphXAxis -from cagraph.axis.yaxis import CaGraphYAxis -from cagraph.ca_graph_grid import CaGraphGrid -from cagraph.series.area import CaGraphSeriesArea - -GRAPH_INTERVAL = 30 - -class GraphStats(TorCtl.PostEventListener): - def __init__(self, builder): - TorCtl.PostEventListener.__init__(self) - - self.builder = builder - - self.graphs = { 'primary' : None, 'secondary' : None } - self.data = { - 'primary' : deque([0.0] * GRAPH_INTERVAL), - 'secondary' : deque([0.0] * GRAPH_INTERVAL)} - - self.total = {'primary': 0.0, 'secondary' : 0.0} - self.ticks = {'primary': 0, 'secondary' : 0} - - def pack_widgets(self): - self._pack_graph_widget('primary') - self._pack_graph_widget('secondary') - - gobject.timeout_add(1000, self.draw_graph, 'primary') - gobject.timeout_add(1000, self.draw_graph, 'secondary') - gobject.timeout_add(1000, self.update_labels, 'primary') - gobject.timeout_add(1000, self.update_labels, 'secondary') - - def _pack_graph_widget(self, name): - graph = CaGraph() - graph.set_size_request(200, 200) - - placeholder = self.builder.get_object('placeholder_graph_%s' % name) - placeholder.pack_start(graph) - - xaxis = CaGraphXAxis(graph) - yaxis = CaGraphYAxis(graph) - - xaxis.min = 0 - xaxis.max = GRAPH_INTERVAL - 1 - xaxis.axis_style.draw_labels = False - yaxis.axis_style.label_color = (0, 0, 0) - - graph.axiss.append(xaxis) - graph.axiss.append(yaxis) - - series = CaGraphSeriesArea(graph, 0, 1) - - theme = gtkTools.Theme() - primaryColor = theme.colors['normal'] - secondaryColor = theme.colors['insensitive'] - colors = { 'primary' : (primaryColor.red_float, primaryColor.green_float, primaryColor.blue_float, 0.5), - 'secondary' : (secondaryColor.red_float, secondaryColor.green_float, secondaryColor.blue_float, 0.5) } - - series.style.point_radius = 0.0 - series.style.line_color = colors[name] - series.style.fill_color = colors[name] - - graph.seriess.append(series) - graph.grid = CaGraphGrid(graph, 0, 1) - - self.graphs[name] = graph - - return graph - - def get_graph_data(self, name): - packed_data = [] - - for (index, value) in enumerate(self.data[name]): - packed_data.append((index, value)) - - return packed_data - - def is_graph_data_zero(self, name): - data = self.data[name] - return len(data) == map(int, data).count(0) - - def draw_graph(self, name): - graph = self.graphs[name] - data = self.get_graph_data(name) - - graph.seriess[0].data = data - if not self.is_graph_data_zero(name): - - for (index, axis) in enumerate(graph.axiss): - if axis.type != 'xaxis': - graph.auto_set_yrange(index) - - graph.queue_draw() - - return True - - def update_labels(self, name): - avg = 0 - - try: - avg = self.total[name] / float(self.ticks[name]) - except ZeroDivisionError: - pass - - msg = "avg: %s/s, total: %s" % (uiTools.getSizeLabel(avg, 2, isBytes=False), - uiTools.getSizeLabel(self.total[name], 2)) - label = self.builder.get_object('label_graph_%s_bottom' % name) - label.set_text(msg) - - return True - - def update_header(self, name, msg): - label = self.builder.get_object('label_graph_%s_top' % name) - label.set_text(msg) - - def _processEvent(self, primary, secondary): - values = {'primary' : primary, 'secondary' : secondary} - - for name in ('primary', 'secondary'): - # right shift and store kbytes in left-most location - self.data[name].rotate(1) - self.data[name][0] = values[name] / 1024 - - self.total[name] = self.total[name] + values[name] - - if values[name] > 0: - self.ticks[name] = self.ticks[name] + 1 -

1 0

[arm/master] fix: correcting default control socket path
by atagar＠torproject.org 11 Aug '11

11 Aug '11

commit ee6721e5dfc19fd360313d4630efc1e3591b9364 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Aug 11 08:18:05 2011 -0700 fix: correcting default control socket path According to dererk the default control socket path is "/var/run/tor/control" rather than "/var/lib/tor/control" (the path mentioned by Peter). --- armrc.sample | 2 +- src/cli/headerPanel.py | 2 +- src/starter.py | 2 +- src/util/torTools.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/armrc.sample b/armrc.sample index 22fb903..e19d4c4 100644 --- a/armrc.sample +++ b/armrc.sample @@ -2,7 +2,7 @@ startup.controlPassword startup.interface.ipAddress 127.0.0.1 startup.interface.port 9051 -startup.interface.socket /var/lib/tor/control +startup.interface.socket /var/run/tor/control startup.blindModeEnabled false startup.events N3 startup.dataDirectory ~/.arm diff --git a/src/cli/headerPanel.py b/src/cli/headerPanel.py index d5ce332..0e8c018 100644 --- a/src/cli/headerPanel.py +++ b/src/cli/headerPanel.py @@ -41,7 +41,7 @@ VERSION_STATUS_COLORS = {"new": "blue", "new in series": "blue", "obsolete": "re DEFAULT_CONFIG = {"startup.interface.ipAddress": "127.0.0.1", "startup.interface.port": 9051, - "startup.interface.socket": "/var/lib/tor/control", + "startup.interface.socket": "/var/run/tor/control", "features.showFdUsage": False, "log.fdUsageSixtyPercent": log.NOTICE, "log.fdUsageNinetyPercent": log.WARN} diff --git a/src/starter.py b/src/starter.py index a148947..2bdc6d0 100644 --- a/src/starter.py +++ b/src/starter.py @@ -35,7 +35,7 @@ DEFAULT_CONFIG = os.path.expanduser("~/.arm/armrc") CONFIG = {"startup.controlPassword": None, "startup.interface.ipAddress": "127.0.0.1", "startup.interface.port": 9051, - "startup.interface.socket": "/var/lib/tor/control", + "startup.interface.socket": "/var/run/tor/control", "startup.blindModeEnabled": False, "startup.events": "N3", "startup.dataDirectory": "~/.arm", diff --git a/src/util/torTools.py b/src/util/torTools.py index 366deb0..39cb176 100644 --- a/src/util/torTools.py +++ b/src/util/torTools.py @@ -113,7 +113,7 @@ def loadConfig(config): # TODO: temporary code until this is added to torctl as part of... # https://trac.torproject.org/projects/tor/ticket/3638 -def connect_socket(socketPath="/var/lib/tor/control", ConnClass=TorCtl.Connection): +def connect_socket(socketPath="/var/run/tor/control", ConnClass=TorCtl.Connection): """ Connects to a unix domain socket available to controllers (set via tor's ControlSocket option). This raises an IOError if unable to do so.

1 0

[torouter/master] Add the base skeleton for the web user interface
by hellais＠torproject.org 11 Aug '11

11 Aug '11

commit 5f53648315b1ed94f263da7c13d1754073649e9c Author: Arturo Filastò <hellais(a)torproject.org> Date: Thu Aug 11 13:47:41 2011 +0200 Add the base skeleton for the web user interface --- packages/torouter-web/NOTES | 6 + packages/torouter-web/README | 13 ++- packages/torouter-web/config.py | 12 ++ packages/torouter-web/config.pyc | Bin 0 -> 228 bytes packages/torouter-web/runui.py | 29 +++++ packages/torouter-web/runui.pyc | Bin 0 -> 1271 bytes packages/torouter-web/tui/__init__.pyc | Bin 0 -> 142 bytes packages/torouter-web/tui/controllers/__init__.pyc | Bin 0 -> 154 bytes packages/torouter-web/tui/controllers/main.py | 14 +++ packages/torouter-web/tui/controllers/main.pyc | Bin 0 -> 855 bytes packages/torouter-web/tui/controllers/network.py | 108 ++++++++++++++++++++ packages/torouter-web/tui/controllers/network.pyc | Bin 0 -> 5261 bytes packages/torouter-web/tui/controllers/old/main.py | 11 ++ .../torouter-web/tui/controllers/old/status.py | 9 ++ .../torouter-web/tui/controllers/old/wizard.py | 81 +++++++++++++++ packages/torouter-web/tui/controllers/tor.py | 24 +++++ packages/torouter-web/tui/controllers/tor.pyc | Bin 0 -> 1419 bytes packages/torouter-web/tui/models/router_config.py | 19 ++++ packages/torouter-web/tui/views/base.html | 57 ++++++++++ packages/torouter-web/tui/views/firewall.html | 1 + packages/torouter-web/tui/views/index.html | 1 + packages/torouter-web/tui/views/main.html | 1 + packages/torouter-web/tui/views/saved.html | 8 ++ packages/torouter-web/tui/views/status.html | 1 + packages/torouter-web/tui/views/torconfig.html | 1 + packages/torouter-web/tui/views/torstatus.html | 1 + packages/torouter-web/tui/views/wired.html | 1 + packages/torouter-web/tui/views/wireless.html | 8 ++ packages/torouter-web/tui/views/wizard.html | 12 ++ packages/torouter-web/view.py | 10 ++ packages/torouter-web/view.pyc | Bin 0 -> 384 bytes 31 files changed, 427 insertions(+), 1 deletions(-) diff --git a/packages/torouter-web/NOTES b/packages/torouter-web/NOTES new file mode 100644 index 0000000..83656ab --- /dev/null +++ b/packages/torouter-web/NOTES @@ -0,0 +1,6 @@ +eth0 is internet +eth1 is private network + +http://wiki.debian.org/NetworkConfiguration + + diff --git a/packages/torouter-web/README b/packages/torouter-web/README index 0303fad..7a8c0fa 100644 --- a/packages/torouter-web/README +++ b/packages/torouter-web/README @@ -1 +1,12 @@ -This is where the web interface for Torouter will be packaged. +TUI - Tor web User Interface +---------------------------- + +This is the Tor web User Interface for the Torouter. + +It requires web.py: + git clone git://github.com/webpy/webpy.git + +To start the web server run: + python runui.py + +- Arturo Filasto' <hellais(a)torproject.org> diff --git a/packages/torouter-web/__init__.py b/packages/torouter-web/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/packages/torouter-web/config.py b/packages/torouter-web/config.py new file mode 100644 index 0000000..9b8f7a7 --- /dev/null +++ b/packages/torouter-web/config.py @@ -0,0 +1,12 @@ +# tui, Tor web UI +# by Arturo Filasto' <hellais(a)torproject.org> +# + +import web, os + +cache = False + +globals = {} + + + diff --git a/packages/torouter-web/config.pyc b/packages/torouter-web/config.pyc new file mode 100644 index 0000000..7eb9e48 Binary files /dev/null and b/packages/torouter-web/config.pyc differ diff --git a/packages/torouter-web/runui.py b/packages/torouter-web/runui.py new file mode 100644 index 0000000..5f27e4f --- /dev/null +++ b/packages/torouter-web/runui.py @@ -0,0 +1,29 @@ +# tui - Tor web UI +# by Arturo Filasto' <hellais(a)torproject.org> +# + +import web +import config +import tui.controllers + +from view import render + +urls = ( + '/', 'tui.controllers.main.index', +# '/config/(tor|router)', 'tui.controllers.main.config', + '/network', 'tui.controllers.network.main', + '/network/firewall', 'tui.controllers.network.firewall', + '/network/wireless', 'tui.controllers.network.wireless', + '/network/wired', 'tui.controllers.network.wired', + '/network/status', 'tui.controllers.network.status', + '/tor', 'tui.controllers.tor.status', + '/tor/config', 'tui.controllers.tor.config' + ) +# '/wizard/([0-9a-f]{1,2})?', 'tui.controllers.wizard.step', +# '/status', 'tui.controllers.status') + +if __name__ == "__main__": + app = web.application(urls, globals()) + app.internalerror = web.debugerror + app.run() + diff --git a/packages/torouter-web/runui.pyc b/packages/torouter-web/runui.pyc new file mode 100644 index 0000000..dc829b3 Binary files /dev/null and b/packages/torouter-web/runui.pyc differ diff --git a/packages/torouter-web/tui/__init__.py b/packages/torouter-web/tui/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/packages/torouter-web/tui/__init__.pyc b/packages/torouter-web/tui/__init__.pyc new file mode 100644 index 0000000..df02c3e Binary files /dev/null and b/packages/torouter-web/tui/__init__.pyc differ diff --git a/packages/torouter-web/tui/controllers/__init__.py b/packages/torouter-web/tui/controllers/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/packages/torouter-web/tui/controllers/__init__.pyc b/packages/torouter-web/tui/controllers/__init__.pyc new file mode 100644 index 0000000..8568b24 Binary files /dev/null and b/packages/torouter-web/tui/controllers/__init__.pyc differ diff --git a/packages/torouter-web/tui/controllers/main.py b/packages/torouter-web/tui/controllers/main.py new file mode 100644 index 0000000..2806467 --- /dev/null +++ b/packages/torouter-web/tui/controllers/main.py @@ -0,0 +1,14 @@ +import web +import view, config +from view import render + +""" +The main page for network configuration +""" +class index: + def GET(self): + return render.base(render.index()) + + def POST(self): + return render.base(render.index()) + diff --git a/packages/torouter-web/tui/controllers/main.pyc b/packages/torouter-web/tui/controllers/main.pyc new file mode 100644 index 0000000..8bd620b Binary files /dev/null and b/packages/torouter-web/tui/controllers/main.pyc differ diff --git a/packages/torouter-web/tui/controllers/network.py b/packages/torouter-web/tui/controllers/network.py new file mode 100644 index 0000000..33e7f27 --- /dev/null +++ b/packages/torouter-web/tui/controllers/network.py @@ -0,0 +1,108 @@ +import web +import view, config +from view import render + +""" +This function is used to generate the network +submenus. +""" +def menu(n): + a = [] + for i in range(0,5): + if i == n: + a.append("sel") + else: + a.append("") + print a + return """<ul> + <li><a href="/network" class="%s">Main</a></li> + <li><a href="/network/firewall" class="%s">Firewall</a></li> + <li><a href="/network/wireless" class="%s">Wireless</a></li> + <li><a href="/network/wired" class="%s">Wired</a></li> + <li><a href="/network/status" class="%s">Status</a></li> +</ul> +""" % tuple(a) + +""" +The main page for network configuration +""" +class main: + def GET(self): + return render.base(render.main(),menu(0)) + + def POST(self): + return render.base(render.main(),menu(0)) + +""" +The firewall configuration page +""" +class firewall: + def GET(self): + return render.base(render.firewall(),menu(1)) + + def POST(self): + return render.base(render.firewall(),menu(1)) + +""" +Wireless network configuration page +""" +class wireless: + def get_current_config(self): + conf = {'essid' : None, 'encryption' : None, 'key' : None} + + # XXX Dummy default config for testing purposes + # plugin here the actual code for config retreival + conf['essid'] = "Torouter" + conf['encryption'] = "WPA2" + conf['key'] = "ljdasjkbcuBH12389Ba" + + + return conf + + def build_form(self): + c = self.get_current_config() + ret_form = web.form.Form( + web.form.Textbox(name='essid', + description='Wireless ESSID', value=c['essid']), + web.form.Dropdown(name='enctype', args=['WPA2', 'WPA', 'WEP (not reccomended)', 'open'], + description='Wireless encryption scheme', value=c['encryption']), + web.form.Password(name='key', + description='key', value=c['key']), + web.form.Button('save') + ) + self.form = ret_form + + return True + + def update_config(self, data): + return True + + def GET(self): + if self.build_form(): + return render.base(render.wireless(self.form()),menu(2)) + + def POST(self): + self.update_config(None) + print web.input() + return render.base(render.saved(web.input()),menu(2)) + +""" +Wired network configuration page +""" +class wired: + def GET(self): + return render.base(render.wired(),menu(3)) + + def POST(self): + return render.base(render.wired(),menu(3)) + +""" +General status page, displays a bit more detail than main +""" +class status: + def GET(self): + return render.base(render.status(),menu(4)) + + def POST(self): + return render.base(render.status(),menu(4)) + diff --git a/packages/torouter-web/tui/controllers/network.pyc b/packages/torouter-web/tui/controllers/network.pyc new file mode 100644 index 0000000..0fa3453 Binary files /dev/null and b/packages/torouter-web/tui/controllers/network.pyc differ diff --git a/packages/torouter-web/tui/controllers/old/main.py b/packages/torouter-web/tui/controllers/old/main.py new file mode 100644 index 0000000..9127e72 --- /dev/null +++ b/packages/torouter-web/tui/controllers/old/main.py @@ -0,0 +1,11 @@ +import web + + +class index: + def GET(self): + return "index" + +class config: + def GET(self): + return "config" + diff --git a/packages/torouter-web/tui/controllers/old/status.py b/packages/torouter-web/tui/controllers/old/status.py new file mode 100644 index 0000000..05f0bf8 --- /dev/null +++ b/packages/torouter-web/tui/controllers/old/status.py @@ -0,0 +1,9 @@ +import web +import config + +from config import views +from web import form + +class status: + def GET(): + print "status" diff --git a/packages/torouter-web/tui/controllers/old/wizard.py b/packages/torouter-web/tui/controllers/old/wizard.py new file mode 100644 index 0000000..7b82df2 --- /dev/null +++ b/packages/torouter-web/tui/controllers/old/wizard.py @@ -0,0 +1,81 @@ +import web + +from web import form +from config import view + +class step: + cur_step = 1 + next_step = 2 + wiztext = [] + wizform = [] + + wiztext.append("Tor Configuration") + wizform.append(form.Form( + form.Textbox('Nickname', + form.notnull, description="Relay Nickname"), + form.Textbox('RelayBandwidthRate', + form.notnull, description="Relay Bandwidth Rate"), + form.Textbox('RelayBandwidthBurst', + form.notnull, description="Relay Bandwidth Burst"), + form.Textbox('ContactInfo', + form.notnull, description="Contact Info"), + form.Textbox('ExitPolicy', + form.notnull, description="Exit Policy"), + form.Button('Next Step') + )) + + wiztext.append("Wireless setup") + wizform.append(form.Form( + form.Textbox('essid', + form.notnull, description="Wireless ESSID"), + form.Textbox('mac', + form.notnull, description="MAC address"), + form.Textbox('whatever', + form.notnull, description="Wireless ESSID"), + form.Button('Next Step') + )) + + wiztext.append("") + wizform.append(form.Form( + form.Textbox('essid', + form.notnull, description="Wireless ESSID"), + form.Textbox('mac', + form.notnull, description="MAC address"), + form.Textbox('whatever', + form.notnull, description="Wireless ESSID"), + form.Button('Next Step') + )) + + wiztext.append("") + wizform.append(form.Form( + form.Textbox('essid', + form.notnull, description="Wireless ESSID"), + form.Textbox('mac', + form.notnull, description="MAC address"), + form.Textbox('whatever', + form.notnull, description="Wireless ESSID"), + form.Button('Next Step') + )) + + def GET(self, step): + if step: + self.cur_step = int(step) + self.next_step = int(step) + 1 + else: + self.cur_step = 1 + self.next_step = 2 + if len(self.wizform) < int(self.cur_step): + return "Done!" + return view.wizard(self.wizform[self.cur_step-1], self.wiztext[self.cur_step-1], self.cur_step, self.next_step) + + def POST(self, step): + x = web.input() + self.cur_step = int(step) + self.next_step = int(step) + 1 + if len(self.wizform) < int(self.cur_step): + return "Done!" + return view.wizard(self.wizform[self.cur_step-1], self.wiztext[self.cur_step-1], self.cur_step, self.next_step) + + + + diff --git a/packages/torouter-web/tui/controllers/tor.py b/packages/torouter-web/tui/controllers/tor.py new file mode 100644 index 0000000..3b6116f --- /dev/null +++ b/packages/torouter-web/tui/controllers/tor.py @@ -0,0 +1,24 @@ +import web +import view, config +from view import render + +""" +The main Tor status page +""" +class status: + def GET(self): + return render.base(render.torstatus()) + + def POST(self): + return render.base(render.torstatus()) + +""" +Tor configuration page +""" +class config: + def GET(self): + return render.base(render.torconfig()) + + def POST(self): + return render.base(render.torconfig()) + diff --git a/packages/torouter-web/tui/controllers/tor.pyc b/packages/torouter-web/tui/controllers/tor.pyc new file mode 100644 index 0000000..21724c4 Binary files /dev/null and b/packages/torouter-web/tui/controllers/tor.pyc differ diff --git a/packages/torouter-web/tui/models/router_config.py b/packages/torouter-web/tui/models/router_config.py new file mode 100644 index 0000000..e83f9aa --- /dev/null +++ b/packages/torouter-web/tui/models/router_config.py @@ -0,0 +1,19 @@ +import web +from config import db + +def new_config(conf): + db.insert('router_config', + essid=conf['essid'], + field1=conf['field1'], + field2=conf['field2'] + ) + + +def write_config(): + db.update('router_config', + essid=conf['essid'], + field1=conf['field1'], + field2=conf['field2'] + ) + + diff --git a/packages/torouter-web/tui/views/base.html b/packages/torouter-web/tui/views/base.html new file mode 100644 index 0000000..47091f8 --- /dev/null +++ b/packages/torouter-web/tui/views/base.html @@ -0,0 +1,57 @@ +$def with (page,submenu=None) + +<!html> + +<html> +<head> + <title>TUI - Tor Web User Interface</title> + <style type="text/css"> + body { + margin: 0; + border: 0; + padding: 0; + + } + + div.wrapper { + width: 800px; + margin: 0 auto; + } + + div.footer { + background-color: #CCC; + color: white; + } + + div.header { + background-color: #CCC; + color: white; + } + + ul#menu { + list-style: none; + + } + + </style> +</head> +<body> +<div id="header"> + <ul id="menu"> + <li><a href="/">Home</a></li> + <li><a href="/network">Network</a></li> + <li><a href="/tor">Tor</a></li> + </ul> + $:submenu +</div> + +<div class="wrapper"> +$:page +</div> + +<div class="footer"> +2011 - The Tor Project +</div> + +</body> +</html> diff --git a/packages/torouter-web/tui/views/firewall.html b/packages/torouter-web/tui/views/firewall.html new file mode 100644 index 0000000..c3a244d --- /dev/null +++ b/packages/torouter-web/tui/views/firewall.html @@ -0,0 +1 @@ +the firewall page diff --git a/packages/torouter-web/tui/views/index.html b/packages/torouter-web/tui/views/index.html new file mode 100644 index 0000000..3907d84 --- /dev/null +++ b/packages/torouter-web/tui/views/index.html @@ -0,0 +1 @@ +The main index diff --git a/packages/torouter-web/tui/views/main.html b/packages/torouter-web/tui/views/main.html new file mode 100644 index 0000000..dc503e7 --- /dev/null +++ b/packages/torouter-web/tui/views/main.html @@ -0,0 +1 @@ +the main page diff --git a/packages/torouter-web/tui/views/saved.html b/packages/torouter-web/tui/views/saved.html new file mode 100644 index 0000000..ba14488 --- /dev/null +++ b/packages/torouter-web/tui/views/saved.html @@ -0,0 +1,8 @@ +$def with (content) + +<ul> + +$for i in content.items(): + <li><em>$i[0]</em>: $i[1]</li> + +</ul> diff --git a/packages/torouter-web/tui/views/status.html b/packages/torouter-web/tui/views/status.html new file mode 100644 index 0000000..6a128dc --- /dev/null +++ b/packages/torouter-web/tui/views/status.html @@ -0,0 +1 @@ +the status page diff --git a/packages/torouter-web/tui/views/torconfig.html b/packages/torouter-web/tui/views/torconfig.html new file mode 100644 index 0000000..26bd228 --- /dev/null +++ b/packages/torouter-web/tui/views/torconfig.html @@ -0,0 +1 @@ +The main Tor config page diff --git a/packages/torouter-web/tui/views/torstatus.html b/packages/torouter-web/tui/views/torstatus.html new file mode 100644 index 0000000..ed83531 --- /dev/null +++ b/packages/torouter-web/tui/views/torstatus.html @@ -0,0 +1 @@ +The main Tor status page diff --git a/packages/torouter-web/tui/views/wired.html b/packages/torouter-web/tui/views/wired.html new file mode 100644 index 0000000..3a517d1 --- /dev/null +++ b/packages/torouter-web/tui/views/wired.html @@ -0,0 +1 @@ +the wired page diff --git a/packages/torouter-web/tui/views/wireless.html b/packages/torouter-web/tui/views/wireless.html new file mode 100644 index 0000000..48242bc --- /dev/null +++ b/packages/torouter-web/tui/views/wireless.html @@ -0,0 +1,8 @@ +$def with (form) + +<h2>Wireless configuration page</h2> + +<form action="" method="POST"> +$:form.render() +</form> + diff --git a/packages/torouter-web/tui/views/wizard.html b/packages/torouter-web/tui/views/wizard.html new file mode 100644 index 0000000..0890507 --- /dev/null +++ b/packages/torouter-web/tui/views/wizard.html @@ -0,0 +1,12 @@ +$def with (wiz_form, text, step, next_step) + +<h1>Step number $step</h1> + +$text + +<form action="/wizard/$next_step" method="POST"> +$:wiz_form.render() + +</form> + + diff --git a/packages/torouter-web/view.py b/packages/torouter-web/view.py new file mode 100644 index 0000000..639415a --- /dev/null +++ b/packages/torouter-web/view.py @@ -0,0 +1,10 @@ +import web +import config + +t_globals = dict( + datestr=web.datestr, + ) + +render = web.template.render('tui/views', cache=config.cache, globals=t_globals) +render._keywords['globals']['render'] = render + diff --git a/packages/torouter-web/view.pyc b/packages/torouter-web/view.pyc new file mode 100644 index 0000000..b8a529b Binary files /dev/null and b/packages/torouter-web/view.pyc differ

1 0

r24954: {} add my second nnedv presentation. (projects/presentations)
by Andrew Lewman 10 Aug '11

10 Aug '11

Author: phobos Date: 2011-08-10 20:18:25 +0000 (Wed, 10 Aug 2011) New Revision: 24954 Added: projects/presentations/2011-08-08-NNEDV-Sessions2.pdf projects/presentations/2011-08-08-NNEDV-Sessions2.tex Log: add my second nnedv presentation. Added: projects/presentations/2011-08-08-NNEDV-Sessions2.pdf =================================================================== (Binary files differ) Property changes on: projects/presentations/2011-08-08-NNEDV-Sessions2.pdf ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: projects/presentations/2011-08-08-NNEDV-Sessions2.tex =================================================================== --- projects/presentations/2011-08-08-NNEDV-Sessions2.tex (rev 0) +++ projects/presentations/2011-08-08-NNEDV-Sessions2.tex 2011-08-10 20:18:25 UTC (rev 24954) @@ -0,0 +1,90 @@ +\documentclass{beamer} +\mode<presentation> +%\usetheme{Boadilla} +\beamertemplatenavigationsymbolsempty +\title{NNEDV ToT9} +\author{Andrew Lewman \\ andrew(a)torproject.org} +\date{08 August 2011} +\begin{document} + +\begin{frame} +\maketitle +\begin{center} +\includegraphics[height=3cm]{./images/2009-tor-logo} +\end{center} +\end{frame} + +\begin{frame}[plain] + \begin{centering} + \pgfimage[height=\paperheight]{./images/1984first} + \par + \end{centering} +\end{frame} + +\frametitle{George Orwell was an optimist} +\begin{quotation} +\noindent \includegraphics[width=1cm]{./images/opquo}\quad Who controls the past, controls the future: who controls the present controls the past +\end{quotation} +\flushright --- George Orwell, Nineteen Eighty Four, 1949 +\end{frame} + +\begin{frame} +\frametitle{Internet Surveillance is getting more advanced} +\begin{center} +\includegraphics<1>[scale=0.5]{./images/procera-evolved-dpi} +\includegraphics<2>[scale=0.5]{./images/iran-ssl-dpi-26-seconds-to-death} +\includegraphics<3>[scale=0.6]{./images/2011-infoweek-comodo-hacker} +\includegraphics<4>[scale=0.6]{./images/al-jazeera-egypt-crackdown-US-co-ties} +\end{center} +\end{frame} + +\begin{frame}[plain] + \begin{centering} + \pgfimage[height=\paperheight]{./images/paco-primera-pagina-oleo-lienzo-110-x-150-cms-2008-red} + \par + \end{centering} +\end{frame} + +\begin{frame} +\frametitle{The Tor Project, Inc.} +\begin{Large} +501(c)(3) non-profit organization dedicated to the research and development of technologies for online anonymity and privacy +\end{Large} +\begin{center} +\includegraphics[height=5cm]{./images/2009-oval_sticker_new} +\end{center} +\end{frame} + +\begin{frame} +\frametitle{Tor hides communication patterns by relaying data through volunteer servers} +\begin{center} +\begin{overlayarea}{9cm}{6cm} +\only<1>{\includegraphics[width=9cm]{./images/tor-network}} +\only<2>{\includegraphics[width=9cm]{./images/tor-safe-selection}} +\only<3>{\includegraphics[width=9cm]{./images/tor-safe-path}} +\only<4>{\includegraphics[width=9cm]{./images/tor-keys1}} +\end{overlayarea} +\flushright +\tiny Diagram: Robert Watson +\end{center} +\end{frame} + +\begin{frame} +\frametitle{Thanks!} +\begin{LARGE} +Visit \url{https://www.torproject.org/} for more information, links, and ideas. +\end{LARGE} +\end{frame} + +\begin{frame} +\frametitle{Copyright \& Sources} +\begin{itemize} +\begin{small} +\item Internet surveillance, second image: http://www.informationweek.com/news/security/attacks/229400850 +\item Internet surveillance, third image: Al Jazeera, February 2011 +\item spring is in the air, Paco Pomet, http://pacopomet.wordpress.com/ +\end{small} +\end{itemize} +\end{frame} + +\end{document} Property changes on: projects/presentations/2011-08-08-NNEDV-Sessions2.tex ___________________________________________________________________ Added: svn:mime-type + text/x-tex

1 0

[torspec/master] Fixed EndLine for CONF_CHANGED event.
by nickm＠torproject.org 10 Aug '11

10 Aug '11

commit 74f21a8ef88c321b2e1146dee2bae1bb9548945f Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Tue Aug 9 18:54:10 2011 +0500 Fixed EndLine for CONF_CHANGED event. --- control-spec.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/control-spec.txt b/control-spec.txt index 4e42449..0b1649b 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -1900,7 +1900,7 @@ StartReplyLine = "650-CONF_CHANGED" CRLF MidReplyLine = "650-" KEYWORD ["=" VALUE] CRLF - EndReplyLine = "650-OK" + EndReplyLine = "650 OK" Tor configuration options have changed (such as via a SETCONF or RELOAD signal). KEYWORD and VALUE specify the configuration option that was changed.

1 0

[torspec/master] Added definition of CONF_CHANGED event.
by nickm＠torproject.org 10 Aug '11

10 Aug '11

commit 223656cdb130a8a0db0d6b7437cadd16d3297c9d Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Tue Aug 9 07:38:02 2011 +0500 Added definition of CONF_CHANGED event. --- control-spec.txt | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/control-spec.txt b/control-spec.txt index 160adf4..4e42449 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -1893,6 +1893,19 @@ [First added in 0.2.3.1-alpha] +4.1.17. Configuration changed + + The syntax is: + StartReplyLine *(MidReplyLine) EndReplyLine + + StartReplyLine = "650-CONF_CHANGED" CRLF + MidReplyLine = "650-" KEYWORD ["=" VALUE] CRLF + EndReplyLine = "650-OK" + + Tor configuration options have changed (such as via a SETCONF or RELOAD + signal). KEYWORD and VALUE specify the configuration option that was changed. + Undefined configuration options contain only the KEYWORD. + 5. Implementation notes 5.1. Authentication

1 0

[torspec/master] Merge remote-tracking branch 'krkahn/bug1692'
by nickm＠torproject.org 10 Aug '11

10 Aug '11

commit 9fdd1107f8cac126877ad936b960cf05b6092d24 Merge: 7b8a7fb 74f21a8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 10 15:07:30 2011 -0400 Merge remote-tracking branch 'krkahn/bug1692' control-spec.txt | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-)

1 0

[tor/master] Return if CONF_CHANGED isn't interesting.
by nickm＠torproject.org 10 Aug '11

10 Aug '11

commit 73f07c558b16db14e72b6b738dffd75a890a1001 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Tue Aug 9 15:28:17 2011 +0500 Return if CONF_CHANGED isn't interesting. --- src/or/control.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/or/control.c b/src/or/control.c index 706d871..8f3a488 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -4008,7 +4008,7 @@ control_event_conf_changed(smartlist_t *elements) int i; char *result; smartlist_t *lines; - if (smartlist_len(elements) == 0) { + if (!EVENT_IS_INTERESTING(EVENT_CONF_CHANGED) && smartlist_len(elements) == 0) { return 0; } lines = smartlist_create();

1 0

[tor/master] Fix condition reported by nickm.
by nickm＠torproject.org 10 Aug '11

10 Aug '11

commit 02a735dfa847e9cb7b78b58ef1f69d865e4d21bf Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Tue Aug 9 22:21:04 2011 +0500 Fix condition reported by nickm. --- src/or/control.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/or/control.c b/src/or/control.c index 8f3a488..afd0662 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -4008,7 +4008,7 @@ control_event_conf_changed(smartlist_t *elements) int i; char *result; smartlist_t *lines; - if (!EVENT_IS_INTERESTING(EVENT_CONF_CHANGED) && smartlist_len(elements) == 0) { + if (!EVENT_IS_INTERESTING(EVENT_CONF_CHANGED) || smartlist_len(elements) == 0) { return 0; } lines = smartlist_create();

1 0