v1.17 - see CHANGELOG.md for details

CHANGELOG.md

@@ -1,5 +1,11 @@
 ## Changelog
 
+- v1.17
+
+  - Changed
+    - If an input file has a sub domain starting with \_ or - then an error was raised, but these are valid. This bug has been fixed.
+    - In addition to the fix above, the error message will show what line was flagged in error so the user can raise an issue on Github about it if they believe it is an error.
+
 - v1.16
 
   - Changed

README.md

@@ -1,6 +1,6 @@
 <center><img src="https://github.com/xnl-h4ck3r/waymore/blob/main/waymore/images/title.png"></center>
 
-## About - v1.16
+## About - v1.17
 
 The idea behind **waymore** is to find even more links from the Wayback Machine than other existing tools.
 

waymore.py

@@ -936,26 +936,20 @@ def validateArgInput(x):
             inputValues.add(x)
 
     for i in inputValues:        
-        if isInputFile:
-            # Check if input seems to be valid domain or URL
-            match = re.search(r"^((?!-))(xn--)?([a-z0-9][a-z0-9\-\_]{0,61}[a-z0-9]{0,1}\.)+(xn--)?([a-z0-9\-]{1,61}|[a-z0-9\-]{1,30}\.[a-z]{2,})(/[^\n|?#]*)?$", i.strip().rstrip('\n'))
-            if match is None:
+
+        # Check if input seems to be valid domain or URL
+        match = re.search(r"^([a-z0-9\-\_][a-z0-9\-\_]{0,61}[a-z0-9]{0,1}\.)+([a-z0-9\-\_]{1,61}|[a-z0-9\-\_]{1,30}\.[a-z]{2,})(/[^\n|?#]*)?$", i.strip().rstrip('\n'))
+        if match is None:
+            if isInputFile:
                 error = 'Each line of the input file must contain a domain only (with no schema) to search for all links, or a domain and path (with no schema) to just get archived response for that URL. Do not pass a query string or fragment in any lines.'
-                if x == '<stdin>':
-                    writerr(colored(error,'red'))
-                    sys.exit()
-                else:
-                    raise argparse.ArgumentTypeError(error)
-        else:
-            # Check if input seems to be valid domain or URL
-            match = re.search(r"^((?!-))(xn--)?([a-z0-9][a-z0-9\-\_]{0,61}[a-z0-9]{0,1}\.)+(xn--)?([a-z0-9\-]{1,61}|[a-z0-9\-]{1,30}\.[a-z]{2,})(/[^\n|?#]*)?$", i.strip().rstrip('\n'))
-            if match is None:
+            else:
                 error = 'Pass a domain only (with no schema) to search for all links, or pass a domain and path (with no schema) to just get archived responses for that URL. Do not pass a query string or fragment.'
-                if x == '<stdin>':
-                    writerr(colored(error,'red'))
-                    sys.exit()
-                else:
-                    raise argparse.ArgumentTypeError(error)
+            error = error + ' The first line that seems invalid is: ' + str(i) + '\nIf you believe this is flagged in error, please raise an issue on Github :)'
+            if x == '<stdin>':
+                writerr(colored(error,'red'))
+                sys.exit()
+            else:
+                raise argparse.ArgumentTypeError(error)
     return x
 
 def processAlienVaultPage(url):

waymore/__init__.py

@@ -1 +1 @@
-__version__="1.16"
+__version__="1.17"