From e4299be27f615d9917d726d616d62b023e65e6a6 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 27 Apr 2023 18:35:22 +0200
Subject: [PATCH 1/2] python310Packages.sectools: init at 1.3.9

---
 .../python-modules/sectools/default.nix       | 40 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 42 insertions(+)
 create mode 100644 pkgs/development/python-modules/sectools/default.nix

diff --git a/pkgs/development/python-modules/sectools/default.nix b/pkgs/development/python-modules/sectools/default.nix
new file mode 100644
index 000000000000..2fdc27283f08
--- /dev/null
+++ b/pkgs/development/python-modules/sectools/default.nix
@@ -0,0 +1,40 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, ldap3
+, pythonOlder
+}:
+
+buildPythonPackage rec {
+  pname = "sectools";
+  version = "1.3.9";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
+
+  src = fetchFromGitHub {
+    owner = "p0dalirius";
+    repo = pname;
+    rev = "refs/tags/${version}";
+    hash = "sha256-F9mmPSlfSSS7UDNuX9OPrqDsEpqq0bD3eROG8D9CC78=";
+  };
+
+  propagatedBuildInputs = [
+    ldap3
+  ];
+
+  # Module has no tests
+  doCheck = false;
+
+  pythonImportsCheck = [
+    "sectools"
+  ];
+
+  meta = with lib; {
+    description = "library containing functions to write security tools";
+    homepage = "https://github.com/p0dalirius/sectools";
+    changelog = "https://github.com/p0dalirius/sectools/releases/tag/${version}";
+    license = with licenses; [ gpl3Only ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3911f78be3f3..34ad6f8f2a0b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10655,6 +10655,8 @@ self: super: with self; {
 
   securetar = callPackage ../development/python-modules/securetar { };
 
+  sectools = callPackage ../development/python-modules/sectools { };
+
   seedir = callPackage ../development/python-modules/seedir { };
 
   seekpath = callPackage ../development/python-modules/seekpath { };

From b57cc76031c278380c1aff8357e6e054483e1299 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 27 Apr 2023 18:51:47 +0200
Subject: [PATCH 2/2] apachetomcatscanner: init at 3.5

---
 .../security/apachetomcatscanner/default.nix  | 38 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 40 insertions(+)
 create mode 100644 pkgs/tools/security/apachetomcatscanner/default.nix

diff --git a/pkgs/tools/security/apachetomcatscanner/default.nix b/pkgs/tools/security/apachetomcatscanner/default.nix
new file mode 100644
index 000000000000..13a11808b7dd
--- /dev/null
+++ b/pkgs/tools/security/apachetomcatscanner/default.nix
@@ -0,0 +1,38 @@
+{ lib
+, python3
+, fetchFromGitHub
+}:
+
+python3.pkgs.buildPythonApplication rec {
+  pname = "apachetomcatscanner";
+  version = "3.5";
+  format = "setuptools";
+
+  src = fetchFromGitHub {
+    owner = "p0dalirius";
+    repo = "ApacheTomcatScanner";
+    rev = "refs/tags/${version}";
+    hash = "sha256-ChVVXUjm6y71iRs64Kv63oiOG1GSqmx6J0YiGtEI0ao=";
+  };
+
+  propagatedBuildInputs = with python3.pkgs; [
+    requests
+    sectools
+    xlsxwriter
+  ];
+
+  # Project has no test
+  doCheck = false;
+
+  pythonImportsCheck = [
+    "apachetomcatscanner"
+  ];
+
+  meta = with lib; {
+    description = "Tool to scan for Apache Tomcat server vulnerabilities";
+    homepage = "https://github.com/p0dalirius/ApacheTomcatScanner";
+    changelog = "https://github.com/p0dalirius/ApacheTomcatScanner/releases/tag/${version}";
+    license = with licenses; [ gpl2Only ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 96a42f49ceed..c40daf07c24c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1400,6 +1400,8 @@ with pkgs;
 
   apache-airflow = with python3.pkgs; toPythonApplication apache-airflow;
 
+  apachetomcatscanner = callPackage ../tools/security/apachetomcatscanner { };
+
   airsonic = callPackage ../servers/misc/airsonic { };
 
   airspy = callPackage ../applications/radio/airspy { };