aboutsummaryrefslogtreecommitdiffstats
path: root/packages/torouter-web/src
diff options
context:
space:
mode:
authorJacob Appelbaum <jacob@appelbaum.net>2011-08-17 19:31:22 +0200
committerJacob Appelbaum <jacob@appelbaum.net>2011-08-17 19:31:22 +0200
commit57e54f969b840546925d16ceceb130a0f3927140 (patch)
treec2a498d35477d81161783e5eb8e7be726eebc0b0 /packages/torouter-web/src
parent702600566d00c495c418631cd64ee99839fea5a0 (diff)
parent525766e515148f9da5e78d39d1905264a4d14bad (diff)
downloadtorouter-57e54f969b840546925d16ceceb130a0f3927140.tar.gz
torouter-57e54f969b840546925d16ceceb130a0f3927140.zip
Merge branch 'master' of ssh://git-rw.torproject.org/torouter
Diffstat (limited to 'packages/torouter-web/src')
-rw-r--r--packages/torouter-web/src/config.py1
-rw-r--r--packages/torouter-web/src/runui.py2
-rw-r--r--packages/torouter-web/src/static/main.css14
-rw-r--r--packages/torouter-web/src/tui/controllers/tor.py14
-rw-r--r--packages/torouter-web/src/tui/utils/parsing.py21
-rw-r--r--packages/torouter-web/src/tui/views/torstatus.html4
6 files changed, 50 insertions, 6 deletions
diff --git a/packages/torouter-web/src/config.py b/packages/torouter-web/src/config.py
index 8fd716d..15057df 100644
--- a/packages/torouter-web/src/config.py
+++ b/packages/torouter-web/src/config.py
@@ -12,4 +12,5 @@ globals = {}
authinfo = ("test", "test")
interfaces_file = os.getcwd() + "/../torouter-prep/configs/interfaces"
+torrc_file = os.getcwd() + "/../torouter-prep/configs/torrc"
diff --git a/packages/torouter-web/src/runui.py b/packages/torouter-web/src/runui.py
index 3d2dfc8..80836b3 100644
--- a/packages/torouter-web/src/runui.py
+++ b/packages/torouter-web/src/runui.py
@@ -20,7 +20,7 @@ urls = (
'/network/wired', 'tui.controllers.network.wired',
'/network/status', 'tui.controllers.network.status',
'/tor', 'tui.controllers.tor.status',
- '/tor/config', 'tui.controllers.tor.config',
+ '/tor/config', 'tui.controllers.tor.torrc',
'/logout', 'tui.controllers.main.logout'
)
# '/wizard/([0-9a-f]{1,2})?', 'tui.controllers.wizard.step',
diff --git a/packages/torouter-web/src/static/main.css b/packages/torouter-web/src/static/main.css
index 5626e92..34e26cf 100644
--- a/packages/torouter-web/src/static/main.css
+++ b/packages/torouter-web/src/static/main.css
@@ -35,3 +35,17 @@ div.header ul#submenu li {
font-size: 15px;
}
+/* More specific stuff */
+#torrc {
+list-style: none;
+line-height: 2em;
+}
+
+#torrc em {
+font-weight: bold;
+font-style: normal;
+}
+
+
+
+
diff --git a/packages/torouter-web/src/tui/controllers/tor.py b/packages/torouter-web/src/tui/controllers/tor.py
index d07cb71..af8678c 100644
--- a/packages/torouter-web/src/tui/controllers/tor.py
+++ b/packages/torouter-web/src/tui/controllers/tor.py
@@ -1,22 +1,28 @@
import web
import view, config
from view import render
-from tui.utils import session
+from tui.utils import session, parsing
"""
The main Tor status page
"""
class status:
def GET(self):
- return render.base(render.torstatus())
+ trc = parsing.torrc(config.torrc_file)
+ trc.parse()
+ output = trc.html_output()
+ return render.base(render.torstatus(output,config.torrc_file))
def POST(self):
- return render.base(render.torstatus())
+ trc = parsing.torrc(config.torrc_file)
+ trc.parse()
+ output = trc.html_output()
+ return render.base(render.torstatus(output,config.torrc_file))
"""
Tor configuration page
"""
-class config:
+class torrc:
def update_config(self, data):
return True
diff --git a/packages/torouter-web/src/tui/utils/parsing.py b/packages/torouter-web/src/tui/utils/parsing.py
index e9ccc83..6acf988 100644
--- a/packages/torouter-web/src/tui/utils/parsing.py
+++ b/packages/torouter-web/src/tui/utils/parsing.py
@@ -74,6 +74,27 @@ class interfaces:
else:
print "%s %s" % (item[0],item[1])
+class torrc:
+ def __init__(self,filename):
+ self.fp = open(filename, "r")
+ self.parsed = []
+
+ def parse(self):
+ for line in self.fp.readlines():
+ if line.startswith("#") or line == "":
+ continue
+ else:
+ self.parsed.append(line)
+
+ def html_output(self):
+ output = "<ul id=\"torrc\">"
+ for line in self.parsed:
+ if line != "\n":
+ output += "<li><em>%s</em> %s</li>" % (line.split(" ")[0], " ".join(line.split(" ")[1:]))
+ output += "</ul>"
+ print output
+ return output
+
#interfaces_file = os.getcwd() + "/../../../torouter-prep/configs/interfaces"
#itfc = interfaces(interfaces_file)
#itfc.parse()
diff --git a/packages/torouter-web/src/tui/views/torstatus.html b/packages/torouter-web/src/tui/views/torstatus.html
index ed83531..27b2888 100644
--- a/packages/torouter-web/src/tui/views/torstatus.html
+++ b/packages/torouter-web/src/tui/views/torstatus.html
@@ -1 +1,3 @@
-The main Tor status page
+$def with (content, torrc)
+<h2>This is the content of $:torrc</h2>
+$:content