commit bcbedfeefc21fee3e3f7f897c803adfad425f6d0 · pyrox.dev/nixpkgs

nixos/doc/manual/from_md/release-notes/rl-2305.section.xml

···

       67
       67
        
                 <link xlink:href="options.html#opt-services.v2raya.enable">services.v2raya</link>.

     

       68
       68
        
               </para>

     

       69
       69
        
             </listitem>

     

       70
       70
       +
             <listitem>

     

       71
       71
       +
               <para>

     

       72
       72
       +
                 <link xlink:href="https://www.netfilter.org/projects/ulogd/index.html">ulogd</link>,

     

       73
       73
       +
                 a userspace logging daemon for netfilter/iptables related

     

       74
       74
       +
                 logging. Available as

     

       75
       75
       +
                 <link xlink:href="options.html#opt-services.ulogd.enable">services.ulogd</link>.

     

       76
       76
       +
               </para>

     

       77
       77
       +
             </listitem>

     

       70
       78
        
           </itemizedlist>

     

       71
       79
        
         </section>

     

       72
       80
        
         <section xml:id="sec-release-23.05-incompatibilities">

nixos/doc/manual/release-notes/rl-2305.section.md

···

       26
       26
        
       

     

       27
       27
        
       - [v2rayA](https://v2raya.org), a Linux web GUI client of Project V which supports V2Ray, Xray, SS, SSR, Trojan and Pingtunnel. Available as [services.v2raya](options.html#opt-services.v2raya.enable).

     

       28
       28
        
       

     

       29
       29
       +
       - [ulogd](https://www.netfilter.org/projects/ulogd/index.html), a userspace logging daemon for netfilter/iptables related logging. Available as [services.ulogd](options.html#opt-services.ulogd.enable).

     

       30
       30
       +
       

     

       29
       31
        
       ## Backward Incompatibilities {#sec-release-23.05-incompatibilities}

     

       30
       32
        
       

     

       31
       33
        
       <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->

nixos/modules/module-list.nix

···

       520
       520
        
         ./services/logging/syslog-ng.nix

     

       521
       521
        
         ./services/logging/syslogd.nix

     

       522
       522
        
         ./services/logging/vector.nix

     

       523
       523
       +
         ./services/logging/ulogd.nix

     

       523
       524
        
         ./services/mail/clamsmtp.nix

     

       524
       525
        
         ./services/mail/davmail.nix

     

       525
       526
        
         ./services/mail/dkimproxy-out.nix

+48

nixos/modules/services/logging/ulogd.nix

···

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

     

       2
       2
       +
       

     

       3
       3
       +
       with lib;

     

       4
       4
       +
       let

     

       5
       5
       +
         cfg = config.services.ulogd;

     

       6
       6
       +
         settingsFormat = pkgs.formats.ini { };

     

       7
       7
       +
         settingsFile = settingsFormat.generate "ulogd.conf" cfg.settings;

     

       8
       8
       +
       in {

     

       9
       9
       +
         options = {

     

       10
       10
       +
           services.ulogd = {

     

       11
       11
       +
             enable = mkEnableOption (lib.mdDoc "ulogd");

     

       12
       12
       +
       

     

       13
       13
       +
             settings = mkOption {

     

       14
       14
       +
               example = {

     

       15
       15
       +
                 global.stack = "stack=log1:NFLOG,base1:BASE,pcap1:PCAP";

     

       16
       16
       +
                 log1.group = 2;

     

       17
       17
       +
                 pcap1 = {

     

       18
       18
       +
                   file = "/var/log/ulogd.pcap";

     

       19
       19
       +
                   sync = 1;

     

       20
       20
       +
                 };

     

       21
       21
       +
               };

     

       22
       22
       +
               type = settingsFormat.type;

     

       23
       23
       +
               default = { };

     

       24
       24
       +
               description = lib.mdDoc "Configuration for ulogd. See {file}`/share/doc/ulogd/` in `pkgs.ulogd.doc`.";

     

       25
       25
       +
             };

     

       26
       26
       +
       

     

       27
       27
       +
             logLevel = mkOption {

     

       28
       28
       +
               type = types.enum [ 1 3 5 7 8 ];

     

       29
       29
       +
               default = 5;

     

       30
       30
       +
               description = lib.mdDoc "Log level (1 = debug, 3 = info, 5 = notice, 7 = error, 8 = fatal)";

     

       31
       31
       +
             };

     

       32
       32
       +
           };

     

       33
       33
       +
         };

     

       34
       34
       +
       

     

       35
       35
       +
         config = mkIf cfg.enable {

     

       36
       36
       +
           systemd.services.ulogd = {

     

       37
       37
       +
             description = "Ulogd Daemon";

     

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

     

       39
       39
       +
             wants = [ "network-pre.target" ];

     

       40
       40
       +
             before = [ "network-pre.target" ];

     

       41
       41
       +
       

     

       42
       42
       +
             serviceConfig = {

     

       43
       43
       +
               ExecStart = "${pkgs.ulogd}/bin/ulogd -c ${settingsFile} --verbose --loglevel ${toString cfg.logLevel}";

     

       44
       44
       +
               ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";

     

       45
       45
       +
             };

     

       46
       46
       +
           };

     

       47
       47
       +
         };

     

       48
       48
       +
       }

nixos/tests/all-tests.nix

···

       681
       681
        
         tuxguitar = handleTest ./tuxguitar.nix {};

     

       682
       682
        
         ucarp = handleTest ./ucarp.nix {};

     

       683
       683
        
         udisks2 = handleTest ./udisks2.nix {};

     

       684
       684
       +
         ulogd = handleTest ./ulogd.nix {};

     

       684
       685
        
         unbound = handleTest ./unbound.nix {};

     

       685
       686
        
         unifi = handleTest ./unifi.nix {};

     

       686
       687
        
         unit-php = handleTest ./web-servers/unit-php.nix {};

+84

nixos/tests/ulogd.nix

···

       1
       1
       +
       import ./make-test-python.nix ({ pkgs, lib, ... }: {

     

       2
       2
       +
         name = "ulogd";

     

       3
       3
       +
       

     

       4
       4
       +
         meta = with lib; {

     

       5
       5
       +
           maintainers = with maintainers; [ p-h ];

     

       6
       6
       +
         };

     

       7
       7
       +
       

     

       8
       8
       +
         nodes.machine = { ... }: {

     

       9
       9
       +
           networking.firewall.enable = false;

     

       10
       10
       +
           networking.nftables.enable = true;

     

       11
       11
       +
           networking.nftables.ruleset = ''

     

       12
       12
       +
             table inet filter {

     

       13
       13
       +
               chain input {

     

       14
       14
       +
                 type filter hook input priority 0;

     

       15
       15
       +
                 log group 2 accept

     

       16
       16
       +
               }

     

       17
       17
       +
       

     

       18
       18
       +
               chain output {

     

       19
       19
       +
                 type filter hook output priority 0; policy accept;

     

       20
       20
       +
                 log group 2 accept

     

       21
       21
       +
               }

     

       22
       22
       +
       

     

       23
       23
       +
               chain forward {

     

       24
       24
       +
                 type filter hook forward priority 0; policy drop;

     

       25
       25
       +
                 log group 2 accept

     

       26
       26
       +
               }

     

       27
       27
       +
       

     

       28
       28
       +
             }

     

       29
       29
       +
           '';

     

       30
       30
       +
           services.ulogd = {

     

       31
       31
       +
             enable = true;

     

       32
       32
       +
             settings = {

     

       33
       33
       +
               global = {

     

       34
       34
       +
                 logfile = "/var/log/ulogd.log";

     

       35
       35
       +
                 stack = "log1:NFLOG,base1:BASE,pcap1:PCAP";

     

       36
       36
       +
               };

     

       37
       37
       +
       

     

       38
       38
       +
               log1.group = 2;

     

       39
       39
       +
       

     

       40
       40
       +
               pcap1 = {

     

       41
       41
       +
                 file = "/var/log/ulogd.pcap";

     

       42
       42
       +
                 sync = 1;

     

       43
       43
       +
               };

     

       44
       44
       +
             };

     

       45
       45
       +
           };

     

       46
       46
       +
       

     

       47
       47
       +
           environment.systemPackages = with pkgs; [

     

       48
       48
       +
             tcpdump

     

       49
       49
       +
           ];

     

       50
       50
       +
         };

     

       51
       51
       +
       

     

       52
       52
       +
         testScript = ''

     

       53
       53
       +
           start_all()

     

       54
       54
       +
           machine.wait_for_unit("ulogd.service")

     

       55
       55
       +
           machine.wait_for_unit("network-online.target")

     

       56
       56
       +
       

     

       57
       57
       +
           with subtest("Ulogd is running"):

     

       58
       58
       +
               machine.succeed("pgrep ulogd >&2")

     

       59
       59
       +
       

     

       60
       60
       +
           # All packets show up twice in the logs

     

       61
       61
       +
           with subtest("Logs are collected"):

     

       62
       62
       +
               machine.succeed("ping -f 127.0.0.1 -c 5 >&2")

     

       63
       63
       +
               machine.succeed("sleep 2")

     

       64
       64
       +
               machine.wait_until_succeeds("du /var/log/ulogd.pcap >&2")

     

       65
       65
       +
               _, echo_request_packets = machine.execute("tcpdump -r /var/log/ulogd.pcap icmp[0] == 8 and host 127.0.0.1")

     

       66
       66
       +
               expected, actual = 5*2, len(echo_request_packets.splitlines())

     

       67
       67
       +
               assert expected == actual, f"Expected {expected} packets, got: {actual}"

     

       68
       68
       +
               _, echo_reply_packets = machine.execute("tcpdump -r /var/log/ulogd.pcap icmp[0] == 0 and host 127.0.0.1")

     

       69
       69
       +
               expected, actual = 5*2, len(echo_reply_packets.splitlines())

     

       70
       70
       +
               assert expected == actual, f"Expected {expected} packets, got: {actual}"

     

       71
       71
       +
       

     

       72
       72
       +
           with subtest("Reloading service reopens log file"):

     

       73
       73
       +
               machine.succeed("mv /var/log/ulogd.pcap /var/log/old_ulogd.pcap")

     

       74
       74
       +
               machine.succeed("systemctl reload ulogd.service")

     

       75
       75
       +
               machine.succeed("ping -f 127.0.0.1 -c 5 >&2")

     

       76
       76
       +
               machine.succeed("sleep 2")

     

       77
       77
       +
               _, echo_request_packets = machine.execute("tcpdump -r /var/log/ulogd.pcap icmp[0] == 8 and host 127.0.0.1")

     

       78
       78
       +
               expected, actual = 5*2, len(echo_request_packets.splitlines())

     

       79
       79
       +
               assert expected == actual, f"Expected {expected} packets, got: {actual}"

     

       80
       80
       +
               _, echo_reply_packets = machine.execute("tcpdump -r /var/log/ulogd.pcap icmp[0] == 0 and host 127.0.0.1")

     

       81
       81
       +
               expected, actual = 5*2, len(echo_reply_packets.splitlines())

     

       82
       82
       +
               assert expected == actual, f"Expected {expected} packets, got: {actual}"

     

       83
       83
       +
         '';

     

       84
       84
       +
       })

+3 -1

pkgs/os-specific/linux/ulogd/default.nix

···

       1
       1
        
       { stdenv, lib, fetchurl, gnumake, libnetfilter_acct, libnetfilter_conntrack

     

       2
       2
        
       , libnetfilter_log, libmnl, libnfnetlink, automake, autoconf, autogen, libtool

     

       3
       3
       -
       , pkg-config, libpcap, linuxdoc-tools, autoreconfHook }:

     

       3
       3
       +
       , pkg-config, libpcap, linuxdoc-tools, autoreconfHook, nixosTests }:

     

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation rec {

     

       6
       6
        
         version = "2.0.8";

     
···

       48
       48
        
           libtool

     

       49
       49
        
           linuxdoc-tools

     

       50
       50
        
         ];

     

       51
       51
       +
       

     

       52
       52
       +
         passthru.tests = { inherit (nixosTests) ulogd; };

     

       51
       53
        
       

     

       52
       54
        
         meta = with lib; {

     

       53
       55
        
           description = "Userspace logging daemon for netfilter/iptables";