Merge pull request #202444 from fabaff/crackmapexec-bump

crackmapexec: 5.3.0 -> 5.4.0

pkgs/development/python-modules/masky/default.nix

@@ -0,0 +1,48 @@
+{ lib
+, asn1crypto
+, buildPythonPackage
+, colorama
+, cryptography
+, fetchFromGitHub
+, impacket
+, pyasn1
+, pythonOlder
+}:
+
+buildPythonPackage rec {
+  pname = "masky";
+  version = "0.1.1";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
+
+  src = fetchFromGitHub {
+    owner = "Z4kSec";
+    repo = "Masky";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-uxq4SBudxFbBiV3Cu+oBRKezIWf5p+8VJlIIqQjtSXA=";
+  };
+
+  propagatedBuildInputs = [
+    asn1crypto
+    colorama
+    cryptography
+    impacket
+    pyasn1
+  ];
+
+  # Module has no tests
+  doCheck = false;
+
+  pythonImportsCheck = [
+    "masky"
+  ];
+
+  meta = with lib; {
+    description = "Library to remotely dump domain credentials";
+    homepage = "https://github.com/Z4kSec/Masky";
+    changelog = "https://github.com/Z4kSec/Masky/releases/tag/v${version}";
+    license = licenses.mit;
+    maintainers = with maintainers; [ elasticdog ];
+  };
+}

pkgs/development/python-modules/ntlm-auth/default.nix

@@ -4,24 +4,26 @@
 , fetchFromGitHub
 , mock
 , pytestCheckHook
+, pythonOlder
 , requests
-, six
 }:
 
 buildPythonPackage rec {
   pname = "ntlm-auth";
   version = "1.5.0";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "jborean93";
     repo = "ntlm-auth";
     rev = "v${version}";
-    sha256 = "00dpf5bfsy07frsjihv1k10zmwcyq4bvkilbxha7h6nlwpcm2409";
+    hash = "sha256-CRBR2eXUGngU7IvGuRfBnvH6QZhhwyh1dgd47VZxtwE=";
   };
 
   propagatedBuildInputs = [
     cryptography
-    six
   ];
 
   checkInputs = [
@@ -30,13 +32,27 @@ buildPythonPackage rec {
     requests
   ];
 
-  pythonImportsCheck = [ "ntlm_auth" ];
+  pythonImportsCheck = [
+    "ntlm_auth"
+  ];
+
+  disabledTests = [
+    # Tests are outdated as module will be replaced by pyspnego
+    "test_authenticate_message"
+    "test_authenticate_without_domain_workstation"
+    "test_create_authenticate_message"
+    "test_get_"
+    "test_lm_v"
+    "test_nt_"
+    "test_ntlm_context"
+    "test_ntowfv"
+  ];
 
   meta = with lib; {
     description = "Calculates NTLM Authentication codes";
     homepage = "https://github.com/jborean93/ntlm-auth";
+    changelog = "https://github.com/jborean93/ntlm-auth/releases/tag/v${version}";
     license = licenses.mit;
     maintainers = with maintainers; [ elasticdog ];
-    platforms = platforms.all;
   };
 }

pkgs/tools/security/crackmapexec/default.nix

@@ -5,14 +5,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "crackmapexec";
-  version = "5.3.0";
+  version = "5.4.0";
   format = "pyproject";
 
   src = fetchFromGitHub {
-    owner = "byt3bl33d3r";
+    owner = "Porchetta-Industries";
     repo = "CrackMapExec";
-    rev = "v${version}";
-    hash = "sha256-wPS1PCvR9Ffp0r9lZZkFATt+i+eR5ap16HzLWDZbJKI=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-V2n840QyLofTfQE4vtFYGfQwl65sklp+KfNS9RCLvI8=";
   };
 
   nativeBuildInputs = with python3.pkgs; [
@@ -27,6 +27,7 @@ python3.pkgs.buildPythonApplication rec {
     dsinternals
     impacket
     lsassy
+    masky
     msgpack
     neo4j
     paramiko
@@ -56,7 +57,8 @@ python3.pkgs.buildPythonApplication rec {
 
   meta = with lib; {
     description = "Tool for pentesting networks";
-    homepage = "https://github.com/byt3bl33d3r/CrackMapExec";
+    homepage = "https://github.com/Porchetta-Industries/CrackMapExec";
+    changelog = "https://github.com/Porchetta-Industries/CrackMapExec/releases/tag/v${version}";
     license = with licenses; [ bsd2 ];
     maintainers = with maintainers; [ fab ];
     mainProgram = "cme";

pkgs/top-level/python-packages.nix

@@ -5561,6 +5561,8 @@ self: super: with self; {
 
   mask-rcnn = callPackage ../development/python-modules/mask-rcnn { };
 
+  masky = callPackage ../development/python-modules/masky { };
+
   mastodon-py = callPackage ../development/python-modules/mastodon-py { };
 
   mat2 = callPackage ../development/python-modules/mat2 { };