Merge pull request #91 from linted/master

Update IP validation to support IPv6

Author: codingo

VHostScan/lib/helpers/wordlist_helper.py

@@ -1,7 +1,7 @@
 import sys
 from .file_helper import get_combined_word_lists
 from pkg_resources import resource_filename
-
+from ipaddress import ip_address
 
 DEFAULT_WORDLIST_FILE = resource_filename(
     'VHostScan', 'wordlists/virtual-host-scanning.txt')
@@ -74,9 +74,6 @@ def set_words(self, words_type, words):
 
     def valid_ip(self, address):
         try:
-            host_bytes = address.split('.')
-            valid = [int(b) for b in host_bytes]
-            valid = [b for b in valid if b >= 0 and b <= 255]
-            return len(host_bytes) == 4 and len(valid) == 4
+            return ip_address(address) is not None
         except:
             return False

tests/helpers/test_wordlist_helper.py

@@ -61,6 +61,20 @@ def test_ip_using_suffix(self):
             wordlist, wordlist_types = self.wordlist.get_wordlist(None,None,suffix)
             self.assertEqual(wordlist,stdin_wordlist)
 
+    def test_ipv6_using_prefix(self):
+        stdin_wordlist = ['::1']
+        prefix = 'dev-'
+        with patch('VHostScan.lib.helpers.wordlist_helper.WordList.get_stdin_wordlist', return_value=stdin_wordlist):
+            wordlist, wordlist_types = self.wordlist.get_wordlist(None, prefix)
+            self.assertEqual(wordlist, stdin_wordlist)
+
+    def test_ipv6_using_suffix(self):
+        stdin_wordlist = ['::1']
+        suffix = 'test'
+        with patch('VHostScan.lib.helpers.wordlist_helper.WordList.get_stdin_wordlist', return_value=stdin_wordlist):
+            wordlist, wordlist_types = self.wordlist.get_wordlist(None,None,suffix)
+            self.assertEqual(wordlist,stdin_wordlist)
+
     def test_word_with_prefix(self):
         stdin_wordlist = ['www','www2','www3']
         expected_wordlist = stdin_wordlist + ['dev-www','dev-www2','dev-www3']