v6.0 - see CHANGELOG.md

CHANGELOG.md

@@ -1,5 +1,13 @@
 ## Changelog
 
+- v6.0
+
+  - New
+
+    - For `waymore` mode, don't check the new `combineInline` files.
+    - Add `long_description_content_type` to `setup.py` to upload to PyPi
+    - Add `xnLinkFinder` to `PyPi` so can be installed with `pip install xnLinkFinder`
+
 - v5.3
 
   - Changed

README.md

@@ -1,6 +1,6 @@
 <center><img src="https://github.com/xnl-h4ck3r/xnLinkFinder/blob/main/xnLinkFinder/images/title.png"></center>
 
-## About - v5.3
+## About - v6.0
 
 This is a tool used to discover endpoints (and potential parameters) for a given target. It can find them by:
 
@@ -19,12 +19,24 @@ As a starting point, I took the amazing tool [LinkFinder](https://github.com/Ger
 
 `xnLinkFinder` supports **Python 3**.
 
-Install `xnLinkFinder` in default(global) python environment.
+Install `xnLinkFinder` in default (global) python environment.
+
+```bash
+pip install xnLinkFinder
+```
+
+OR
 
 ```bash
 pip install git+https://github.com/xnl-h4ck3r/xnLinkFinder.git -v
 ```
 
+You can upgrade with
+
+```bash
+pip install --upgrade xnLinkFinder
+```
+
 ### pipx
 
 Quick setup in isolated python environment using [pipx](https://pypa.github.io/pipx/)

setup.py

@@ -11,6 +11,7 @@
             )
 
 # Copy the config.yml file to the target directory if it exists
+configNew = False
 if target_directory and os.path.isfile("config.yml"):
     os.makedirs(target_directory, exist_ok=True)
     # If file already exists, create a new one
@@ -21,7 +22,6 @@
         os.rename(target_directory+'/config.yml',target_directory+'/config.yml.NEW')
         os.rename(target_directory+'/config.yml.OLD',target_directory+'/config.yml')
     else:
-        configNew = False
         shutil.copy("config.yml", target_directory)
 
 setup(
@@ -30,6 +30,7 @@
     version=__import__('xnLinkFinder').__version__,
     description="A python script to find endpoints from a URL, a file of URLs, a directory of files, a Burp XML file or a ZAP ASCII message file. It also gets potential parameters and a target specific wordlist.",
     long_description=open("README.md").read(),
+    long_description_content_type='text/markdown',
     author="@xnl-h4ck3r",
     url="https://github.com/xnl-h4ck3r/xnlLinkFinder",
     py_modules=["xnLinkFinder"],

xnLinkFinder/__init__.py

@@ -1 +1 @@
-__version__="5.3"
+__version__="6.0"

xnLinkFinder/xnLinkFinder.py

@@ -2320,13 +2320,13 @@ def processDirectory():
                 ):                    
                     # Check if running against a waymore results directory
                     # Waymore Mode will be if waymore.txt exists in the directory, or if index.txt exists and there
-                    # is at least one .xnl file
+                    # is at least one .xnl file, or if "waymore.new","waymore.old","responses.tmp","continueResp.tmp" or "combinedInline" files exist.
                     if f.endswith("xnl"):
                         xnlFileFound = True
-                    if f == "waymore.txt" or (xnlFileFound and f == "index.txt"):
+                    if f in ("waymore.txt","waymore.new","waymore.old","responses.tmp","continueResp.tmp") or (xnlFileFound and f == "index.txt") or "combinedInline" in f:
                         waymoreMode = True
 
-                    if f not in ("waymore.txt","waymore.new","waymore.old","index.txt","responses.tmp","continueResp.tmp"):
+                    if f not in ("waymore.txt","waymore.new","waymore.old","index.txt","responses.tmp","continueResp.tmp") and "combinedInline" not in f:
                         totalResponses = totalResponses + 1
 
     except Exception as e:
@@ -2382,12 +2382,12 @@ def processDirectory():
                             waymoreFiles.add(fullPath)
 
                     # Check if the file size is less than --max-file-size 
-                    # AND if in waymore mode that it isn't one of "waymore.txt","waymore.new","waymore.old","index.txt","responses.tmp","continueResp.tmp"
+                    # AND if in waymore mode that it isn't one of "waymore.txt","waymore.new","waymore.old","index.txt","responses.tmp","continueResp.tmp","combinedInline"
                     if (
                         args.max_file_size == 0
                         or (os.path.getsize(os.path.join(path, filename))) / (1024*1024)
                         < args.max_file_size
-                    ) and (not waymoreMode or (waymoreMode and filename not in ("waymore.txt","waymore.new","waymore.old","index.txt","responses.tmp","continueResp.tmp"))):
+                    ) and (not waymoreMode or (waymoreMode and filename not in ("waymore.txt","waymore.new","waymore.old","index.txt","responses.tmp","continueResp.tmp") and "combinedInline" not in filename)):
 
                         if stopProgram is not None:
                             break