Merge branch 'stats-collection'

Author: cpacia

net/dos.py

@@ -8,16 +8,8 @@
 MALFORMATED = 110
 
 SCORES = {
-    PING: 0,
-    STUN: 0,
-    STORE: 0,
-    INV: 0,
-    VALUES: 0,
-    GET_LISTINGS: 0,
     FOLLOW: 0,
-    UNFOLLOW: 0,
-    RECONNECTIONS: 0,
-    MALFORMATED: 0
+    UNFOLLOW: 0
 }
 
 
@@ -28,54 +20,15 @@ def __init__(self, multiplexer, ban_time=86400):
         self.ban_time = ban_time
         self.peers = {}
         self.scoring_loop = task.LoopingCall(self.adjust_scores)
-        #self.scoring_loop.start(30, now=False)
+        self.scoring_loop.start(30, now=False)
         self.log = Logger(system=self)
 
     def process_message(self, peer, message):
-        if peer:
-            # disabled for now
-            return
         if peer[0] not in self.peers:
             self.peers[peer[0]] = SCORES.copy()
 
         try:
-            if message == 100:
-                self.peers[peer[0]][RECONNECTIONS] += 1
-                if self.peers[peer[0]][RECONNECTIONS] > 10:
-                    self.ban(peer, RECONNECTIONS)
-                return
-            elif message == 110:
-                self.peers[peer[0]][MALFORMATED] += 1
-                if self.peers[peer[0]][MALFORMATED] > 10:
-                    self.ban(peer, MALFORMATED)
-                return
-            if message.command == PING:
-                self.peers[peer[0]][PING] += 0.5
-                if self.peers[peer[0]][PING] > 10:
-                    self.ban(peer, PING)
-            elif message.command == STUN:
-                self.peers[peer[0]][STUN] += 1
-                if self.peers[peer[0]][STUN] > 1:
-                    self.ban(peer, STUN)
-            elif message.command == STORE:
-                args = tuple(message.arguments)
-                for arg in args:
-                    self.peers[peer[0]][STORE] += len(arg)
-                if self.peers[peer[0]][STORE] > 1000000:
-                    self.ban(peer, STORE)
-            elif message.command == INV:
-                self.peers[peer[0]][INV] += 30
-                if self.peers[peer[0]][INV] > 150:
-                    self.ban(peer, INV)
-            elif message.command == VALUES:
-                self.peers[peer[0]][VALUES] += 30
-                if self.peers[peer[0]][VALUES] > 150:
-                    self.ban(peer, VALUES)
-            elif message.command == GET_LISTINGS:
-                self.peers[peer[0]][GET_LISTINGS] += 5
-                if self.peers[peer[0]][GET_LISTINGS] > 250:
-                    self.ban(peer, GET_LISTINGS)
-            elif message.command == FOLLOW:
+            if message.command == FOLLOW:
                 self.peers[peer[0]][FOLLOW] += 1
                 if self.peers[peer[0]][FOLLOW] > 3:
                     self.ban(peer, FOLLOW)
@@ -88,12 +41,7 @@ def process_message(self, peer, message):
             self.log.warning("Exception processing banscore")
 
     def ban(self, peer, message_type):
-        if message_type == 100:
-            reason = "RECONNECTIONS"
-        elif message_type == 110:
-            reason = "MALFORMATTED"
-        else:
-            reason = Command.Name(message_type)
+        reason = Command.Name(message_type)
         self.log.warning("Banned %s. Reason: too many %s messages." %
                          (peer[0], reason))
         self.multiplexer.ban_ip(peer[0])
@@ -107,9 +55,6 @@ def adjust_scores(self):
             for k, v in self.peers[peer].items():
                 if v > 0:
                     remove = False
-                    if k == STORE:
-                        self.peers[peer][k] = v - 350
-                    else:
-                        self.peers[peer][k] = v - 1
+                    self.peers[peer][k] = v - 1
             if remove:
                 del self.peers[peer]

net/rpcudp.py

@@ -61,9 +61,9 @@ def receive_message(self, message, sender, connection, ban_score):
         if msgID in self._outstanding:
             self._acceptResponse(msgID, data, sender)
         elif message.command != NOT_FOUND:
-            #ban_score.process_message(connection.dest_addr, message)
+            ban_score.process_message(connection.dest_addr, message)
             self._acceptRequest(msgID, str(Command.Name(message.command)).lower(), data, sender, connection)
-        #else: ban_score.process_message(connection.dest_addr, message)
+
 
     def _acceptResponse(self, msgID, data, sender):
         if data is not None:

net/wireprotocol.py

@@ -77,12 +77,10 @@ def on_connection_made(self):
             if self.connection.state == State.CONNECTED:
                 self.addr = str(self.connection.dest_addr[0]) + ":" + str(self.connection.dest_addr[1])
                 self.log.info("connected to %s" % self.addr)
-            #self.ban_score.process_message(self.connection.dest_addr, 100)
 
         def receive_message(self, datagram):
             if len(datagram) < 166:
                 self.log.warning("received datagram too small from %s, ignoring" % self.addr)
-                #self.ban_score.process_message(self.connection.dest_addr, 110)
                 return False
             try:
                 m = Message()
@@ -109,7 +107,6 @@ def receive_message(self, datagram):
             except Exception:
                 # If message isn't formatted property then ignore
                 self.log.warning("received an invalid message from %s, ignoring" % self.addr)
-                #self.ban_score.process_message(self.connection.dest_addr, 110)
                 return False
 
         def handle_shutdown(self):