Merge pull request #2 from cr8ivecodesmith/master

Temporary fix on pip install issue and added service banners in the scan result

Author: MyKings

masscan/masscan.py

@@ -349,6 +349,7 @@ def analyse_masscan_xml_scan(self, masscan_xml_output=None, masscan_err='', mass
             <host endtime="1490242775"><address addr="10.0.9.6" addrtype="ipv4"/><ports><port protocol="tcp" portid="80"><state state="open" reason="syn-ack" reason_ttl="64"/></port></ports></host>
             <host endtime="1490242775"><address addr="10.0.9.12" addrtype="ipv4"/><ports><port protocol="tcp" portid="80"><state state="open" reason="syn-ack" reason_ttl="64"/></port></ports></host>
             <host endtime="1490242776"><address addr="10.0.9.28" addrtype="ipv4"/><ports><port protocol="tcp" portid="80"><state state="open" reason="syn-ack" reason_ttl="64"/></port></ports></host>
+            <host endtime="1498802982"><address addr="10.0.9.29" addrtype="ipv4"/><ports><port protocol="tcp" portid="80"><state state="open" reason="response" reason_ttl="48"/><service name="title" banner="401 - Unauthorized"></service></port></ports></host>
             <runstats>
                 <finished time="1490242786" timestr="2017-03-23 12:19:46" elapsed="13" />
                 <hosts up="10" down="0" total="10" />
@@ -414,16 +415,24 @@ def analyse_masscan_xml_scan(self, masscan_xml_output=None, masscan_err='', mass
                 state = dport.find('state').get('state')
                 reason = dport.find('state').get('reason')
                 reason_ttl = dport.find('state').get('reason_ttl')
+                services = []
 
                 if not proto in list(scan_result['scan'][host].keys()):
                     scan_result['scan'][host][proto] = {}
 
                 scan_result['scan'][host][proto][port] = {
                     'state': state,
                     'reason': reason,
-                    'reason_ttl': reason_ttl
+                    'reason_ttl': reason_ttl,
                 }
 
+                for service in dhost.findall('ports/port/service'):
+                    services.append({
+                        'name': service.get('name'),
+                        'banner': service.get('banner'),
+                    })
+                scan_result['scan'][host][proto][port]['services'] = services
+
         self._scan_result = scan_result
         return scan_result
 

setup.py

@@ -43,5 +43,5 @@
     url='https://github.com/MyKings/python-masscan',
     bugtrack_url='https://github.com/MyKings/python-masscan',
     description='This is a python class to use masscan and access scan results from python2',
-    long_description=open('README.md').read() + "\n" + open('CHANGELOG.md').read(),
+    # long_description=open('README.md').read() + "\n" + open('CHANGELOG.md').read(),
 )