commit 20a5b5beadeffa7a8c1a5f1f7520db560247305f · pyrox.dev/nixpkgs

lib/maintainers.nix

···

       446
       446
        
         s1lvester = "Markus Silvester <s1lvester@bockhacker.me>";

     

       447
       447
        
         samuelrivas = "Samuel Rivas <samuelrivas@gmail.com>";

     

       448
       448
        
         sander = "Sander van der Burg <s.vanderburg@tudelft.nl>";

     

       449
       449
       +
         sargon = "Daniel Ehlers <danielehlers@mindeye.net>";

     

       449
       450
        
         schmitthenner = "Fabian Schmitthenner <development@schmitthenner.eu>";

     

       450
       451
        
         schneefux = "schneefux <schneefux+nixos_pkg@schneefux.xyz>";

     

       451
       452
        
         schristo = "Scott Christopher <schristopher@konputa.com>";

+2 -1

nixos/modules/module-list.nix

···

       517
       517
        
         ./services/security/munge.nix

     

       518
       518
        
         ./services/security/oauth2_proxy.nix

     

       519
       519
        
         ./services/security/physlock.nix

     

       520
       520
       +
         ./services/security/sshguard.nix

     

       521
       521
       +
         ./services/security/tor.nix

     

       520
       522
        
         ./services/security/torify.nix

     

       521
       521
       -
         ./services/security/tor.nix

     

       522
       523
        
         ./services/security/torsocks.nix

     

       523
       524
        
         ./services/system/cgmanager.nix

     

       524
       525
        
         ./services/system/cloud-init.nix

+140

nixos/modules/services/security/sshguard.nix

···

       1
       1
       +
       { config, lib, pkgs, ... }:

     

       2
       2
       +
       

     

       3
       3
       +
       with lib;

     

       4
       4
       +
       

     

       5
       5
       +
       let

     

       6
       6
       +
         cfg = config.services.sshguard;

     

       7
       7
       +
       in {

     

       8
       8
       +
       

     

       9
       9
       +
         ###### interface

     

       10
       10
       +
       

     

       11
       11
       +
         options = {

     

       12
       12
       +
       

     

       13
       13
       +
           services.sshguard = {

     

       14
       14
       +
             enable = mkOption {

     

       15
       15
       +
               default = false;

     

       16
       16
       +
               type = types.bool;

     

       17
       17
       +
               description = "Whether to enable the sshguard service.";

     

       18
       18
       +
             };

     

       19
       19
       +
       

     

       20
       20
       +
             attack_threshold = mkOption {

     

       21
       21
       +
               default = 30;

     

       22
       22
       +
               type = types.int;

     

       23
       23
       +
               description = ''

     

       24
       24
       +
                   Block attackers when their cumulative attack score exceeds threshold. Most attacks have a score of 10.

     

       25
       25
       +
                 '';

     

       26
       26
       +
             };

     

       27
       27
       +
       

     

       28
       28
       +
             blacklist_threshold = mkOption {

     

       29
       29
       +
               default = null;

     

       30
       30
       +
               example = 120;

     

       31
       31
       +
               type = types.nullOr types.int;

     

       32
       32
       +
               description = ''

     

       33
       33
       +
                   Blacklist an attacker when its score exceeds threshold. Blacklisted addresses are loaded from and added to blacklist-file.

     

       34
       34
       +
                 '';

     

       35
       35
       +
             };

     

       36
       36
       +
       

     

       37
       37
       +
             blacklist_file = mkOption {

     

       38
       38
       +
               default = "/var/lib/sshguard/blacklist.db";

     

       39
       39
       +
               type = types.path;

     

       40
       40
       +
               description = ''

     

       41
       41
       +
                   Blacklist an attacker when its score exceeds threshold. Blacklisted addresses are loaded from and added to blacklist-file.

     

       42
       42
       +
                 '';

     

       43
       43
       +
             };

     

       44
       44
       +
       

     

       45
       45
       +
             blocktime = mkOption {

     

       46
       46
       +
               default = 120;

     

       47
       47
       +
               type = types.int;

     

       48
       48
       +
               description = ''

     

       49
       49
       +
                   Block attackers for initially blocktime seconds after exceeding threshold. Subsequent blocks increase by a factor of 1.5.

     

       50
       50
       +
       

     

       51
       51
       +
                   sshguard unblocks attacks at random intervals, so actual block times will be longer.

     

       52
       52
       +
                 '';

     

       53
       53
       +
             };

     

       54
       54
       +
       

     

       55
       55
       +
             detection_time = mkOption {

     

       56
       56
       +
               default = 1800;

     

       57
       57
       +
               type = types.int;

     

       58
       58
       +
               description = ''

     

       59
       59
       +
                   Remember potential attackers for up to detection_time seconds before resetting their score.

     

       60
       60
       +
                 '';

     

       61
       61
       +
             };

     

       62
       62
       +
       

     

       63
       63
       +
             whitelist = mkOption {

     

       64
       64
       +
               default = [ ];

     

       65
       65
       +
               example = [ "198.51.100.56" "198.51.100.2" ];

     

       66
       66
       +
               type = types.listOf types.str;

     

       67
       67
       +
               description = ''

     

       68
       68
       +
                   Whitelist a list of addresses, hostnames, or address blocks.

     

       69
       69
       +
                 '';

     

       70
       70
       +
             };

     

       71
       71
       +
       

     

       72
       72
       +
             services = mkOption {

     

       73
       73
       +
               default = [ "sshd" ];

     

       74
       74
       +
               example = [ "sshd" "exim" ];

     

       75
       75
       +
               type = types.listOf types.str;

     

       76
       76
       +
               description = ''

     

       77
       77
       +
                   Systemd services sshguard should receive logs of.

     

       78
       78
       +
                 '';

     

       79
       79
       +
             };

     

       80
       80
       +
       

     

       81
       81
       +
           };

     

       82
       82
       +
       

     

       83
       83
       +
         };

     

       84
       84
       +
       

     

       85
       85
       +
       

     

       86
       86
       +
         ###### implementation

     

       87
       87
       +
       

     

       88
       88
       +
         config = mkIf cfg.enable {

     

       89
       89
       +
       

     

       90
       90
       +
           environment.systemPackages = [ pkgs.sshguard pkgs.iptables pkgs.ipset ];

     

       91
       91
       +
       

     

       92
       92
       +
           environment.etc."sshguard.conf".text = let 

     

       93
       93
       +
               list_services = ( name:  "-t ${name} ");

     

       94
       94
       +
             in ''

     

       95
       95
       +
               BACKEND="${pkgs.sshguard}/libexec/sshg-fw-ipset"

     

       96
       96
       +
               LOGREADER="LANG=C ${pkgs.systemd}/bin/journalctl -afb -p info -n1 ${toString (map list_services cfg.services)} -o cat"

     

       97
       97
       +
             '';

     

       98
       98
       +
       

     

       99
       99
       +
           systemd.services.sshguard =

     

       100
       100
       +
             { description = "SSHGuard brute-force attacks protection system";

     

       101
       101
       +
       

     

       102
       102
       +
               wantedBy = [ "multi-user.target" ];

     

       103
       103
       +
               after = [ "network.target" ];

     

       104
       104
       +
               partOf = optional config.networking.firewall.enable "firewall.service";

     

       105
       105
       +
       

     

       106
       106
       +
               path = [ pkgs.iptables pkgs.ipset pkgs.iproute pkgs.systemd ];

     

       107
       107
       +
       

     

       108
       108
       +
               postStart = ''

     

       109
       109
       +
                 mkdir -p /var/lib/sshguard

     

       110
       110
       +
                 ${pkgs.ipset}/bin/ipset -quiet create -exist sshguard4 hash:ip family inet

     

       111
       111
       +
                 ${pkgs.ipset}/bin/ipset -quiet create -exist sshguard6 hash:ip family inet6

     

       112
       112
       +
                 ${pkgs.iptables}/bin/iptables -I INPUT -m set --match-set sshguard4 src -j DROP

     

       113
       113
       +
                 ${pkgs.iptables}/bin/ip6tables -I INPUT -m set --match-set sshguard6 src -j DROP

     

       114
       114
       +
               '';

     

       115
       115
       +
       

     

       116
       116
       +
               preStop = ''

     

       117
       117
       +
                 ${pkgs.iptables}/bin/iptables -D INPUT -m set --match-set sshguard4 src -j DROP

     

       118
       118
       +
                 ${pkgs.iptables}/bin/ip6tables -D INPUT -m set --match-set sshguard6 src -j DROP

     

       119
       119
       +
               '';

     

       120
       120
       +
       

     

       121
       121
       +
               unitConfig.Documentation = "man:sshguard(8)";

     

       122
       122
       +
       

     

       123
       123
       +
               serviceConfig = {

     

       124
       124
       +
                   Type = "simple";

     

       125
       125
       +
                   ExecStart = let

     

       126
       126
       +
                       list_whitelist = ( name:  "-w ${name} ");

     

       127
       127
       +
                     in ''

     

       128
       128
       +
                        ${pkgs.sshguard}/bin/sshguard -a ${toString cfg.attack_threshold} ${optionalString (cfg.blacklist_threshold != null) "-b ${toString cfg.blacklist_threshold}:${cfg.blacklist_file} "}-i /run/sshguard/sshguard.pid -p ${toString cfg.blocktime} -s ${toString cfg.detection_time} ${toString (map list_whitelist cfg.whitelist)}

     

       129
       129
       +
                     '';

     

       130
       130
       +
                   PIDFile = "/run/sshguard/sshguard.pid";

     

       131
       131
       +
                   Restart = "always";

     

       132
       132
       +
       

     

       133
       133
       +
                   ReadOnlyDirectories = "/";

     

       134
       134
       +
                   ReadWriteDirectories = "/run/sshguard /var/lib/sshguard";

     

       135
       135
       +
                   RuntimeDirectory = "sshguard";

     

       136
       136
       +
                   CapabilityBoundingSet = "CAP_NET_ADMIN CAP_NET_RAW";

     

       137
       137
       +
                };

     

       138
       138
       +
             };

     

       139
       139
       +
         };

     

       140
       140
       +
       }

+27

pkgs/tools/security/sshguard/0001-Remove-the-unnecessary-from-ipset-cmds.patch

···

       1
       1
       +
       From 11f0d238d3149c31c4440b8f6a58fe6a00b82d3a Mon Sep 17 00:00:00 2001

     

       2
       2
       +
       From: Daniel Aleksandersen <code@daniel.priv.no>

     

       3
       3
       +
       Date: Mon, 13 Mar 2017 16:29:33 +0100

     

       4
       4
       +
       Subject: [PATCH 1/3] Remove the unnecessary = from ipset cmds

     

       5
       5
       +
       

     

       6
       6
       +
       ---

     

       7
       7
       +
        src/fw/sshg-fw-ipset.sh | 4 ++--

     

       8
       8
       +
        1 file changed, 2 insertions(+), 2 deletions(-)

     

       9
       9
       +
       

     

       10
       10
       +
       diff --git a/src/fw/sshg-fw-ipset.sh b/src/fw/sshg-fw-ipset.sh

     

       11
       11
       +
       index 510bc2c..dc7f86b 100644

     

       12
       12
       +
       --- a/src/fw/sshg-fw-ipset.sh

     

       13
       13
       +
       +++ b/src/fw/sshg-fw-ipset.sh

     

       14
       14
       +
       @@ -3,8 +3,8 @@

     

       15
       15
       +
        # This file is part of SSHGuard.

     

       16
       16
       +
        

     

       17
       17
       +
        fw_init() {

     

       18
       18
       +
       -    ipset -quiet create -exist sshguard4 hash:ip family=inet

     

       19
       19
       +
       -    ipset -quiet create -exist sshguard6 hash:ip family=inet6

     

       20
       20
       +
       +    ipset -quiet create -exist sshguard4 hash:ip family inet

     

       21
       21
       +
       +    ipset -quiet create -exist sshguard6 hash:ip family inet6

     

       22
       22
       +
        }

     

       23
       23
       +
        

     

       24
       24
       +
        fw_block() {

     

       25
       25
       +
       -- 

     

       26
       26
       +
       2.10.0

     

       27
       27
       +

+32

pkgs/tools/security/sshguard/default.nix

···

       1
       1
       +
       { stdenv, fetchurl, autoreconfHook, yacc, flex}:

     

       2
       2
       +
       

     

       3
       3
       +
       

     

       4
       4
       +
       stdenv.mkDerivation rec {

     

       5
       5
       +
         version = "2.0.0";

     

       6
       6
       +
         name = "sshguard-${version}";

     

       7
       7
       +
       

     

       8
       8
       +
         src = fetchurl {

     

       9
       9
       +
           url = "mirror://sourceforge/sshguard/sshguard-2.0.0.tar.gz";

     

       10
       10
       +
           sha256 = "e87c6c4a6dddf06f440ea76464eb6197869c0293f0a60ffa51f8a6a0d7b0cb06";

     

       11
       11
       +
         };

     

       12
       12
       +
       

     

       13
       13
       +
         doCheck = true;

     

       14
       14
       +
       

     

       15
       15
       +
         nativeBuildInputs = [ autoreconfHook yacc flex ];

     

       16
       16
       +
       

     

       17
       17
       +
         configureFlags = [ "--sysconfdir=/etc" ];

     

       18
       18
       +
       

     

       19
       19
       +
         patches = [ ./0001-Remove-the-unnecessary-from-ipset-cmds.patch ];

     

       20
       20
       +
       

     

       21
       21
       +
         meta = with stdenv.lib; {

     

       22
       22
       +
           description = "SSHGuard protects hosts from brute-force attacks";

     

       23
       23
       +
           longDescription = ''

     

       24
       24
       +
             SSHGuard can read log messages from various input sources. Log messages are parsed, line-by-line, for recognized patterns.

     

       25
       25
       +
             If an attack, such as several login failures within a few seconds, is detected, the offending IP is blocked.

     

       26
       26
       +
           '';

     

       27
       27
       +
           homepage = https://sshguard.net;

     

       28
       28
       +
           license = licenses.bsd3;

     

       29
       29
       +
           maintainers = with maintainers; [ sargon ];

     

       30
       30
       +
           platforms = with platforms; linux ++ darwin ++ freebsd ++ netbsd ++ openbsd;

     

       31
       31
       +
         };

     

       32
       32
       +
       }

pkgs/top-level/all-packages.nix

···

       3912
       3912
        
       

     

       3913
       3913
        
         snort = callPackage ../applications/networking/ids/snort { };

     

       3914
       3914
        
       

     

       3915
       3915
       +
         sshguard = callPackage ../tools/security/sshguard {};

     

       3916
       3916
       +
       

     

       3915
       3917
        
         softhsm = callPackage ../tools/security/softhsm { };

     

       3916
       3918
        
       

     

       3917
       3919
        
         solr = callPackage ../servers/search/solr { };