From 630e9026548098ceddd467e4d36b8c7b334c6316 Mon Sep 17 00:00:00 2001 From: mpgn Date: Wed, 1 Feb 2023 06:03:50 -0500 Subject: [PATCH] Fix aardwolf rust building dependency --- poetry.lock | 63 +++++++++++++++++++++--------------------------- pyproject.toml | 4 +-- requirements.txt | 18 +++++++------- 3 files changed, 38 insertions(+), 47 deletions(-) diff --git a/poetry.lock b/poetry.lock index c3401eb8..8d7ab9f0 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1,31 +1,24 @@ [[package]] name = "aardwolf" -version = "0.2.2" +version = "0.2.5" description = "Asynchronous RDP protocol implementation" category = "main" optional = false python-versions = ">=3.7" -develop = false [package.dependencies] arc4 = ">=0.3.0" asn1crypto = "*" asn1tools = "*" -asyauth = ">=0.0.5" -asysocks = ">=0.2.2" +asyauth = ">=0.0.11" +asysocks = ">=0.2.5" colorama = "*" -minikerberos = ">=0.3.3" +minikerberos = ">=0.3.5" Pillow = ">=9.0.0" pyperclip = ">=1.8.2" tqdm = "*" unicrypto = ">=0.0.9" -[package.source] -type = "git" -url = "https://github.com/skelsec/aardwolf.git" -reference = "34cf53a" -resolved_reference = "34cf53a14fbef7798c5fff5c31ab92f3c9d69f63" - [[package]] name = "aesedb" version = "0.1.0" @@ -51,7 +44,7 @@ python-versions = ">=3.6" [[package]] name = "aiosmb" -version = "0.4.3" +version = "0.4.4" description = "Asynchronous SMB protocol implementation" category = "main" optional = false @@ -59,10 +52,10 @@ python-versions = ">=3.7" [package.dependencies] asn1crypto = "*" -asyauth = ">=0.0.4" +asyauth = ">=0.0.8" asysocks = ">=0.2.2" colorama = "*" -minikerberos = ">=0.3.3" +minikerberos = ">=0.3.5" prompt-toolkit = ">=3.0.2" six = "*" tqdm = "*" @@ -138,7 +131,7 @@ wrapt = ">=1.11,<2" [[package]] name = "asyauth" -version = "0.0.7" +version = "0.0.11" description = "Unified authentication library" category = "main" optional = false @@ -146,8 +139,8 @@ python-versions = ">=3.7" [package.dependencies] asn1crypto = ">=1.3.0" -asysocks = ">=0.2.2" -minikerberos = ">=0.3.3" +asysocks = ">=0.2.5" +minikerberos = ">=0.3.5" unicrypto = ">=0.0.9" [[package]] @@ -175,7 +168,7 @@ typecheck = ["mypy"] [[package]] name = "beautifulsoup4" -version = "4.11.1" +version = "4.11.2" description = "Screen-scraping library" category = "main" optional = false @@ -425,16 +418,16 @@ testing = ["pytest (>=4.6)", "pytest-checkdocs (>=2.4)", "pytest-flake8", "pytes [[package]] name = "isort" -version = "5.11.4" +version = "5.11.5" description = "A Python utility / library to sort Python imports." category = "dev" optional = false python-versions = ">=3.7.0" [package.extras] +pipfile-deprecated-finder = ["pipreqs", "requirementslib", "pip-shims (>=0.5.2)"] +requirements-deprecated-finder = ["pipreqs", "pip-api"] colors = ["colorama (>=0.4.3,<0.5.0)"] -requirements-deprecated-finder = ["pip-api", "pipreqs"] -pipfile-deprecated-finder = ["pipreqs", "requirementslib"] plugins = ["setuptools"] [[package]] @@ -590,7 +583,7 @@ python-versions = ">=3.6" [[package]] name = "minikerberos" -version = "0.3.3" +version = "0.3.5" description = "Kerberos manipulation library in pure Python" category = "main" optional = false @@ -600,6 +593,7 @@ python-versions = ">=3.6" asn1crypto = ">=1.3.0" asysocks = ">=0.2.2" oscrypto = ">=1.2.1" +tqdm = "*" unicrypto = ">=0.0.9" [[package]] @@ -689,7 +683,7 @@ invoke = ["invoke (>=1.3)"] [[package]] name = "pathspec" -version = "0.10.3" +version = "0.11.0" description = "Utility library for gitignore style pattern matching of file paths." category = "dev" optional = false @@ -759,7 +753,7 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" [[package]] name = "pycryptodomex" -version = "3.16.0" +version = "3.17" description = "Cryptographic library for Python" category = "main" optional = false @@ -881,7 +875,7 @@ credssp = ["requests-credssp (>=1.0.0,<2.0.0)"] [[package]] name = "pypykatz" -version = "0.6.2" +version = "0.6.3" description = "Python implementation of Mimikatz" category = "main" optional = false @@ -892,7 +886,7 @@ aesedb = ">=0.1.0" aiosmb = ">=0.4.2" aiowinreg = ">=0.0.7" minidump = ">=0.0.21" -minikerberos = ">=0.3.2" +minikerberos = ">=0.3.5" msldap = ">=0.4.1" tqdm = "*" unicrypto = ">=0.0.9" @@ -962,7 +956,7 @@ use_chardet_on_py3 = ["chardet (>=3.0.2,<6)"] [[package]] name = "rich" -version = "13.2.0" +version = "13.3.1" description = "Render rich text, tables, progress bars, syntax highlighting, markdown and more to the terminal" category = "main" optional = false @@ -970,11 +964,11 @@ python-versions = ">=3.7.0" [package.dependencies] markdown-it-py = ">=2.1.0,<3.0.0" -pygments = ">=2.6.0,<3.0.0" +pygments = ">=2.14.0,<3.0.0" typing-extensions = {version = ">=4.0.0,<5.0", markers = "python_version < \"3.9\""} [package.extras] -jupyter = ["ipywidgets (>=7.5.1,<8.0.0)"] +jupyter = ["ipywidgets (>=7.5.1,<9)"] [[package]] name = "shiv" @@ -1143,20 +1137,20 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" [[package]] name = "zipp" -version = "3.11.0" +version = "3.12.0" description = "Backport of pathlib-compatible object wrapper for zip files" category = "main" optional = false python-versions = ">=3.7" [package.extras] -docs = ["sphinx (>=3.5)", "jaraco.packaging (>=9)", "rst.linker (>=1.9)", "furo", "jaraco.tidelift (>=1.4)"] +docs = ["sphinx (>=3.5)", "jaraco.packaging (>=9)", "rst.linker (>=1.9)", "furo", "sphinx-lint", "jaraco.tidelift (>=1.4)"] testing = ["pytest (>=6)", "pytest-checkdocs (>=2.4)", "flake8 (<5)", "pytest-cov", "pytest-enabler (>=1.3)", "jaraco.itertools", "func-timeout", "jaraco.functools", "more-itertools", "pytest-black (>=0.3.7)", "pytest-mypy (>=0.9.1)", "pytest-flake8"] [metadata] lock-version = "1.1" python-versions = "^3.7.0" -content-hash = "53b366a94a9abfbb2718ae032273933c19b1738f9deb19e6bd9ed3aeb6cf4242" +content-hash = "8964711312814e37111763938fb4f5d4392fea2d9acc12707f4b8e8ac1ced608" [metadata.files] aardwolf = [] @@ -1183,10 +1177,7 @@ astroid = [] asyauth = [] asysocks = [] bcrypt = [] -beautifulsoup4 = [ - {file = "beautifulsoup4-4.11.1-py3-none-any.whl", hash = "sha256:58d5c3d29f5a36ffeb94f02f0d786cd53014cf9b3b3951d42e0080d8a9498d30"}, - {file = "beautifulsoup4-4.11.1.tar.gz", hash = "sha256:ad9aa55b65ef2808eb405f46cf74df7fcb7044d5cbc26487f96eb2ef2e436693"}, -] +beautifulsoup4 = [] bitstruct = [ {file = "bitstruct-8.15.1.tar.gz", hash = "sha256:6fa6adbfb8f3b8cb68c21b13aa65d23eb2c3ac32419ab926f3fd1fff717a9125"}, ] diff --git a/pyproject.toml b/pyproject.toml index c225b2cc..1bc1bc65 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -41,8 +41,8 @@ xmltodict = "^0.12.0" terminaltables = "^3.1.0" aioconsole = "^0.3.3" pywerview = "^0.3.3" -minikerberos = "0.3.3" -aardwolf = { git = "https://github.com/skelsec/aardwolf.git", rev = "34cf53a" } +minikerberos = "0.3.5" +aardwolf = "0.2.5" masky = "^0.1.1" [tool.poetry.dev-dependencies] diff --git a/requirements.txt b/requirements.txt index 07d9d18c..bb943845 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,15 +1,15 @@ -aardwolf @ git+https://github.com/skelsec/aardwolf.git@34cf53a ; python_version >= "3.7" +aardwolf==0.2.5; python_version >= "3.7" aesedb==0.1.0; python_version >= "3.6" aioconsole==0.3.3; python_version >= "3.6" -aiosmb==0.4.3; python_version >= "3.7" +aiosmb==0.4.4; python_version >= "3.7" aiowinreg==0.0.7; python_version >= "3.6" arc4==0.3.0; python_version >= "3.7" asn1crypto==1.5.1; python_version >= "3.7" asn1tools==0.165.0; python_version >= "3.7" -asyauth==0.0.7; python_version >= "3.7" +asyauth==0.0.11; python_version >= "3.7" asysocks==0.2.5; python_version >= "3.7" bcrypt==4.0.1; python_version >= "3.6" -beautifulsoup4==4.11.1; python_full_version >= "3.6.0" +beautifulsoup4==4.11.2; python_full_version >= "3.6.0" bitstruct==8.15.1; python_version >= "3.7" bs4==0.0.1 certifi==2022.12.7; python_version >= "3.7" and python_version < "4" @@ -36,7 +36,7 @@ markupsafe==2.1.2; python_version >= "3.7" masky==0.1.2; python_version >= "3.6" mdurl==0.1.2; python_full_version >= "3.7.0" and python_version >= "3.7" minidump==0.0.21; python_version >= "3.6" -minikerberos==0.3.3; python_version >= "3.6" +minikerberos==0.3.5; python_version >= "3.6" msgpack==1.0.4 msldap==0.4.7; python_version >= "3.7" neo4j==4.4.10; python_version >= "3.6" @@ -47,7 +47,7 @@ pillow==9.4.0; python_version >= "3.7" prompt-toolkit==3.0.36; python_full_version >= "3.6.2" and python_version >= "3.7" pyasn1==0.4.8; python_version >= "3.6" pycparser==2.21; python_version >= "3.6" and python_full_version < "3.0.0" and python_version < "4.0" or python_version >= "3.6" and python_version < "4.0" and python_full_version >= "3.4.0" -pycryptodomex==3.16.0; python_version >= "3.7" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version >= "3.7" +pycryptodomex==3.17; python_version >= "3.7" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version >= "3.7" pygments==2.14.0; python_full_version >= "3.7.0" and python_version >= "3.6" pylnk3==0.4.2; python_version >= "3.6" pynacl==1.5.0; python_version >= "3.6" @@ -55,12 +55,12 @@ pyopenssl==23.0.0; python_version >= "3.6" pyparsing==3.0.9; python_full_version >= "3.6.8" and python_version >= "3.7" pyperclip==1.8.2; python_version >= "3.7" pypsrp==0.7.0; python_version >= "3.6" and python_version < "4.0" -pypykatz==0.6.2; python_version >= "3.6" +pypykatz==0.6.3; python_version >= "3.6" pyspnego==0.7.0; python_version >= "3.7" and python_version < "4.0" pytz==2022.7.1; python_version >= "3.6" pywerview==0.3.3 requests==2.28.2; python_version >= "3.7" and python_version < "4" -rich==13.2.0; python_full_version >= "3.7.0" and python_version >= "3.6" +rich==13.3.1; python_full_version >= "3.7.0" and python_version >= "3.6" six==1.16.0; python_version >= "3.7" and python_full_version < "3.0.0" or python_full_version >= "3.3.0" and python_version >= "3.7" soupsieve==2.3.2.post1; python_version >= "3.6" and python_full_version >= "3.6.0" termcolor==1.1.0 @@ -73,4 +73,4 @@ wcwidth==0.2.6; python_full_version >= "3.6.2" and python_version >= "3.7" werkzeug==2.2.2; python_version >= "3.7" winacl==0.1.6; python_version >= "3.7" xmltodict==0.12.0; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.4.0") -zipp==3.11.0; python_version < "3.8" and python_version >= "3.7" +zipp==3.12.0; python_version < "3.8" and python_version >= "3.7"