From 774767400b6187449c71424c686338b4c4441ddc Mon Sep 17 00:00:00 2001 From: Juan Bindez Date: Mon, 6 May 2024 23:23:43 -0300 Subject: [PATCH 01/15] Update README.md --- README.md | 5 ----- 1 file changed, 5 deletions(-) diff --git a/README.md b/README.md index 31db7a0..e772928 100644 --- a/README.md +++ b/README.md @@ -27,11 +27,6 @@ Direnumerate is an open source tool written in Python designed to automate direc ----------------- -## install in ubuntu: - - pip install direnumerate --break-system-packages ----------- - ## Command line usage: ### Directory Scan: From a75131323dbd85e833aebc182e86265c2a376392 Mon Sep 17 00:00:00 2001 From: Juan Bindez Date: Wed, 8 May 2024 21:27:44 -0300 Subject: [PATCH 02/15] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index e772928..b344234 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,6 @@ # Direnumerate + ![PyPI - Downloads](https://img.shields.io/pypi/dm/direnumerate) ![PyPI - License](https://img.shields.io/pypi/l/direnumerate) [![Documentation Status](https://readthedocs.org/projects/direnumerate/badge/?version=latest)](https://direnumerate.readthedocs.io/en/latest/?badge=latest) From f21b722c26545487d012c301db627f6f2a07c50a Mon Sep 17 00:00:00 2001 From: Juan Bindez Date: Thu, 9 May 2024 22:28:02 -0300 Subject: [PATCH 03/15] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index b344234..9acfa6f 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,7 @@ # Direnumerate + ![PyPI - Downloads](https://img.shields.io/pypi/dm/direnumerate) ![PyPI - License](https://img.shields.io/pypi/l/direnumerate) [![Documentation Status](https://readthedocs.org/projects/direnumerate/badge/?version=latest)](https://direnumerate.readthedocs.io/en/latest/?badge=latest) From 3d00ed91168011022ead1963f49ac8510fe62565 Mon Sep 17 00:00:00 2001 From: Juan Bindez Date: Fri, 10 May 2024 11:22:32 -0300 Subject: [PATCH 04/15] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9acfa6f..c2874b1 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ ![GitHub Tag](https://img.shields.io/github/v/tag/JuanBindez/direnumerate?include_prereleases&link=https%3A%2F%2Fgithub.com%2FJuanBindez%2Fdirenumerate%2Ftags) -[PDF documentation](https://direnumerate.readthedocs.io/_/downloads/en/latest/pdf/) + ## Description From 1a61ea8cd7a8efd57e246de22c567afbda4b88bc Mon Sep 17 00:00:00 2001 From: Juan Bindez Date: Mon, 13 May 2024 10:03:57 -0300 Subject: [PATCH 05/15] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c2874b1..41e53d4 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,7 @@ Direnumerate is an open source tool written in Python designed to automate direc ### IP Info: - direnumerate -t 8.8.8.8 -i + direnumerate -i 8.8.8.8 ## Scripts usage: From 39c852dd8b6823bc1030cb97e7421cce2443a907 Mon Sep 17 00:00:00 2001 From: Juan Bindez Date: Mon, 13 May 2024 10:26:47 -0300 Subject: [PATCH 06/15] Update README.md --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 41e53d4..2a2f99a 100644 --- a/README.md +++ b/README.md @@ -9,6 +9,9 @@ +#### Use in Colab + +https://colab.research.google.com/github/JuanBindez/direnumerate-colab/blob/main/direnumerate.ipynb?authuser=1#scrollTo=p85-ili-IB6R ## Description From cac288bd976a5b3f90076d74c28562b119821d75 Mon Sep 17 00:00:00 2001 From: Juan Bindez Date: Mon, 13 May 2024 10:37:43 -0300 Subject: [PATCH 07/15] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2a2f99a..96da1fa 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ -#### Use in Colab +#### Test in Colab https://colab.research.google.com/github/JuanBindez/direnumerate-colab/blob/main/direnumerate.ipynb?authuser=1#scrollTo=p85-ili-IB6R From ddfe4b2bd5b96aca2dc3e097beb64006880e4305 Mon Sep 17 00:00:00 2001 From: JuanBindez Date: Mon, 13 May 2024 12:00:10 -0300 Subject: [PATCH 08/15] added deprecated warnings and fixed the command line ip info #5 --- build.rocketfile | 6 +++--- direnumerate/version.py | 2 +- merge.rocketfile | 11 ----------- pyproject.toml | 2 +- 4 files changed, 5 insertions(+), 16 deletions(-) delete mode 100644 merge.rocketfile diff --git a/build.rocketfile b/build.rocketfile index 5653293..ecf3644 100644 --- a/build.rocketfile +++ b/build.rocketfile @@ -1,7 +1,7 @@ git add . -git commit -m 'v3.3-rc1' -git push -u origin dev -git tag v3.3-rc1 +git commit -m ' added deprecated warnings and fixed the command line ip info #5 ' +git push -u origin main +git tag v3.3.1 git push --tag make clean make upload diff --git a/direnumerate/version.py b/direnumerate/version.py index dab65e5..59c5784 100644 --- a/direnumerate/version.py +++ b/direnumerate/version.py @@ -1,4 +1,4 @@ -__version__ = "3.3-rc1" +__version__ = "3.3.1" if __name__ == "__main__": print(__version__) diff --git a/merge.rocketfile b/merge.rocketfile deleted file mode 100644 index a4ede55..0000000 --- a/merge.rocketfile +++ /dev/null @@ -1,11 +0,0 @@ -git add . -git commit -m "merge.rocketfile" -git checkout main -git merge release_candidate_bugfix -git add . -git commit -m 'release tag v3.2.2' -git push -u origin main -git tag v3.2.2 -git push --tag -make clean -make upload diff --git a/pyproject.toml b/pyproject.toml index f526324..b1e3f42 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "direnumerate" -version = "3.3-rc1" +version = "3.3.1" authors = [ { name="Juan Bindez", email="juanbindez780@gmail.com" }, ] From 88543d1c9539dcb46109c580339e299110a199b3 Mon Sep 17 00:00:00 2001 From: Juan Bindez Date: Mon, 13 May 2024 15:25:09 -0300 Subject: [PATCH 09/15] Delete docs/user/userscan.rst --- docs/user/userscan.rst | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 docs/user/userscan.rst diff --git a/docs/user/userscan.rst b/docs/user/userscan.rst deleted file mode 100644 index 3587184..0000000 --- a/docs/user/userscan.rst +++ /dev/null @@ -1,13 +0,0 @@ -.. _userscan: - -User Account Scan: -============================= - -**Here you can find user accounts on websites just by passing the username to the search:**:: - - from direnumerate import UserScan - - user = "username" - - found = UserScan(user) - found.found_users() \ No newline at end of file From 3a89b40d74f61349bce5b98df48f1ba7b232afbf Mon Sep 17 00:00:00 2001 From: Juan Bindez Date: Mon, 13 May 2024 15:26:00 -0300 Subject: [PATCH 10/15] Update api.rst --- docs/api.rst | 6 ------ 1 file changed, 6 deletions(-) diff --git a/docs/api.rst b/docs/api.rst index f69543c..f3c3d44 100644 --- a/docs/api.rst +++ b/docs/api.rst @@ -34,9 +34,3 @@ InfoIp Object :members: :inherited-members: -UserScan Object ---------------- - -.. autoclass:: UserScan - :members: - :inherited-members: From 4a1347426931c1430eb89a0f27ef5d35699efe90 Mon Sep 17 00:00:00 2001 From: Juan Bindez Date: Mon, 13 May 2024 15:31:35 -0300 Subject: [PATCH 11/15] Update cli.rst --- docs/user/cli.rst | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/user/cli.rst b/docs/user/cli.rst index 3c1ae88..56e6491 100644 --- a/docs/user/cli.rst +++ b/docs/user/cli.rst @@ -8,31 +8,31 @@ Directory scan: .. code:: bash - $ direnumerate Ds -t "testphp.vulnweb.com" -w wordlist.txt + $ direnumerate -t "testphp.vulnweb.com" -w wordlist.txt Directory scan with all outputs verbose, (-v command): .. code:: bash - $ direnumerate Ds -v -t "testphp.vulnweb.com" -w wordlist.txt + $ direnumerate -v -t "testphp.vulnweb.com" -w wordlist.txt Port scan: .. code:: bash - $ direnumerate Ps -t 44.228.249.3 -p 22 80 443 + $ direnumerate -t 44.228.249.3 -p 22 80 443 Finds patterns in logs: .. code:: bash - $ direnumerate Fp -log test.log -key ERROR + $ direnumerate -log test.log -key ERROR Ip info: .. code:: bash - $ direnumerate info -t 8.8.8.8 + $ direnumerate -i 8.8.8.8 To list all command line options, simply type From 046544e08876476cecd8a6433fc55f14083245e2 Mon Sep 17 00:00:00 2001 From: Juan Bindez Date: Tue, 14 May 2024 21:45:28 -0300 Subject: [PATCH 12/15] Update __main__.py --- direnumerate/__main__.py | 28 +--------------------------- 1 file changed, 1 insertion(+), 27 deletions(-) diff --git a/direnumerate/__main__.py b/direnumerate/__main__.py index 0b90c14..02a45f8 100644 --- a/direnumerate/__main__.py +++ b/direnumerate/__main__.py @@ -59,10 +59,8 @@ def __init__(self, url): if url_verify == ":": url = url.replace("http://", "https://") self.url = url - elif url_verify == "s": self.url = url - else: self.url = "https://" + url @@ -99,42 +97,32 @@ def dir_enum(self, wordlist_file, verbose: bool = False): if response.status_code == 200: results = f"{Color.GREEN}[Found]:{Color.RESET} {full_url}" - print(results) - + print(results) elif response.status_code == 204: results = f"{Color.BLUE}[No Content]:{Color.RESET} {full_url}" print(results) - elif response.status_code == 400: results = f"{Color.YELLOW}[Bad Request]:{Color.RESET} {full_url}" print(results) - elif response.status_code == 401: results = f"{Color.RED}[Unauthorized]:{Color.RESET} {full_url}" print(results) - elif response.status_code == 403: results = f"{Color.RED}[Forbidden]:{Color.RESET} {full_url}" print(results) - elif response.status_code == 404: results =f"{Color.YELLOW}[Not Found]:{Color.RESET} {full_url}" print(results) - elif response.status_code == 500: results = f"{Color.BLUE}[Internal Server Error]:{Color.RESET} {full_url}" print(results) - except FileNotFoundError: print(Color.RED + "Word list file not found." + Color.RESET) - except TypeError: print(Color.GREEN + "-------------------- Scan Finished --------------------" + Color.RESET) - except KeyboardInterrupt: print(Color.GREEN + "-------------- Attempt interrupted by user ------------" + Color.RESET) - except requests.exceptions.ConnectionError as rec: print(rec) print(Color.RED + "[Error] " + Color.RESET) @@ -153,13 +141,10 @@ def dir_enum(self, wordlist_file, verbose: bool = False): except FileNotFoundError: print(Color.RED + "Word list file not found." + Color.RESET) - except TypeError: print(Color.GREEN + "-------------------- Scan Finished --------------------" + Color.RESET) - except KeyboardInterrupt: print(Color.GREEN + "-------------- Attempt interrupted by user ------------" + Color.RESET) - except requests.exceptions.ConnectionError as rec: print(rec) print(Color.RED + "[Error]" + Color.RESET) @@ -210,7 +195,6 @@ def scan_ports(self, ports): self.open_ports.append(port) results = f"{Color.GREEN} [http://{self.host}] port: {port} is open, {Color.RESET}" print(results) - else: results = f"{Color.RED} [http://{self.host}] port: {port} is closed, {Color.RESET}" print(results) @@ -256,12 +240,10 @@ def find_in_log(self, keyword: str = None): matching_lines = [line for line in lines if self.keyword in line] if matching_lines: - print(Color.GREEN + f"Lines with the word --> '{self.keyword}':" + Color.RESET) for i, line in enumerate(matching_lines, start=1): print(f"Line {i}: {line.strip()}") else: - print(Color.RED + f"No occurrence of the word --> '{self.keyword}' found." + Color.RESET) @@ -336,26 +318,18 @@ def ip_calculator(self, print(Color.RED + "Cannot calculate for this address class." + Color.RESET) else: print(Color.GREEN + "The number of IP addresses in the block is:" + Color.RESET, f"{ip_count}") - - else: print(Color.RED + "Invalid IP address. Make sure you use the correct format." + Color.RESET) elif verify_valid_ip: - if is_valid_ip(self.ip): print(Color.GREEN + "Valid IP address." + Color.RESET) - elif verify_class: - ip_class = calculate_ip_class(self.ip) print(Color.GREEN + f"IP address class: ", + Color.RESET + {ip_class}) - elif calc_subnet_mask: - subnet_mask = calculate_subnet_mask(self.ip) print(Color.GREEN + f"Subnet mask:", + Color.RESET + {subnet_mask}) - elif calc_count: if is_valid_ip(self.ip): ip_count = calculate_ip_count(self.ip) From 84c5ee6f47978f0af1b54ce6e342a636bf510c74 Mon Sep 17 00:00:00 2001 From: Juan Bindez Date: Sat, 18 May 2024 00:36:41 -0300 Subject: [PATCH 13/15] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 96da1fa..e94de1f 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ #### Test in Colab -https://colab.research.google.com/github/JuanBindez/direnumerate-colab/blob/main/direnumerate.ipynb?authuser=1#scrollTo=p85-ili-IB6R +https://colab.research.google.com/github/JuanBindez/direnumerate-colab/blob/main/direnumerate.ipynb ## Description From 9e15c585b387d316fe8ed6cd2109790a95d91d3b Mon Sep 17 00:00:00 2001 From: JuanBindez Date: Wed, 22 May 2024 12:15:51 -0300 Subject: [PATCH 14/15] added deprecated in some functions --- build.rocketfile | 4 ++-- direnumerate/__main__.py | 7 ++++--- direnumerate/ipcalculator.py | 1 - direnumerate/version.py | 2 +- pyproject.toml | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/build.rocketfile b/build.rocketfile index ecf3644..d37767e 100644 --- a/build.rocketfile +++ b/build.rocketfile @@ -1,7 +1,7 @@ git add . -git commit -m ' added deprecated warnings and fixed the command line ip info #5 ' +git commit -m ' added deprecated in some functions' git push -u origin main -git tag v3.3.1 +git tag v3.4.0 git push --tag make clean make upload diff --git a/direnumerate/__main__.py b/direnumerate/__main__.py index 02a45f8..024e17c 100644 --- a/direnumerate/__main__.py +++ b/direnumerate/__main__.py @@ -223,6 +223,7 @@ def __init__(self, file_log): """ self.file_log = file_log + @deprecated def find_in_log(self, keyword: str = None): """ Search for the specified keyword in the log file and display matching lines. @@ -282,7 +283,7 @@ class InfoIp: def __init__(self, ip): self.ip = ip - + @deprecated def ip_calculator(self, all: bool = False, verify_valid_ip: bool = False, @@ -340,7 +341,7 @@ def ip_calculator(self, else: print(Color.RED + "Invalid IP address. Make sure to use the correct format.", + Color.RESET) - + @deprecated def show_info(self): """ Display detailed information about the IP address, including its geographical location, hostname, and more. @@ -382,7 +383,7 @@ def show_info(self): ic.ip_calculator(all=True) -@deprecated + class UserScan: def __init__(self, user_name): self.user_name = user_name diff --git a/direnumerate/ipcalculator.py b/direnumerate/ipcalculator.py index afd9ea8..4c44b8d 100644 --- a/direnumerate/ipcalculator.py +++ b/direnumerate/ipcalculator.py @@ -1,5 +1,4 @@ - def is_valid_ip(ip): try: parts = ip.split('.') diff --git a/direnumerate/version.py b/direnumerate/version.py index 59c5784..4389e3d 100644 --- a/direnumerate/version.py +++ b/direnumerate/version.py @@ -1,4 +1,4 @@ -__version__ = "3.3.1" +__version__ = "3.4.0" if __name__ == "__main__": print(__version__) diff --git a/pyproject.toml b/pyproject.toml index b1e3f42..5d9a767 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "direnumerate" -version = "3.3.1" +version = "3.4.0" authors = [ { name="Juan Bindez", email="juanbindez780@gmail.com" }, ] From e4bbe306903ab4e2093ff1b4ce56e74a7aded661 Mon Sep 17 00:00:00 2001 From: Juan Bindez Date: Wed, 22 May 2024 23:10:26 -0300 Subject: [PATCH 15/15] Update index.rst --- docs/index.rst | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/index.rst b/docs/index.rst index 4171519..fd16612 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -51,7 +51,6 @@ of direnumerate. user/portscan user/infoip user/findinlog - user/userscan The API Documentation