more cosmetics

bdamele · bdamele · commit 75d1dab8952d · 2012-04-04T12:33:16.000Z
diff --git a/lib/request/dns.py b/lib/request/dns.py
@@ -28,9 +28,11 @@ def __init__(self, raw):
         self._query = ""
 
         type_ = (ord(raw[2]) >> 3) & 15                 # Opcode bits
+
         if type_ == 0:                                  # Standard query
             i = 12
             j = ord(raw[i])
+
             while j != 0:
                 self._query += raw[i+1:i+j+1] + '.'
                 i = i + j + 1
@@ -59,26 +61,32 @@ def __init__(self):
 
     def pop(self, prefix=None, suffix=None):
         retVal = None
+
         with self._lock:
             for _ in self._requests:
                 if prefix is None and suffix is None or re.search("%s\..+\.%s" % (prefix, suffix), _, re.I):
                     retVal = _
                     self._requests.remove(_)
                     break
+
         return retVal
 
     def run(self):
         def _():
             try:
                 self._running = True
+
                 while True:
                     data, addr = self._socket.recvfrom(1024)
                     _ = DNSQuery(data)
                     self._socket.sendto(_.response("127.0.0.1"), addr)
+
                     with self._lock:
                         self._requests.append(_._query)
+
             except KeyboardInterrupt:
                 raise
+
             finally:
                 self._running = False
 
diff --git a/lib/request/inject.py b/lib/request/inject.py
@@ -91,12 +91,12 @@ def __goDns(payload, expression):
             kb.dnsTest = dnsUse(payload, "SELECT %d%s" % (randInt, FROM_DUMMY_TABLE.get(Backend.getIdentifiedDbms(), ""))) == str(randInt)
 
             if not kb.dnsTest:
-                errMsg = "test for data retrieval through DNS channel failed. Turning off DNS exfiltration support"
+                errMsg = "data retrieval through DNS channel failed. Turning off DNS exfiltration support"
                 logger.error(errMsg)
 
                 conf.dnsDomain = None
             else:
-                infoMsg = "test for data retrieval through DNS channel was successful"
+                infoMsg = "data retrieval through DNS channel was successful"
                 logger.info(infoMsg)
 
         if kb.dnsTest:
