Merge pull request savon-noir#65 from jack8daniels2/master

savon-noir · savon-noir · commit fe62f7b48ce1 · 2015-10-25T13:40:16.000+01:00
Fix parsing of nmap script output with multiple elements or tables
diff --git a/libnmap/parser.py b/libnmap/parser.py
@@ -473,8 +473,22 @@ def __parse_script(cls, script_data):
             elif script_elem.tag == 'table':
                 tdict = {}
                 for telem in script_elem:
-                    tdict[telem.get('key')] = telem.text
-                _elt_dict[script_elem.get('key')] = tdict
+                    # Handle duplicate element keys
+                    tkey = telem.get('key')
+                    if tkey in tdict:
+                        if not isinstance(tdict[tkey], list):
+                            tdict[tkey] = [tdict[tkey], ]
+                        tdict[tkey].append(telem.text)
+                    else:
+                        tdict[tkey] = telem.text
+                # Handle duplicate table keys
+                skey = script_elem.get('key')
+                if skey in _elt_dict:
+                    if not isinstance(_elt_dict[skey], list):
+                        _elt_dict[skey] = [_elt_dict[skey], ]
+                    _elt_dict[skey].append(tdict)
+                else:
+                    _elt_dict[skey] = tdict
         _script_dict['elements'] = _elt_dict
         return _script_dict
 
