From e885d19f8a8c72cd17a43edf013c4ec4cb1d6619 Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Sat, 4 Mar 2023 16:02:23 +0100 Subject: [PATCH] Minor fixes --- .github/workflows/lint_python.yml | 2 +- core.py | 17 ++++++++--------- generate_readme.py | 1 - hackingtool.py | 10 +++++----- tools/payload_creator.py | 3 +-- 5 files changed, 15 insertions(+), 18 deletions(-) diff --git a/.github/workflows/lint_python.yml b/.github/workflows/lint_python.yml index 4cb86f6..fff9533 100644 --- a/.github/workflows/lint_python.yml +++ b/.github/workflows/lint_python.yml @@ -22,7 +22,7 @@ jobs: --statistics --target-version=py37 . | grep "\[\*\]" - run: pip install black codespell mypy pytest safety - run: black --check . || true - - run: codespell # --ignore-words-list="" --skip="*.css,*.js,*.lock" + - run: codespell - run: pip install -r requirements.txt || pip install --editable . || pip install . || true - run: mkdir --parents --verbose .mypy_cache - run: mypy --ignore-missing-imports --install-types --non-interactive . || true diff --git a/core.py b/core.py index 537a716..4915660 100644 --- a/core.py +++ b/core.py @@ -1,4 +1,3 @@ -# coding=utf-8 import os import sys import webbrowser @@ -69,13 +68,13 @@ class HackingTool(object): if self.PROJECT_URL: print(f"[{98}] Open project page") print(f"[{99}] Back to {parent.TITLE if parent is not None else 'Exit'}") - option_index = input("Select an option : ") + option_index = input("Select an option : ").strip() try: option_index = int(option_index) if option_index - 1 in range(len(self.OPTIONS)): ret_code = self.OPTIONS[option_index - 1][1]() if ret_code != 99: - input("\n\nPress ENTER to continue:") + input("\n\nPress ENTER to continue:").strip() elif option_index == 98: self.show_project_page() elif option_index == 99: @@ -84,10 +83,10 @@ class HackingTool(object): return 99 except (TypeError, ValueError): print("Please enter a valid option") - input("\n\nPress ENTER to continue:") + input("\n\nPress ENTER to continue:").strip() except Exception: print_exc() - input("\n\nPress ENTER to continue:") + input("\n\nPress ENTER to continue:").strip() return self.show_options(parent = parent) def before_install(self): @@ -157,21 +156,21 @@ class HackingToolsCollection(object): for index, tool in enumerate(self.TOOLS): print(f"[{index} {tool.TITLE}") print(f"[{99}] Back to {parent.TITLE if parent is not None else 'Exit'}") - tool_index = input("Choose a tool to proceed: ") + tool_index = input("Choose a tool to proceed: ").strip() try: tool_index = int(tool_index) if tool_index in range(len(self.TOOLS)): ret_code = self.TOOLS[tool_index].show_options(parent = self) if ret_code != 99: - input("\n\nPress ENTER to continue:") + input("\n\nPress ENTER to continue:").strip() elif tool_index == 99: if parent is None: sys.exit() return 99 except (TypeError, ValueError): print("Please enter a valid option") - input("\n\nPress ENTER to continue:") + input("\n\nPress ENTER to continue:").strip() except Exception: print_exc() - input("\n\nPress ENTER to continue:") + input("\n\nPress ENTER to continue:").strip() return self.show_options(parent = parent) diff --git a/generate_readme.py b/generate_readme.py index 1b90a03..069b015 100644 --- a/generate_readme.py +++ b/generate_readme.py @@ -1,4 +1,3 @@ -# coding=utf-8 import re from core import HackingTool diff --git a/hackingtool.py b/hackingtool.py index 9753442..7626400 100755 --- a/hackingtool.py +++ b/hackingtool.py @@ -1,7 +1,7 @@ -##!/usr/bin/env python3 -# -*- coding: UTF-8 -*- +#!/usr/bin/env python3 # Version 1.1.0 import os +import sys import webbrowser from platform import system from time import sleep @@ -83,10 +83,10 @@ if __name__ == "__main__": [1] Manual [2] Default """) - choice = input("Z4nzu =>> ") + choice = input("Z4nzu =>> ").strip() if choice == "1": - inpath = input("Enter Path (with Directory Name) >> ") + inpath = input("Enter Path (with Directory Name) >> ").strip() with open(fpath, "w") as f: f.write(inpath) print("Successfully Set Path to: {}".format(inpath)) @@ -98,7 +98,7 @@ if __name__ == "__main__": sleep(3) else: print("Try Again..!!") - exit(0) + sys.exit(0) with open(fpath) as f: archive = f.readline() diff --git a/tools/payload_creator.py b/tools/payload_creator.py index 2976aa9..34ed64a 100644 --- a/tools/payload_creator.py +++ b/tools/payload_creator.py @@ -1,4 +1,3 @@ -# coding=utf-8 import os from core import HackingTool @@ -49,7 +48,7 @@ class Brutal(HackingTool): >> Arduino Software (I used v1.6.7) >> TeensyDuino >> Linux udev rules - >> Copy and paste the PaensyLib folder inside your Arduino\libraries + >> Copy and paste the PaensyLib folder inside your Arduino libraries [!] Kindly Visit below link for Installation for Arduino >> https://github.com/Screetsec/Brutal/wiki/Install-Requirements