Info targets replaced with devices.

README.md

@@ -126,7 +126,7 @@ Display information about exploit:
 	Description:
 	Module exploits D-Link DIR-300, DIR-600 Remote Code Execution vulnerability which allows executing command on operating system level with root privileges.
 
-	Targets:
+	Devices:
 	- D-Link DIR 300
 	- D-Link DIR 600
 

routersploit/interpreter.py

@@ -336,7 +336,7 @@ class RoutersploitInterpreter(BaseInterpreter):
         if sub_command == info:
             utils.pprint_dict_in_order(
                 self.module_metadata,
-                ("name", "description", "targets", "authors", "references"),
+                ("name", "description", "devices", "authors", "references"),
             )
             utils.print_info()
         elif sub_command == options:

routersploit/modules/exploits/2wire/gateway_auth_bypass.py

@@ -23,7 +23,7 @@ class Exploit(exploits.Exploit):
         'references': [
             'https://www.exploit-db.com/exploits/9459/',
         ],
-        'targets': [
+        'devices': [
             '2Wire 2701HGV-W',
             '2Wire 3800HGV-B',
             '2Wire 3801HGV',

routersploit/modules/exploits/asmax/ar_1004g_password_disclosure.py

@@ -27,7 +27,7 @@ class Exploit(exploits.Exploit):
         'references': [
              'https://github.com/lucyoa/exploits/blob/master/asmax/asmax.txt',
         ],
-        'targets': [
+        'devices': [
              'Asmax AR 1004g',
         ],
     }

routersploit/modules/exploits/asmax/ar_804_gu_rce.py

@@ -28,7 +28,7 @@ class Exploit(exploits.Exploit):
              'http://www.securitum.pl/dh/asmax-ar-804-gu-compromise',
              'https://www.exploit-db.com/exploits/8846/',
         ],
-        'targets': [
+        'devices': [
              'Asmax AR 804 gu',
         ],
     }

routersploit/modules/exploits/asus/infosvr_backdoor_rce.py

@@ -28,7 +28,7 @@ class Exploit(exploits.Exploit):
         'references': [
             'https://github.com/jduck/asus-cmd',
         ],
-        'targets': [
+        'devices': [
             'ASUS RT-N66U',
             'ASUS RT-AC87U',
             'ASUS RT-N56U',

routersploit/modules/exploits/asus/rt_n16_password_disclosure.py

@@ -26,7 +26,7 @@ class Exploit(exploits.Exploit):
         'references': [
             'https://sintonen.fi/advisories/asus-router-auth-bypass.txt'
         ],
-        'targets': [
+        'devices': [
             'ASUS RT-N10U, firmware 3.0.0.4.374_168',
             'ASUS RT-N56U, firmware 3.0.0.4.374_979',
             'ASUS DSL-N55U, firmware 3.0.0.4.374_1397',

routersploit/modules/exploits/belkin/g_n150_password_disclosure.py

@@ -28,7 +28,7 @@ class Exploit(exploits.Exploit):
             'http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2012-2765',
             'https://www.exploit-db.com/exploits/17349/',
         ],
-        'targets': [
+        'devices': [
             'Belkin G',
             'Belkin N150',
         ],

routersploit/modules/exploits/belkin/g_plus_info_disclosure.py

@@ -27,7 +27,7 @@ class Exploit(exploits.Exploit):
             'http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-0403',
             'https://www.exploit-db.com/exploits/4941/',
         ],
-        'targets': [
+        'devices': [
             'Belkin G',
         ],
     }

routersploit/modules/exploits/belkin/n150_path_traversal.py

@@ -26,7 +26,7 @@ class Exploit(exploits.Exploit):
             'http://www.belkin.com/us/support-article?articleNum=109400',
             'http://www.kb.cert.org/vuls/id/774788',
         ],
-        'targets': [
+        'devices': [
             'Belkin N150 1.00.07',
             'Belkin N150 1.00.08',
             'Belkin N150 1.00.09',

routersploit/modules/exploits/belkin/n750_rce.py

@@ -27,7 +27,7 @@ class Exploit(exploits.Exploit):
             'https://www.exploit-db.com/exploits/35184/',
             'https://labs.integrity.pt/articles/from-0-day-to-exploit-buffer-overflow-in-belkin-n750-cve-2014-1635/',
         ],
-        'targets': [
+        'devices': [
             'Belkin N750',
         ]
     }

routersploit/modules/exploits/cisco/ucs_manager_rce.py

@@ -28,7 +28,7 @@ class Exploit(exploits.Exploit):
             'https://www.exploit-db.com/exploits/39568/',
             'https://tools.cisco.com/security/center/content/CiscoSecurityAdvisory/cisco-sa-20140926-bash',
         ],
-        'targets': [
+        'devices': [
             'Cisco UCS Manager 2.1 (1b)',
         ],
     }

routersploit/modules/exploits/comtrend/ct_5361t_password_disclosure.py

@@ -27,10 +27,8 @@ class Exploit(exploits.Exploit):
         'references': [
             'https://packetstormsecurity.com/files/126129/Comtrend-CT-5361T-Password-Disclosure.html'
          ],
-        'targets': [
-            'Comtrend CT 5361T (more likely CT 536X)\n' +
-            'Software Version: A111-312SSG-T02_R01\n' +
-            'Wireless Driver Version: 4.150.10.15.cpe2.2'
+        'devices': [
+            'Comtrend CT 5361T (more likely CT 536X)',
          ]
     }
 

routersploit/modules/exploits/dlink/dir_300_320_615_auth_bypass.py

@@ -24,7 +24,7 @@ class Exploit(exploits.Exploit):
         'references': [
             'http://www.devttys0.com/wp-content/uploads/2010/12/dlink_php_vulnerability.pdf',
         ],
-        'targets': [
+        'devices': [
             'D-Link DIR-300',
             'D-Link DIR-600',
             'D-Link DIR-615 revD',

routersploit/modules/exploits/dlink/dir_300_600_615_info_disclosure.py

@@ -26,7 +26,7 @@ class Exploit(exploits.Exploit):
         'references': [
             'http://seclists.org/bugtraq/2013/Dec/11'
         ],
-        'targets': [
+        'devices': [
             'D-Link DIR-300 (all)',
             'D-Link DIR-600 (all)',
             'D-Link DIR-615 (fw 4.0)',

routersploit/modules/exploits/dlink/dir_300_600_rce.py

@@ -27,7 +27,7 @@ class Exploit(exploits.Exploit):
             'http://www.s3cur1ty.de/home-network-horror-days',
             'http://www.s3cur1ty.de/m1adv2013-003',
         ],
-        'targets': [
+        'devices': [
             'D-Link DIR 300',
             'D-Link DIR 600',
         ]

routersploit/modules/exploits/dlink/dir_645_password_disclosure.py

@@ -26,7 +26,7 @@ class Exploit(exploits.Exploit):
         'references': [
             'https://packetstormsecurity.com/files/120591/dlinkdir645-bypass.txt'
         ],
-        'targets': [
+        'devices': [
             'D-Link DIR-645 (Versions < 1.03)',
         ]
     }

routersploit/modules/exploits/dlink/dns_320l_327l_rce.py

@@ -28,7 +28,7 @@ class Exploit(exploits.Exploit):
         'references': [
             'http://www.search-lab.hu/media/D-Link_Security_advisory_3_0_public.pdf',
         ],
-        'targets': [
+        'devices': [
             'DNS-320L 1.03b04',
             'DNS-327L, 1.02',
         ]

routersploit/modules/exploits/dlink/dsl_2750b_info_disclosure.py

@@ -28,7 +28,7 @@ class Exploit(exploits.Exploit):
         'references': [
             'http://seclists.org/fulldisclosure/2015/May/129'
         ],
-        'targets': [
+        'devices': [
             'D-Link DSL-2750B EU_1.01',
         ],
     }

routersploit/modules/exploits/dlink/dvg_n5402sp_path_traversal.py

@@ -25,7 +25,7 @@ class Exploit(exploits.Exploit):
             'https://www.exploit-db.com/exploits/39409/',
             'http://ipositivesecurity.blogspot.com/2016/02/dlink-dvgn5402sp-multiple-vuln.html',
         ],
-        'targets': [
+        'devices': [
             'D-Link DVG-N5402SP',
         ] 
     }

routersploit/modules/exploits/dlink/dwr_932_info_disclosure.py

@@ -27,7 +27,7 @@ class Exploit(exploits.Exploit):
         'references': [
             'https://www.exploit-db.com/exploits/39581/',
         ],
-        'targets': [
+        'devices': [
             'D-Link DWR-932',
         ]
     }

routersploit/modules/exploits/fortinet/fortigate_os_backdoor.py

@@ -33,7 +33,7 @@ class Exploit(exploits.Exploit):
             'http://www.s3cur1ty.de/home-network-horror-days',
             'http://www.s3cur1ty.de/m1adv2013-003',
         ],
-        'targets': [
+        'devices': [
             'FortiGate OS Version 4.x-5.0.7',
         ]
     }

routersploit/modules/exploits/juniper/screenos_backdoor.py

@@ -23,7 +23,7 @@ class Exploit(exploits.Exploit):
         'references': [
             'https://community.rapid7.com/community/infosec/blog/2015/12/20/cve-2015-7755-juniper-screenos-authentication-backdoor',
         ],
-        'targets': [
+        'devices': [
             'Juniper ScreenOS 6.2.0r15 to 6.2.0r18',
             'Juniper ScreenOS 6.3.0r12 to 6.3.0r20',
         ]

routersploit/modules/exploits/linksys/1500_2500_rce.py

@@ -27,7 +27,7 @@ class Exploit(exploits.Exploit):
         'references': [
             'https://www.exploit-db.com/exploits/24475/',
         ],
-        'targets': [
+        'devices': [
             'Linksys E1500/E2500',
         ]
     }

routersploit/modules/exploits/linksys/wap54gv3_rce.py

@@ -27,7 +27,7 @@ class Exploit(exploits.Exploit):
         'references': [
             'http://seclists.org/bugtraq/2010/Jun/93',
         ],
-        'targets': [
+        'devices': [
             'Linksys WAP54Gv3',
         ]
     }

routersploit/modules/exploits/multi/misfortune_cookie.py

@@ -25,7 +25,7 @@ class Exploit(exploits.Exploit):
         'references': [
             'http://mis.fortunecook.ie/'
         ],
-        'targets': [
+        'devices': [
              'multi'
         ]
     }

routersploit/modules/exploits/netgear/multi_rce.py

@@ -28,7 +28,7 @@ class Exploit(exploits.Exploit):
             'http://firmware.re/vulns/acsa-2015-001.php',
             'https://www.blackhat.com/docs/asia-16/materials/asia-16-Costin-Automated-Dynamic-Firmware-Analysis-At-Scale-A-Case-Study-On-Embedded-Web-Interfaces.pdf',
         ],
-        'targets': [
+        'devices': [
             'Netgear WG102',
             'Netgear WG103',
             'Netgear WN604',

routersploit/modules/exploits/netgear/n300_auth_bypass.py

@@ -24,7 +24,7 @@ class Exploit(exploits.Exploit):
             'https://www.compass-security.com/fileadmin/Datein/Research/Advisories/CSNC-2015-007_Netgear_WNR1000v4_AuthBypass.txt',
             'http://www.shellshocklabs.com/2015/09/part-1en-hacking-netgear-jwnr2010v5.html',
         ],
-        'targets': [
+        'devices': [
 			'Netgear N300',
 			'Netgear JNR1010v2',
 			'Netgear JNR3000',

routersploit/modules/exploits/netgear/prosafe_rce.py

@@ -28,7 +28,7 @@ class Exploit(exploits.Exploit):
             'http://firmware.re/vulns/acsa-2015-002.php',
             'https://www.blackhat.com/docs/asia-16/materials/asia-16-Costin-Automated-Dynamic-Firmware-Analysis-At-Scale-A-Case-Study-On-Embedded-Web-Interfaces.pdf',
          ],
-        'targets': [
+        'devices': [
             'Netgear ProSafe WC9500',
             'Netgear ProSafe WC7600',
             'Netgear ProSafe WC7520',

routersploit/modules/exploits/technicolor/tc7200_password_disclosure.py

@@ -23,7 +23,7 @@ class Exploit(exploits.Exploit):
         'references': [
             'https://www.exploit-db.com/exploits/31894/',
         ],
-        'targets': [
+        'devices': [
             'Technicolor TC7200',
         ]
     }

routersploit/modules/exploits/ubiquiti/airos_6_x.py

@@ -31,7 +31,7 @@ class Exploit(exploits.Exploit):
             'https://www.exploit-db.com/exploits/39701/'
         ],
 
-        'targets': [
+        'devices': [
             'AirOS 6.x'
         ]
     }
@@ -163,4 +163,4 @@ class Exploit(exploits.Exploit):
             return True
 
         else:
-            return False
\ No newline at end of file
+            return False

routersploit/test/test_interpreter.py

@@ -290,7 +290,7 @@ class RoutersploitInterpreterTest(unittest.TestCase):
     @mock.patch('__builtin__.print')
     def test_command_show_info(self, mock_print):
         metadata = {
-            'targets': 'target_desc',
+            'devices': 'target_desc',
             'authors': 'authors_desc',
             'references': 'references_desc',
             'description': 'description_desc',
@@ -308,7 +308,7 @@ class RoutersploitInterpreterTest(unittest.TestCase):
                 mock.call('name_desc'),
                 mock.call('\nDescription:'),
                 mock.call('description_desc'),
-                mock.call('\nTargets:'),
+                mock.call('\nDevices:'),
                 mock.call('target_desc'),
                 mock.call('\nAuthors:'),
                 mock.call('authors_desc'),