diff --git a/pkgs/development/python-modules/aardwolf/default.nix b/pkgs/development/python-modules/aardwolf/default.nix new file mode 100644 index 000000000000..58d07696de20 --- /dev/null +++ b/pkgs/development/python-modules/aardwolf/default.nix @@ -0,0 +1,57 @@ +{ lib +, arc4 +, asn1crypto +, asn1tools +, asysocks +, buildPythonPackage +, colorama +, fetchPypi +, minikerberos +, pillow +, pyperclip +, pythonOlder +, tqdm +, unicrypto +, winsspi +}: + +buildPythonPackage rec { + pname = "aardwolf"; + version = "0.0.8"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-plz1D+Lr5rV8iJo7IUmuXfjxLvVxX9lgyxyYXUlPH0k="; + }; + + propagatedBuildInputs = [ + arc4 + asn1crypto + asn1tools + asysocks + colorama + minikerberos + pillow + pyperclip + tqdm + unicrypto + winsspi + ]; + + # Module doesn't have tests + doCheck = false; + + pythonImportsCheck = [ + "aardwolf" + ]; + + meta = with lib; { + description = "Asynchronous RDP protocol implementation"; + homepage = "https://github.com/skelsec/aardwolf"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/arc4/default.nix b/pkgs/development/python-modules/arc4/default.nix new file mode 100644 index 000000000000..755950f3a1e0 --- /dev/null +++ b/pkgs/development/python-modules/arc4/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "arc4"; + version = "0.2.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "manicmaniac"; + repo = pname; + rev = version; + hash = "sha256-1VgPYLyBQkxyuUO7KZv5sqYIEieV1RkBtlLVkLUUO4w="; + }; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "arc4" + ]; + + meta = with lib; { + description = "ARCFOUR (RC4) cipher implementation"; + homepage = "https://github.com/manicmaniac/arc4"; + license = with licenses; [ bsd3 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/tools/security/crackmapexec/default.nix b/pkgs/tools/security/crackmapexec/default.nix index f88563498b23..9646f3a7caf2 100644 --- a/pkgs/tools/security/crackmapexec/default.nix +++ b/pkgs/tools/security/crackmapexec/default.nix @@ -1,19 +1,18 @@ { lib , fetchFromGitHub -, fetchpatch , python3 }: python3.pkgs.buildPythonApplication rec { pname = "crackmapexec"; - version = "5.2.2"; + version = "5.3.0"; format = "pyproject"; src = fetchFromGitHub { owner = "byt3bl33d3r"; repo = "CrackMapExec"; rev = "v${version}"; - hash = "sha256-IgD8RjwVEoEXmnHU3DR3wzUdJDWIbFw9sES5qYg30a8="; + hash = "sha256-wPS1PCvR9Ffp0r9lZZkFATt+i+eR5ap16HzLWDZbJKI="; }; nativeBuildInputs = with python3.pkgs; [ @@ -23,6 +22,7 @@ python3.pkgs.buildPythonApplication rec { propagatedBuildInputs = with python3.pkgs; [ aioconsole + aardwolf beautifulsoup4 dsinternals impacket @@ -40,21 +40,13 @@ python3.pkgs.buildPythonApplication rec { xmltodict ]; - patches = [ - # Switch to poetry-core, https://github.com/byt3bl33d3r/CrackMapExec/pull/580 - (fetchpatch { - name = "switch-to-poetry-core.patch"; - url = "https://github.com/byt3bl33d3r/CrackMapExec/commit/e5c6c2b5c7110035b34ea7a080defa6d42d21dd4.patch"; - hash = "sha256-5SpoQD+uSYLM6Rdq0/NTbyEv4RsBUuawNNsknS71I9M="; - }) - ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace '{ git = "https://github.com/mpgn/impacket.git", branch = "master" }' '"x"' + ''; pythonRelaxDeps = true; - pythonRemoveDeps = [ - "bs4" - ]; - # Project has no tests doCheck = false; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5c286acfdc9c..cf62f4cd817d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -151,6 +151,8 @@ in { aafigure = callPackage ../development/python-modules/aafigure { }; + aardwolf = callPackage ../development/python-modules/aardwolf { }; + abodepy = callPackage ../development/python-modules/abodepy { }; absl-py = callPackage ../development/python-modules/absl-py { }; @@ -633,6 +635,8 @@ in { arabic-reshaper = callPackage ../development/python-modules/arabic-reshaper { }; + arc4 = callPackage ../development/python-modules/arc4 { }; + arcam-fmj = callPackage ../development/python-modules/arcam-fmj { }; archinfo = callPackage ../development/python-modules/archinfo { };