diff options
author | Martin Weinelt <hexa@darmstadt.ccc.de> | 2022-10-05 00:44:16 +0200 |
---|---|---|
committer | Martin Weinelt <hexa@darmstadt.ccc.de> | 2022-10-05 00:44:16 +0200 |
commit | 253ca4957d2e59a4d44ea47705c42629b2e133dd (patch) | |
tree | 6c345b7d7c7f392a6bfad262235371c81631d76e /pkgs/tools/security | |
parent | 48177fb6ea88f89f0bac48aeb2f5bca826ae1dec (diff) | |
parent | af4fc0bf1cb83a126d16bece462ad8d186d6ce73 (diff) | |
download | nixpkgs-253ca4957d2e59a4d44ea47705c42629b2e133dd.tar nixpkgs-253ca4957d2e59a4d44ea47705c42629b2e133dd.tar.gz nixpkgs-253ca4957d2e59a4d44ea47705c42629b2e133dd.tar.bz2 nixpkgs-253ca4957d2e59a4d44ea47705c42629b2e133dd.tar.lz nixpkgs-253ca4957d2e59a4d44ea47705c42629b2e133dd.tar.xz nixpkgs-253ca4957d2e59a4d44ea47705c42629b2e133dd.tar.zst nixpkgs-253ca4957d2e59a4d44ea47705c42629b2e133dd.zip |
Merge remote-tracking branch 'origin/master' into staging-next
Diffstat (limited to 'pkgs/tools/security')
-rw-r--r-- | pkgs/tools/security/clairvoyance/default.nix | 51 | ||||
-rw-r--r-- | pkgs/tools/security/dirstalk/default.nix | 36 | ||||
-rw-r--r-- | pkgs/tools/security/gnupg/23.nix | 7 | ||||
-rw-r--r-- | pkgs/tools/security/nmap/default.nix | 4 |
4 files changed, 93 insertions, 5 deletions
diff --git a/pkgs/tools/security/clairvoyance/default.nix b/pkgs/tools/security/clairvoyance/default.nix new file mode 100644 index 00000000000..6d4fc13ed46 --- /dev/null +++ b/pkgs/tools/security/clairvoyance/default.nix @@ -0,0 +1,51 @@ +{ lib +, fetchFromGitHub +, python3 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "clairvoyance"; + version = "2.0.4"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "nikitastupin"; + repo = pname; + rev = "v${version}"; + hash = "sha256-b69a3UTRt5axTSjLcEYkqGe7bFlQKCiMzoNtw91HCyI="; + }; + + nativeBuildInputs = with python3.pkgs; [ + poetry-core + ]; + + propagatedBuildInputs = with python3.pkgs; [ + aiohttp + ]; + + checkInputs = with python3.pkgs; [ + aiounittest + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'asyncio = "^3.4.3"' "" + ''; + + pythonImportsCheck = [ + "clairvoyance" + ]; + + disabledTests = [ + # KeyError + "test_probe_typename" + ]; + + meta = with lib; { + description = "Tool to obtain GraphQL API schemas"; + homepage = "https://github.com/nikitastupin/clairvoyance"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/tools/security/dirstalk/default.nix b/pkgs/tools/security/dirstalk/default.nix new file mode 100644 index 00000000000..59ad831b7a1 --- /dev/null +++ b/pkgs/tools/security/dirstalk/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "dirstalk"; + version = "1.3.3"; + + src = fetchFromGitHub { + owner = "stefanoj3"; + repo = pname; + rev = version; + hash = "sha256-gSMkTGzMDI+scG3FQ0u0liUDL4qOPPW2UWLlAQcmmaA="; + }; + + vendorHash = "sha256-nesKIaMMuN71LpvX8nOm7hDecgGjnx3tmsinrJg4GpQ="; + + subPackages = "cmd/dirstalk"; + + ldflags = [ + "-w" + "-s" + "-X github.com/stefanoj3/dirstalk/pkg/cmd.Version=${version}" + ]; + + # Tests want to write to the root directory + doCheck = false; + + meta = with lib; { + description = "Tool to brute force paths on web servers"; + homepage = "https://github.com/stefanoj3/dirstalk"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/tools/security/gnupg/23.nix b/pkgs/tools/security/gnupg/23.nix index cb11e9f7eab..0b7941ce46e 100644 --- a/pkgs/tools/security/gnupg/23.nix +++ b/pkgs/tools/security/gnupg/23.nix @@ -2,8 +2,9 @@ , libgpg-error, libiconv, npth, gettext, texinfo, buildPackages , guiSupport ? stdenv.isDarwin, enableMinimal ? false , adns, bzip2, gnutls, libusb1, openldap -, tpm2-tss, pinentry, readline, sqlite, zlib +, pinentry, readline, sqlite, zlib , withPcsc ? !enableMinimal, pcsclite +, withTpm2Tss ? !stdenv.isDarwin && !enableMinimal, tpm2-tss }: assert guiSupport -> enableMinimal == false; @@ -23,7 +24,7 @@ stdenv.mkDerivation rec { libgcrypt libassuan libksba libiconv npth gettext ] ++ lib.optionals (!enableMinimal) ([ readline libusb1 gnutls adns openldap zlib bzip2 sqlite - ] ++ lib.optional (!stdenv.isDarwin) tpm2-tss); + ] ++ lib.optional withTpm2Tss tpm2-tss); patches = [ ./fix-libusb-include-path.patch @@ -56,7 +57,7 @@ stdenv.mkDerivation rec { "--with-ksba-prefix=${libksba.dev}" "--with-npth-prefix=${npth}" ] ++ lib.optional guiSupport "--with-pinentry-pgm=${pinentry}/${pinentryBinaryPath}" - ++ lib.optional ((!stdenv.isDarwin) && (!enableMinimal)) "--with-tss=intel"; + ++ lib.optional withTpm2Tss "--with-tss=intel"; postInstall = if enableMinimal then '' rm -r $out/{libexec,sbin,share} diff --git a/pkgs/tools/security/nmap/default.nix b/pkgs/tools/security/nmap/default.nix index 5e71c2e1655..d6276b3cc40 100644 --- a/pkgs/tools/security/nmap/default.nix +++ b/pkgs/tools/security/nmap/default.nix @@ -10,11 +10,11 @@ with lib; stdenv.mkDerivation rec { pname = "nmap"; - version = "7.92"; + version = "7.93"; src = fetchurl { url = "https://nmap.org/dist/nmap-${version}.tar.bz2"; - sha256 = "sha256-pUefL4prCyUWdn0vcYnDhsHchY2ZcWfX7Fz8eYx1caE="; + sha256 = "sha256-Vbz+R5PiWsyWukJ02MQijbVQuOjv1yAEs47FWi3RZlE="; }; patches = [ ./zenmap.patch ] |