Merge lp:~guydmann/anonplus/guydmann_dev into lp:anonplus

[Guy Mann]

bug fix for #938221 Old versions of PyCrypto do not have Crypto.version_info

refactoring of the uis/web/handler.py to use an array to store the list of requests available and moving the code for those requests into separate functions.

[aj00200 (aj00200)]

The code looks acceptable. The fix for bug #938221 is perfect. However, the additional web-ui code in r204 is not needed as the web-ui is being rewritten anyways.

I will try to include this new structure in the web-ui as I rewrite it.

Thanks for your help.

review: Approve

=== modified file 'src/setup.py'
--- src/setup.py	2012-02-22 00:45:53 +0000
+++ src/setup.py	2012-02-28 05:50:23 +0000
@@ -30,7 +30,7 @@
 
 # Check PyCrypto version basics - require v2.4.x or higher
 # The version in PyCrypto is incorrect. See bug #892944
-if Crypto.version_info[0] < 2 or Crypto.version_info[1] < 1:
+if not hasattr(Crypto,'version_info') or Crypto.version_info[0] < 2 or Crypto.version_info[1] < 1:
     raise Exception(_(
             'Please update PyCrypto: https://www.dlitz.net/software/pycrypto/'))
 
 
=== modified file 'src/uis/web/handler.py'
--- src/uis/web/handler.py	2012-02-09 01:53:56 +0000
+++ src/uis/web/handler.py	2012-02-28 05:50:23 +0000
@@ -29,41 +29,19 @@
         self.posts.insert(0, Post(name, sha256, post))
 
     def web_ui_request(self, path, connection):
-        if path == '/':
-            connection.send_response(200)
-            connection.send_header('Content-type',	'text/html')
-            connection.end_headers()
-            connection.wfile.write(uis.web.content.template.format(
-                    title = 'Anon+ News Feed',
-                    pagetitle = 'Anon+ News Feed',
-                    main = uis.web.content.post_box + self.__generate_news_feed(),
-                    sidecontent = self.__friends2html()
-            ))
-        elif path == '/global.css':
-            connection.send_response(200)
-            connection.send_header('Content-type',	'text/css')
-            connection.end_headers()
-            connection.wfile.write(uis.web.content.globalcss)
-        elif path == '/settings.html':
-            connection.send_response(200)
-            connection.send_header('Content-type',	'text/html')
-            connection.end_headers()
-            connection.wfile.write('Connections page')
-        elif path == '/shutdown.html':
-            connection.send_response(200)
-            connection.send_header('Content-type',	'text/html')
-            connection.end_headers()
-            print('Got shutdown request from web server')
-            connection.wfile.write(uis.web.content.template.format(
-                    title = 'Shutting down',
-                    pagetitle = 'Shutdown',
-                    main = 'We are quitting now. Threads are being killed.',
-                    sidecontent = 'Goodbye :)'
-            ))
-            libs.globals['running'] = False
-            libs.threadmanager.killall()
-            libs.threadmanager.close_sockets()
-        elif path.startswith('/make_post.cgi?'):
+        request_array = [['/','==','root'],['/global.css','==','global_css'], ['/friends.html', '==', 'friends_html'], ['/settings.html', '==', 'settings_html'], ['/shutdown.html','==','shutdown_html'], ['/make_post.cgi?',"<-",'make_post_cgi'], ['/forward.cgi?',"<-",'forward_cgi'], ['/reply.cgi?',"<-",'reply_cgi'], ['/add_friend.cgi?',"<-",'add_friend_cgi'], ['/keys.html', '==','keys_html']]
+        for request in request_array:
+            if request[1] == "==":
+                if path ==request[0]:
+                    getattr(self, request[2],self.__defaultFailure)(path, connection)
+            elif request[1] == "<-":
+                if path.startswith(request[0]):
+                    getattr(self, request[2],self.__defaultFailure)(path, connection)
+
+    def __defaultFailure(self, path, connection):	    
+            connection.wfile.write('unrecognized request')
+
+    def make_post_cgi(self, path, connection):
             parameters = unquote_plus(path.split('?')[-1]).split('&')
             for parameter in parameters:
                 item = parameter.split('=')
@@ -83,7 +61,45 @@
             connection.send_header('Location', 'http://localhost:7777/')
             connection.end_headers()
             connection.wfile.write('Redirecting')
-        elif path.startswith('/forward.cgi?'):
+
+    def shutdown_html(self, path, connection):
+            connection.send_response(200)
+            connection.send_header('Content-type',	'text/html')
+            connection.end_headers()
+            print('Got shutdown request from web server')
+            connection.wfile.write(uis.web.content.template.format(
+                    title = 'Shutting down',
+                    pagetitle = 'Shutdown',
+                    main = 'We are quitting now. Threads are being killed.',
+                    sidecontent = 'Goodbye :)'
+            ))
+            libs.globals['running'] = False
+            libs.threadmanager.killall()
+            libs.threadmanager.close_sockets()
+
+    def settings_html(self, path, connection):
+            connection.send_response(200)
+            connection.send_header('Content-type',	'text/html')
+            connection.end_headers()
+            connection.wfile.write('Connections page')
+
+
+    def forward_cgi(self, path, connection):
+            connection.send_response(200)
+            connection.send_header('Content-type',	'text/html')
+            connection.end_headers()
+            print('Got shutdown request from web server')
+            connection.wfile.write(uis.web.content.template.format(
+                    title = 'Shutting down',
+                    pagetitle = 'Shutdown',
+                    main = 'We are quitting now. Threads are being killed.',
+                    sidecontent = 'Goodbye :)'
+            ))
+            libs.globals['running'] = False
+            libs.threadmanager.killall()
+            libs.threadmanager.close_sockets()
+
+    def forward_cgi(self, path, connection):
             parameters = unquote_plus(path.split('?')[-1])
             post_hash = parameters.split('=')[-1]
 
@@ -103,12 +119,14 @@
             connection.send_header('Location', 'http://localhost:7777/')
             connection.end_headers()
             connection.wfile.write('Redirecting')
-        elif path.startswith('/reply.cgi?'):
+
+    def reply_cgi(self, path, connection):
             connection.send_response(301)
             connection.send_header('Location', 'http://localhost:7777/')
             connection.end_headers()
             connection.wfile.write('Redirecting')
-        elif path == '/friends.html':
+
+    def friends_html(self, path, connection):
             connection.send_response(200)
             connection.send_header('Content-type', 'text/html')
             connection.end_headers()
@@ -122,7 +140,9 @@
                         ),
                     sidecontent = self.__friends2html()
             ))
-        elif path.startswith('/add_friend.cgi?'):
+
+
+    def add_friend_cgi(self, path, connection):
             parameters = unquote_plus(path.split('?')[-1]).split('&')
             keydata = ''
             tunnel = ''
@@ -156,7 +176,9 @@
                         '<br />Key: %s' % result,
                     sidecontent = self.__friends2html()
             ))
-        elif path == '/keys.html':
+
+
+    def keys_html(self, path, connection):
             connection.send_response(200)
             connection.send_header('Content-type', 'text/html')
             connection.end_headers()
@@ -167,6 +189,23 @@
                     sidecontent = self.__friends2html()
             ))
 
+    def root(self,path,connection):
+            connection.send_response(200)
+            connection.send_header('Content-type',	'text/html')
+            connection.end_headers()
+            connection.wfile.write(uis.web.content.template.format(
+                    title = 'Anon+ News Feed',
+                    pagetitle = 'Anon+ News Feed',
+                    main = uis.web.content.post_box + self.__generate_news_feed(),
+                    sidecontent = self.__friends2html()
+            ))
+
+    def global_css(self,path,connection):
+            connection.send_response(200)
+            connection.send_header('Content-type',	'text/css')
+            connection.end_headers()
+            connection.wfile.write(uis.web.content.globalcss)
+
     def __friends2html(self):
         '''Convert our friends list into some nice HTML'''
         return uis.web.content.friends_box.format(