Merge pull request savon-noir#90 from d4t4king/master

savon-noir · web-flow · commit 8b465420877a · 2018-10-31T11:00:59.000+01:00
Adding xmlversion, startedstr, and numservices
diff --git a/libnmap/objects/report.py b/libnmap/objects/report.py
@@ -83,6 +83,21 @@ def started(self):
             pass
         return rval
 
+	@property
+	def startedstr(self):
+		"""
+			Accessor returning a human readable string of when the 
+			scan was started
+
+			:return: string
+		"""
+		rval = ''
+		try:
+			rval = self.['_nmaprun']['startstr']
+		except(KeyError, TypeError, ValueError):
+			pass
+		return rval
+			
     @property
     def commandline(self):
         """
@@ -102,6 +117,16 @@ def version(self):
         """
         return self._nmaprun['version']
 
+	@property
+	def xmlversion(self):
+		"""
+			Accessor returning the XML output
+			version of the nmap report.
+		
+			:return: string
+		"""
+		return self._nmaprun['xmloutputversion']
+
     @property
     def scan_type(self):
         """
@@ -112,6 +137,22 @@ def scan_type(self):
         """
         return self._scaninfo.get('type')
 
+	@property
+	def numservices(self):
+		"""
+			Accessor returning the number of services the 
+			scan attempted to enumerate.
+
+			:return: integer
+		"""
+		rval = -1
+		try:
+			s_numsvcs = self._scaninfo.get('numservices')
+			rval = int(s_numsvcs)
+		except(KeyError, TypeError, ValueError):
+			pass
+		return rval
+
     @property
     def hosts(self):
         """
