Merge lp:~aj00200/anonplus/bug-927447 into lp:anonplus

[aj00200]

Fixed bug #927447 in the web UI reply code.

Fixed bug #927447 in the web UI reply code.

[aj00200 (aj00200)]

review: Approve

[aj00200 (aj00200)]

It seems that this is a branch of the wrong code for merging into lp:anonplus.

review: Disapprove

[aj00200 (aj00200)]

I merged r219 on the branch which is the needed patch to fix this bug.

=== modified file 'src/libs/friends.py'
--- src/libs/friends.py	2012-01-24 22:39:48 +0000
+++ src/libs/friends.py	2012-02-06 05:10:23 +0000
@@ -130,12 +130,13 @@
     def connect(self):
         '''Connect to the friend'''
         self.wconnection.connect()
+        self.connected = True
 
     def send(self, data, system=0):
         '''Send data to the friend. This will try to establish a connection, if
         not yet connected.
         '''
-        if self.wconnection == None:
+        if not self.connected:
             self.connect()
         message = self.encryption.encrypt(data)
         self.wconnection.send(message)
@@ -178,12 +179,34 @@
     }''' % (self.name, self.keyid, self.ip, self.port, self.tunnel_type)
 
     def __decrypt(self):
+        '''Use this friend object's encryption object to decrypt the
+        data stored in self.data.
+        '''
         self.data = self.encryption.decrypt(self.data)
-        print('Decrypted data: %s' % self.data)
+        broadcast('logthis', 'Decrypted data: %s' % self.data, level = 0)
 
     def __str__(self):
         return '<friend %s on %s:%i with id %s>' % (
                 self.name, self.ip, self.port, self.keyid)
+                
+def identify(indata, tunnel):
+    '''Identify what the source IP of an incomming packet is based on the
+    packet that is sent. Please see the friend-identification blueprint:
+    https://blueprints.launchpad.net/anonplus/+spec/friend-identification
+    '''
+    nodekey = libs.encryption.rsa.Encryption(libs.config['nodekey'])
+    data = nodekey.decrypt(indata)
+    packets, leftovers = parse_packets(data)
+    packet = packets[0]
+
+    # Collect information from the packet
+    src_key = packet.key
+    # TODO: get IP address out of packet fields
+
+    friend = get_friend_by_key(src_key)
+    friend.wconnection = tunnel
+
+    # TODO: use the key property to reply 0x0002
 
 
 ## API section
@@ -261,4 +284,4 @@
     try:
         del libs.globals['friends'][keyid]
     except:
-        broadcast('logthis', 'Friend %s does not exist.' % keyid)
\ No newline at end of file
+        broadcast('logthis', 'Friend %s does not exist.' % keyid)

=== modified file 'src/libs/socks.py'
--- src/libs/socks.py	2011-12-18 22:29:14 +0000
+++ src/libs/socks.py	2012-02-06 05:10:23 +0000
@@ -59,10 +59,11 @@
 		return repr(self.value)
 
 class Socks5Error(ProxyError):
-	def __init__(self, value):
+	def __init__(self, value, errno = -1):
 		self.value = value
+		self.errno = errno
 	def __str__(self):
-		return repr(self.value)
+		return 'errno=%s, %s' % (self.errno, self.value)
 
 class Socks4Error(ProxyError):
 	def __init__(self, value):
@@ -233,7 +234,7 @@
 			# Connection failed
 			self.close()
 			if ord(resp[1])<=8:
-				raise Socks5Error(ord(resp[1]),_generalerrors[ord(resp[1])])
+				raise Socks5Error(_generalerrors[ord(resp[1])], errno=ord(resp[1]))
 			else:
 				raise Socks5Error(9,_generalerrors[9])
 		# Get the bound address/port

=== modified file 'src/tunnels/base.py'
--- src/tunnels/base.py	2011-10-30 18:06:34 +0000
+++ src/tunnels/base.py	2012-02-06 05:10:23 +0000
@@ -5,7 +5,7 @@
     '''
     def connect(self, address, port):
         '''Use this tunnel to connect to `address`:`port`'''
-        pass
+        return True # Method not overwritten. No connection needed?
 
     def disconnect(self, nodeid):
         '''Disconnect from a node at `nodeid`'''

=== modified file 'src/tunnels/directudp.py'
--- src/tunnels/directudp.py	2012-01-11 19:34:49 +0000
+++ src/tunnels/directudp.py	2012-02-06 05:10:23 +0000
@@ -29,11 +29,6 @@
         self.sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
         self.sock.connect((node.ip, node.port))
     
-        self.data = ""
-        self.packages = {}
-        
-        
-        #handshake is ended in friends.handle_packets
     def send(self, message):
         broadcast('logthis', 'Sending: ' + message, level = 0)
         self.sock.send(message)
@@ -41,8 +36,6 @@
     def disconnect(self):
         '''Do nothing, UDP does not need to close any connections.'''
         pass
-
-    
     
 class Listener(libs.threadmanager.Thread):
     '''Listen for UDP connections on our port'''
@@ -52,17 +45,31 @@
         self.sock.bind(('', port)) # TODO: bind other addresses
         self.sock.setblocking(False)
 
+        self.registered = {}
+
+    def register(self, ip, connection):
+        '''Hook and IP address to a connection object so that when we
+        get a packet from a known IP, we can send it to the proper
+        connection object.
+        '''
+        self.registered[ip] = connection
+
     def run(self):
         while not self._stop.isSet():
             try:
                 data = self.sock.recvfrom(4096)
                 ip = data[1][0]
-                friend = libs.friends.get_friend_by_ip(ip)
-                friend.connection = self.sock
-                friend.data += data[0] # Send data to the Friend object
-                broadcast('logthis', 'UDP recv: %s' % data[0], level = 0)
-                friend.parse_packets()
-                friend.connection = self.sock
+
+                if ip in self.registered:
+                    self.registered[ip].get_data(data)
+
+                else:
+                    friend = libs.friends.get_friend_by_ip(ip)
+                    friend.connection = self.sock
+                    friend.data += data[0] # Send data to the Friend object
+                    broadcast('logthis', 'UDP recv: %s' % data[0], level = 0)
+                    friend.parse_packets()
+                    friend.connection = self.sock
                 
             except socket.error as error:
                 if error.errno == 11: # No new messages
@@ -75,6 +82,7 @@
         
         
 def start():
+    '''Start the tunnel. Create a Listener thread and start it.'''
     listener = Listener()
     listener.start()
     libs.threadmanager.register(listener)

=== modified file 'src/tunnels/tor.py'
--- src/tunnels/tor.py	2012-01-24 22:39:48 +0000
+++ src/tunnels/tor.py	2012-02-06 05:10:23 +0000
@@ -1,6 +1,8 @@
 '''Tunnel to use to connect to other nodes over Tor.'''
-import socks
+from libs import socks
+import socket
 import libs.threadmanager
+from libs.events import broadcast
 
 class Tunnel(object):
     '''Base Tunnel class. Should be subclassed by other tunnels for
@@ -8,30 +10,63 @@
     '''
     def __init__(self, node):
         self.node = node
-        # TODO: need to get node onion address and port
+        self.is_connected = False
+
+        self.connection = Connection(node)
     
     def connect(self):
         '''Use this tunnel to connect to `address`:`port`'''
-        self.connection = Connection(self.node)
+        success = self.connection.connect()
+        if success:
+            self.is_connected = True
+        else:
+            self.is_connected = False
+        return True
+    
+    def connected(self):
+        '''Returns True if this tunnel is connected.'''
+        return self.is_connected
 
     def disconnect(self, nodeid):
         '''Disconnect from a node at `nodeid`'''
         pass
         
     def send(self, message):
-        self.connection.send(message)
+        '''Check if this Tunnel is connected. If it is, try to send the
+        message parameter to the other node.
+        '''
+        if self.connected:
+            self.connection.send(message)
+        else:
+            self.connect()
+            
+        if self.connected:
+            self.connection.send(message)
+        else:
+            return False
 
 class Connection(object):
     '''A class to store a connection to a peer'''
     def __init__(self, node):
+        # node.ip must not be unicode because of this bug in python-socks:
+        #   https://code.google.com/p/httplib2/issues/detail?id=179
+        self.node = (str(node.ip), node.port)
         self.sock = socks.socksocket()
-        self.sock.setproxy(socks.PROXY_TYPE_SOCKS5, addr='localhost',
+        self.sock.setproxy(socks.PROXY_TYPE_SOCKS5, addr='127.0.0.1',
                            port=9050, rdns=True)
-        # node.ip must not be unicode because of this bug in python-socks:
-        #   https://code.google.com/p/httplib2/issues/detail?id=179
-        self.sock.connect((str(node.ip), node.port))
+        
+    def connect(self):        
+        try:
+            self.sock.connect(self.node)
+
+        except socks.Socks5Error as error:
+            if error.errno == 2: # not connected
+                return False
+
+        return True
         
     def send(self, message):
+        '''Send a message to the connected node over Tor.'''
         broadcast('logthis', 'Sending: ' + message, level = 0)
         self.sock.send(message)
 
@@ -41,20 +76,23 @@
     port unless otherwise set. We have no way to associate which friend
     this is so it must be added to the handshake somehow.
     '''
-    def __init__(self, port=1337):
+    def __init__(self, port=4040):
         super(Listener, self).__init__()
         self.sock = socket.socket()
         self.sock.bind(('localhost', port))
         self.sock.listen(2)
-        self.sock.setblocking(False)
 
     def run(self):
         while not self._stop.isSet():
             # TODO: find out which friend this is without IP address
-            connection = self.sock.accept() # TODO: this blocks!!!!!
+            connection = self.sock.accept() # TODO: blocks shutdown
+            print('----------------------------------')
+            print('Got a connection on the Tor tunnel')
             # TODO: convert this connection to a Connection object!!
+            # TODO: send this connection to libs.friends
 
 def start():
+    '''Start the Tor tunnel and create a Listener object.'''
     listener = Listener()
     listener.start()
-    libs.threadmanager.register(listener)
\ No newline at end of file
+    libs.threadmanager.register(listener)

=== modified file 'src/uis/web/handler.py'
--- src/uis/web/handler.py	2012-01-15 16:14:19 +0000
+++ src/uis/web/handler.py	2012-02-06 05:10:23 +0000
@@ -107,7 +107,7 @@
             connection.send_response(301)
             connection.send_header('Location', 'http://localhost:7777/')
             connection.end_headers()
-            connections.wfile.write('Redirecting')
+            connection.wfile.write('Redirecting')
         elif path == '/friends.html':
             connection.send_response(200)
             connection.send_header('Content-type', 'text/html')

=== modified file 'src/vomun.py'
--- src/vomun.py	2012-01-24 22:39:48 +0000
+++ src/vomun.py	2012-02-06 05:10:23 +0000
@@ -2,15 +2,16 @@
 '''Start the program. Load segments of the program that need to be
 started and run them.
 '''
-import atexit, time, webbrowser, sys
+import atexit, webbrowser, sys
 
-from libs import config, events, friends, globals, logs
+from libs import config, events, friends, globals
 from libs import storage, threadmanager
 from libs.morado import morado
 import tunnels
 import uis.web.manager
 
 def start():
+    '''Setup various services and classes used by the software.'''
     morado.start()
     friends.load_friends()
     storage.manager.start()
@@ -21,6 +22,7 @@
     atexit.register(cleanup)
 
 def cleanup():
+    '''Cleanup the program on close.'''
     events.broadcast('got_shutdown')
     threadmanager.killall()
     threadmanager.close_sockets()
@@ -28,6 +30,7 @@
     config.save()
 
 def main():
+    '''The main program. Parse command line arguments and run.'''
     print globals['anon+']['banner'] % (globals['anon+']['VERSION'],
         globals['anon+']['BUILD'])
     print("== Warning! ==")