commit c1fdf3341b546d0617e1072036284b7f677cfeb0 · pyrox.dev/nixpkgs

nixos/modules/module-list.nix

···

       356
       356
        
         ./services/monitoring/munin.nix

     

       357
       357
        
         ./services/monitoring/nagios.nix

     

       358
       358
        
         ./services/monitoring/netdata.nix

     

       359
       359
       +
         ./services/monitoring/osquery.nix

     

       359
       360
        
         ./services/monitoring/prometheus/default.nix

     

       360
       361
        
         ./services/monitoring/prometheus/alertmanager.nix

     

       361
       362
        
         ./services/monitoring/prometheus/blackbox-exporter.nix

+91

nixos/modules/services/monitoring/osquery.nix

···

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

     

       2
       2
       +
       

     

       3
       3
       +
       with builtins;

     

       4
       4
       +
       with lib;

     

       5
       5
       +
       

     

       6
       6
       +
       let

     

       7
       7
       +
         cfg = config.services.osquery;

     

       8
       8
       +
       

     

       9
       9
       +
       in

     

       10
       10
       +
       

     

       11
       11
       +
       {

     

       12
       12
       +
       

     

       13
       13
       +
         options = {

     

       14
       14
       +
       

     

       15
       15
       +
           services.osquery = {

     

       16
       16
       +
       

     

       17
       17
       +
             enable = mkEnableOption "osquery";

     

       18
       18
       +
       

     

       19
       19
       +
             loggerPath = mkOption {

     

       20
       20
       +
               type = types.path;

     

       21
       21
       +
               description = "Base directory used for logging.";

     

       22
       22
       +
               default = "/var/log/osquery";

     

       23
       23
       +
             };

     

       24
       24
       +
       

     

       25
       25
       +
             pidfile = mkOption {

     

       26
       26
       +
               type = types.path;

     

       27
       27
       +
               description = "Path used for pid file.";

     

       28
       28
       +
               default = "/var/osquery/osqueryd.pidfile";

     

       29
       29
       +
             };

     

       30
       30
       +
       

     

       31
       31
       +
             utc = mkOption {

     

       32
       32
       +
               type = types.bool;

     

       33
       33
       +
               description = "Attempt to convert all UNIX calendar times to UTC.";

     

       34
       34
       +
               default = true;

     

       35
       35
       +
             };

     

       36
       36
       +
       

     

       37
       37
       +
             databasePath = mkOption {

     

       38
       38
       +
               type = types.path;

     

       39
       39
       +
               description = "Path used for database file.";

     

       40
       40
       +
               default = "/var/osquery/osquery.db";

     

       41
       41
       +
             };

     

       42
       42
       +
       

     

       43
       43
       +
             extraConfig = mkOption {

     

       44
       44
       +
               type = types.attrs // {

     

       45
       45
       +
                 merge = loc: foldl' (res: def: recursiveUpdate res def.value) {};

     

       46
       46
       +
               };

     

       47
       47
       +
               description = "Extra config to be recursively merged into the JSON config file.";

     

       48
       48
       +
               default = { };

     

       49
       49
       +
             };

     

       50
       50
       +
           };

     

       51
       51
       +
       

     

       52
       52
       +
         };

     

       53
       53
       +
       

     

       54
       54
       +
         config = mkIf cfg.enable {

     

       55
       55
       +
       

     

       56
       56
       +
           environment.systemPackages = [ pkgs.osquery ];

     

       57
       57
       +
       

     

       58
       58
       +
           environment.etc."osquery/osquery.conf".text = toJSON (

     

       59
       59
       +
             recursiveUpdate {

     

       60
       60
       +
               options = {

     

       61
       61
       +
                 config_plugin = "filesystem";

     

       62
       62
       +
                 logger_plugin = "filesystem";

     

       63
       63
       +
                 logger_path = cfg.loggerPath;

     

       64
       64
       +
                 database_path = cfg.databasePath;

     

       65
       65
       +
                 utc = cfg.utc;

     

       66
       66
       +
               };

     

       67
       67
       +
             } cfg.extraConfig

     

       68
       68
       +
           );

     

       69
       69
       +
       

     

       70
       70
       +
           systemd.services.osqueryd = {

     

       71
       71
       +
             description = "The osquery Daemon";

     

       72
       72
       +
             after = [ "network.target" "syslog.service" ];

     

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

     

       74
       74
       +
             path = [ pkgs.osquery ];

     

       75
       75
       +
             preStart = ''

     

       76
       76
       +
               mkdir -p ${escapeShellArg cfg.loggerPath}

     

       77
       77
       +
               mkdir -p "$(dirname ${escapeShellArg cfg.pidfile})"

     

       78
       78
       +
               mkdir -p "$(dirname ${escapeShellArg cfg.databasePath})"

     

       79
       79
       +
             '';

     

       80
       80
       +
             serviceConfig = {

     

       81
       81
       +
               TimeoutStartSec = 0;

     

       82
       82
       +
               ExecStart = "${pkgs.osquery}/bin/osqueryd --logger_path ${escapeShellArg cfg.loggerPath} --pidfile ${escapeShellArg cfg.pidfile} --database_path ${escapeShellArg cfg.databasePath}";

     

       83
       83
       +
               KillMode = "process";

     

       84
       84
       +
               KillSignal = "SIGTERM";

     

       85
       85
       +
               Restart = "on-failure";

     

       86
       86
       +
             };

     

       87
       87
       +
           };

     

       88
       88
       +
       

     

       89
       89
       +
         };

     

       90
       90
       +
       

     

       91
       91
       +
       }

+23

pkgs/development/libraries/linenoise-ng/default.nix

···

       1
       1
       +
       { stdenv, lib, fetchFromGitHub, cmake }:

     

       2
       2
       +
       

     

       3
       3
       +
       stdenv.mkDerivation rec {

     

       4
       4
       +
         name = "linenoise-ng-${version}";

     

       5
       5
       +
         version = "1.0.1";

     

       6
       6
       +
       

     

       7
       7
       +
         src = fetchFromGitHub {

     

       8
       8
       +
           owner = "arangodb";

     

       9
       9
       +
           repo = "linenoise-ng";

     

       10
       10
       +
           rev = "v${version}";

     

       11
       11
       +
           sha256 = "176iz0kj0p8d8i3jqps4z8xkxwl3f1986q88i9xg5fvqgpzsxp20";

     

       12
       12
       +
         };

     

       13
       13
       +
       

     

       14
       14
       +
         nativeBuildInputs = [ cmake ];

     

       15
       15
       +
       

     

       16
       16
       +
         meta = {

     

       17
       17
       +
           homepage = "https://github.com/arangodb/linenoise-ng";

     

       18
       18
       +
           description = "A small, portable GNU readline replacement for Linux, Windows and MacOS which is capable of handling UTF-8 characters";

     

       19
       19
       +
           maintainers = with stdenv.lib.maintainers; [ cstrahan ];

     

       20
       20
       +
           platforms = stdenv.lib.platforms.all;

     

       21
       21
       +
           license = stdenv.lib.licenses.bsd3;

     

       22
       22
       +
         };

     

       23
       23
       +
       }

pkgs/development/libraries/rocksdb/default.nix

···

       6
       6
        
       

     

       7
       7
        
       # Malloc implementation

     

       8
       8
        
       , jemalloc ? null, gperftools ? null

     

       9
       9
       +
       

     

       10
       10
       +
       , enableLite ? false

     

       9
       11
        
       }:

     

       10
       12
        
       

     

       11
       13
        
       let

     
···

       34
       36
        
         USE_SSE = "1";

     

       35
       37
        
         CMAKE_CXX_FLAGS = "-std=gnu++11";

     

       36
       38
        
         JEMALLOC_LIB = stdenv.lib.optionalString (malloc == jemalloc) "-ljemalloc";

     

       39
       39
       +
       

     

       40
       40
       +
         ${if enableLite then "LIBNAME" else null} = "librocksdb_lite";

     

       41
       41
       +
         ${if enableLite then "CXXFLAGS" else null} = "-DROCKSDB_LITE=1";

     

       37
       42
        
       

     

       38
       43
        
         buildFlags = [

     

       39
       44
        
           "DEBUG_LEVEL=0"

+65

pkgs/tools/package-management/apt/default.nix

···

       1
       1
       +
       { stdenv, lib, fetchzip, pkgconfig, cmake, perl, curl, gtest, lzma, bzip2 , lz4

     

       2
       2
       +
       , db, dpkg, libxslt, docbook_xsl, docbook_xml_dtd_45

     

       3
       3
       +
       

     

       4
       4
       +
       # used when WITH_DOC=ON

     

       5
       5
       +
       , w3m

     

       6
       6
       +
       , Po4a

     

       7
       7
       +
       , doxygen

     

       8
       8
       +
       

     

       9
       9
       +
       # used when WITH_NLS=ON

     

       10
       10
       +
       , gettext

     

       11
       11
       +
       

     

       12
       12
       +
       # opts

     

       13
       13
       +
       , withDocs ? true

     

       14
       14
       +
       , withNLS ? true

     

       15
       15
       +
       }:

     

       16
       16
       +
       

     

       17
       17
       +
       stdenv.mkDerivation rec {

     

       18
       18
       +
         name = "apt-${version}";

     

       19
       19
       +
       

     

       20
       20
       +
         version = "1.4.6";

     

       21
       21
       +
       

     

       22
       22
       +
         src = fetchzip {

     

       23
       23
       +
           url = "https://launchpad.net/ubuntu/+archive/primary/+files/apt_${version}.tar.xz";

     

       24
       24
       +
           sha256 = "0ahwhmscrmnpvl1r732wg93dzkhv8c1sph2yrqgsrhr73c1616ix";

     

       25
       25
       +
         };

     

       26
       26
       +
       

     

       27
       27
       +
         buildInputs = [

     

       28
       28
       +
           pkgconfig cmake perl curl gtest lzma bzip2 lz4 db dpkg libxslt.bin

     

       29
       29
       +
         ] ++ lib.optionals withDocs [

     

       30
       30
       +
           doxygen Po4a w3m

     

       31
       31
       +
         ] ++ lib.optionals withNLS [

     

       32
       32
       +
           gettext

     

       33
       33
       +
         ];

     

       34
       34
       +
       

     

       35
       35
       +
         preConfigure = ''

     

       36
       36
       +
           export PERL5LIB="$PERL5LIB''${PERL5LIB:+:}${Po4a}/lib/perl5";

     

       37
       37
       +
       

     

       38
       38
       +
           cmakeFlagsArray+=(

     

       39
       39
       +
             -DBERKELEY_DB_INCLUDE_DIRS="${db}"/include

     

       40
       40
       +
             -DDOCBOOK_XSL="${docbook_xsl}"/share/xml/docbook-xsl

     

       41
       41
       +
             -DROOT_GROUP=root

     

       42
       42
       +
             -DWITH_DOC=${if withDocs then "ON" else "OFF"}

     

       43
       43
       +
             -DUSE_NLS=${if withNLS then "ON" else "OFF"}

     

       44
       44
       +
           )

     

       45
       45
       +
       

     

       46
       46
       +
           for f in doc/*; do

     

       47
       47
       +
             if [[ -f "$f" ]]; then

     

       48
       48
       +
               substituteInPlace "$f" \

     

       49
       49
       +
                 --replace \

     

       50
       50
       +
                   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" \

     

       51
       51
       +
                   "${docbook_xml_dtd_45}/xml/dtd/docbook/docbookx.dtd"

     

       52
       52
       +
             fi

     

       53
       53
       +
           done

     

       54
       54
       +
         '';

     

       55
       55
       +
       

     

       56
       56
       +
         enableParallelBuilding = true;

     

       57
       57
       +
       

     

       58
       58
       +
         meta = with lib; {

     

       59
       59
       +
           description = "";

     

       60
       60
       +
           homepage = "https://launchpad.net/ubuntu/+source/apt";

     

       61
       61
       +
           license = licenses.gpl2Plus;

     

       62
       62
       +
           platforms = platforms.linux;

     

       63
       63
       +
           maintainers = with maintainers; [ cstrahan ];

     

       64
       64
       +
         };

     

       65
       65
       +
       }

+79

pkgs/tools/system/osquery/default.nix

···

       1
       1
       +
       { stdenv, lib, fetchFromGitHub, pkgconfig, cmake, pythonPackages

     

       2
       2
       +
       , udev, audit, aws-sdk-cpp, cryptsetup, lvm2, libgcrypt, libarchive

     

       3
       3
       +
       , libgpgerror, libuuid, iptables, apt, dpkg, lzma, lz4, bzip2, rpm

     

       4
       4
       +
       , beecrypt, augeas, libxml2, sleuthkit, yara, lldpd, google-gflags

     

       5
       5
       +
       , thrift, boost, rocksdb_lite, cpp-netlib, glog, gbenchmark, snappy

     

       6
       6
       +
       , openssl, linenoise-ng, file, doxygen, devicemapper

     

       7
       7
       +
       , gtest, sqlite

     

       8
       8
       +
       }:

     

       9
       9
       +
       

     

       10
       10
       +
       let

     

       11
       11
       +
         thirdparty = fetchFromGitHub {

     

       12
       12
       +
           owner = "osquery";

     

       13
       13
       +
           repo = "third-party";

     

       14
       14
       +
           rev = "6919841175b2c9cb2dee8986e0cfe49191ecb868";

     

       15
       15
       +
           sha256 = "1kjxrky586jd1b2z1vs9cm7x1dxw51cizpys9kddiarapc2ih65j";

     

       16
       16
       +
         };

     

       17
       17
       +
       

     

       18
       18
       +
       in

     

       19
       19
       +
       

     

       20
       20
       +
       stdenv.mkDerivation rec {

     

       21
       21
       +
         name = "osquery-${version}";

     

       22
       22
       +
         version = "2.5.2";

     

       23
       23
       +
       

     

       24
       24
       +
         # this is what `osquery --help` will show as the version.

     

       25
       25
       +
         OSQUERY_BUILD_VERSION = version;

     

       26
       26
       +
       

     

       27
       27
       +
         src = fetchFromGitHub {

     

       28
       28
       +
           owner = "facebook";

     

       29
       29
       +
           repo = "osquery";

     

       30
       30
       +
           rev = version;

     

       31
       31
       +
           sha256 = "16isplk66qpvhrf041l0lxb4z6k7wwd1sg7kpsw2q6kivkxpnk3z";

     

       32
       32
       +
         };

     

       33
       33
       +
       

     

       34
       34
       +
         patches = [ ./misc.patch ] ++ lib.optional stdenv.isLinux ./platform-nixos.patch;

     

       35
       35
       +
       

     

       36
       36
       +
         nativeBuildInputs = [

     

       37
       37
       +
           pkgconfig cmake pythonPackages.python pythonPackages.jinja2

     

       38
       38
       +
         ];

     

       39
       39
       +
       

     

       40
       40
       +
         buildInputs = [

     

       41
       41
       +
           udev audit

     

       42
       42
       +
       

     

       43
       43
       +
           (aws-sdk-cpp.override {

     

       44
       44
       +
             apis = [ "firehose" "kinesis" "sts" ];

     

       45
       45
       +
             customMemoryManagement = false;

     

       46
       46
       +
           })

     

       47
       47
       +
       

     

       48
       48
       +
           lvm2 libgcrypt libarchive libgpgerror libuuid iptables.dev apt dpkg

     

       49
       49
       +
           lzma lz4 bzip2 rpm beecrypt augeas libxml2 sleuthkit

     

       50
       50
       +
           yara lldpd google-gflags thrift boost

     

       51
       51
       +
           cpp-netlib glog gbenchmark snappy openssl linenoise-ng

     

       52
       52
       +
           file doxygen devicemapper cryptsetup

     

       53
       53
       +
           gtest sqlite

     

       54
       54
       +
       

     

       55
       55
       +
           # need to be consistent about the malloc implementation

     

       56
       56
       +
           (rocksdb_lite.override { jemalloc = null; gperftools = null; })

     

       57
       57
       +
         ];

     

       58
       58
       +
       

     

       59
       59
       +
         preConfigure = ''

     

       60
       60
       +
           export NIX_CFLAGS_COMPILE="-I${libxml2.dev}/include/libxml2 $NIX_CFLAGS_COMPILE"

     

       61
       61
       +
       

     

       62
       62
       +
           cmakeFlagsArray+=(

     

       63
       63
       +
             -DCMAKE_LIBRARY_PATH=${cryptsetup}/lib

     

       64
       64
       +
             -DCMAKE_VERBOSE_MAKEFILE=OFF

     

       65
       65
       +
           )

     

       66
       66
       +
       

     

       67
       67
       +
           cp -r ${thirdparty}/* third-party

     

       68
       68
       +
           chmod +w -R third-party

     

       69
       69
       +
           rm -r third-party/{googletest,sqlite3}

     

       70
       70
       +
         '';

     

       71
       71
       +
       

     

       72
       72
       +
         meta = with lib; {

     

       73
       73
       +
           description = "SQL powered operating system instrumentation, monitoring, and analytics";

     

       74
       74
       +
           homepage = "https://osquery.io/";

     

       75
       75
       +
           license = licenses.bsd3;

     

       76
       76
       +
           platforms = platforms.linux;

     

       77
       77
       +
           maintainers = with maintainers; [ cstrahan ];

     

       78
       78
       +
         };

     

       79
       79
       +
       }

+187

pkgs/tools/system/osquery/misc.patch

···

       1
       1
       +
       diff --git a/CMakeLists.txt b/CMakeLists.txt

     

       2
       2
       +
       index a976a46d..408ac308 100644

     

       3
       3
       +
       --- a/CMakeLists.txt

     

       4
       4
       +
       +++ b/CMakeLists.txt

     

       5
       5
       +
       @@ -125,14 +125,13 @@ else()

     

       6
       6
       +
            set(CXX_COMPILE_FLAGS "${CXX_COMPILE_FLAGS} -std=c++14 -stdlib=libc++")

     

       7
       7
       +
          else()

     

       8
       8
       +
            set(LINUX TRUE)

     

       9
       9
       +
       -    set(CXX_COMPILE_FLAGS "${CXX_COMPILE_FLAGS} -std=c++14 -stdlib=libstdc++")

     

       10
       10
       +
       +    set(CXX_COMPILE_FLAGS "${CXX_COMPILE_FLAGS} -std=c++14")

     

       11
       11
       +
          endif()

     

       12
       12
       +
          set(POSIX TRUE)

     

       13
       13
       +
        endif()

     

       14
       14
       +
        

     

       15
       15
       +
        if(POSIX)

     

       16
       16
       +
          add_compile_options(

     

       17
       17
       +
       -    -Qunused-arguments

     

       18
       18
       +
            -Wstrict-aliasing

     

       19
       19
       +
            -Wno-missing-field-initializers

     

       20
       20
       +
            -Wno-unused-local-typedef

     

       21
       21
       +
       @@ -154,7 +153,6 @@ if(POSIX)

     

       22
       22
       +
          )

     

       23
       23
       +
          if(NOT FREEBSD)

     

       24
       24
       +
            add_compile_options(

     

       25
       25
       +
       -      -Werror=shadow

     

       26
       26
       +
              -fvisibility=hidden

     

       27
       27
       +
              -fvisibility-inlines-hidden

     

       28
       28
       +
            )

     

       29
       29
       +
       @@ -372,12 +370,6 @@ elseif(NOT FREEBSD)

     

       30
       30
       +
          endif()

     

       31
       31
       +
        endif()

     

       32
       32
       +
        

     

       33
       33
       +
       -if(NOT IS_DIRECTORY "${CMAKE_SOURCE_DIR}/third-party/sqlite3")

     

       34
       34
       +
       -  WARNING_LOG("Cannot find git submodule third-party/sqlite3 directory")

     

       35
       35
       +
       -  WARNING_LOG("Please run: make deps or git submodule update --init")

     

       36
       36
       +
       -  message(FATAL_ERROR "No sqlite3 directory")

     

       37
       37
       +
       -endif()

     

       38
       38
       +
       -

     

       39
       39
       +
        # Make sure deps were built before compiling (else show warning).

     

       40
       40
       +
        execute_process(

     

       41
       41
       +
          COMMAND "${CMAKE_SOURCE_DIR}/tools/provision.sh" check "${CMAKE_BINARY_DIR}"

     

       42
       42
       +
       @@ -439,6 +431,8 @@ endif()

     

       43
       43
       +
        

     

       44
       44
       +
        if(APPLE)

     

       45
       45
       +
          LOG_PLATFORM("OS X")

     

       46
       46
       +
       +elseif(OSQUERY_BUILD_PLATFORM STREQUAL "nixos")

     

       47
       47
       +
       +  LOG_PLATFORM("NixOS")

     

       48
       48
       +
        elseif(OSQUERY_BUILD_PLATFORM STREQUAL "debian")

     

       49
       49
       +
          LOG_PLATFORM("Debian")

     

       50
       50
       +
        elseif(OSQUERY_BUILD_PLATFORM STREQUAL "ubuntu")

     

       51
       51
       +
       @@ -477,7 +471,6 @@ if(POSIX)

     

       52
       52
       +
          include_directories("${BUILD_DEPS}/include/openssl")

     

       53
       53
       +
        endif()

     

       54
       54
       +
        

     

       55
       55
       +
       -include_directories("${CMAKE_SOURCE_DIR}/third-party/sqlite3")

     

       56
       56
       +
        include_directories("${CMAKE_SOURCE_DIR}/include")

     

       57
       57
       +
        include_directories("${CMAKE_SOURCE_DIR}")

     

       58
       58
       +
        

     

       59
       59
       +
       @@ -559,21 +552,10 @@ else()

     

       60
       60
       +
          set(GTEST_FLAGS "-DGTEST_USE_OWN_TR1_TUPLE=0")

     

       61
       61
       +
        endif()

     

       62
       62
       +
        

     

       63
       63
       +
       -set(GTEST_FLAGS

     

       64
       64
       +
       -  ${GTEST_FLAGS}

     

       65
       65
       +
       -  "-I${CMAKE_SOURCE_DIR}/third-party/googletest/googletest/include"

     

       66
       66
       +
       -  "-I${CMAKE_SOURCE_DIR}/third-party/googletest/googlemock/include"

     

       67
       67
       +
       -)

     

       68
       68
       +
       -join("${GTEST_FLAGS}" " " GTEST_FLAGS)

     

       69
       69
       +
       -

     

       70
       70
       +
        set(BUILD_GTEST TRUE)

     

       71
       71
       +
        

     

       72
       72
       +
       -add_subdirectory("${CMAKE_SOURCE_DIR}/third-party/googletest")

     

       73
       73
       +
       -

     

       74
       74
       +
        include(Thrift)

     

       75
       75
       +
        

     

       76
       76
       +
       -add_subdirectory("${CMAKE_SOURCE_DIR}/third-party/sqlite3")

     

       77
       77
       +
       -

     

       78
       78
       +
        add_subdirectory(osquery)

     

       79
       79
       +
        add_subdirectory(tools/tests)

     

       80
       80
       +
        

     

       81
       81
       +
       diff --git a/include/osquery/core.h b/include/osquery/core.h

     

       82
       82
       +
       index b597edee..b0628037 100644

     

       83
       83
       +
       --- a/include/osquery/core.h

     

       84
       84
       +
       +++ b/include/osquery/core.h

     

       85
       85
       +
       @@ -15,8 +15,9 @@

     

       86
       86
       +
        #include <string>

     

       87
       87
       +
        #include <vector>

     

       88
       88
       +
        

     

       89
       89
       +
       -#if defined(__APPLE__) || defined(__FreeBSD__)

     

       90
       90
       +
       +#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__linux__)

     

       91
       91
       +
        #include <boost/thread/shared_mutex.hpp>

     

       92
       92
       +
       +#include <boost/thread/recursive_mutex.hpp>

     

       93
       93
       +
        #else

     

       94
       94
       +
        #include <shared_mutex>

     

       95
       95
       +
        #endif

     

       96
       96
       +
       @@ -188,7 +189,7 @@ inline bool isPlatform(PlatformType a, const PlatformType& t = kPlatformType) {

     

       97
       97
       +
          return (static_cast<int>(t) & static_cast<int>(a)) != 0;

     

       98
       98
       +
        }

     

       99
       99
       +
        

     

       100
       100
       +
       -#if defined(__APPLE__) || defined(__FreeBSD__)

     

       101
       101
       +
       +#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__linux__)

     

       102
       102
       +
        #define MUTEX_IMPL boost

     

       103
       103
       +
        #else

     

       104
       104
       +
        #define MUTEX_IMPL std

     

       105
       105
       +
       @@ -204,10 +205,10 @@ using WriteLock = MUTEX_IMPL::unique_lock<Mutex>;

     

       106
       106
       +
        using ReadLock = MUTEX_IMPL::shared_lock<Mutex>;

     

       107
       107
       +
        

     

       108
       108
       +
        /// Helper alias for defining recursive mutexes.

     

       109
       109
       +
       -using RecursiveMutex = std::recursive_mutex;

     

       110
       110
       +
       +using RecursiveMutex = MUTEX_IMPL::recursive_mutex;

     

       111
       111
       +
        

     

       112
       112
       +
        /// Helper alias for write locking a recursive mutex.

     

       113
       113
       +
       -using RecursiveLock = std::lock_guard<std::recursive_mutex>;

     

       114
       114
       +
       +using RecursiveLock = MUTEX_IMPL::lock_guard<MUTEX_IMPL::recursive_mutex>;

     

       115
       115
       +
        }

     

       116
       116
       +
        

     

       117
       117
       +
        /**

     

       118
       118
       +
       diff --git a/osquery/CMakeLists.txt b/osquery/CMakeLists.txt

     

       119
       119
       +
       index 77913d31..671b20d4 100644

     

       120
       120
       +
       --- a/osquery/CMakeLists.txt

     

       121
       121
       +
       +++ b/osquery/CMakeLists.txt

     

       122
       122
       +
       @@ -57,7 +57,7 @@ endif()

     

       123
       123
       +
        

     

       124
       124
       +
        # Construct a set of all object files, starting with third-party and all

     

       125
       125
       +
        # of the osquery core objects (sources from ADD_CORE_LIBRARY macros).

     

       126
       126
       +
       -set(OSQUERY_OBJECTS $<TARGET_OBJECTS:osquery_sqlite>)

     

       127
       127
       +
       +set(OSQUERY_OBJECTS "")

     

       128
       128
       +
        

     

       129
       129
       +
        # Add subdirectories

     

       130
       130
       +
        add_subdirectory(config)

     

       131
       131
       +
       @@ -138,6 +138,8 @@ elseif(FREEBSD)

     

       132
       132
       +
          ADD_OSQUERY_LINK_ADDITIONAL("rocksdb-lite")

     

       133
       133
       +
        endif()

     

       134
       134
       +
        

     

       135
       135
       +
       +ADD_OSQUERY_LINK_CORE("sqlite3")

     

       136
       136
       +
       +

     

       137
       137
       +
        if(POSIX)

     

       138
       138
       +
          ADD_OSQUERY_LINK_CORE("boost_system")

     

       139
       139
       +
          ADD_OSQUERY_LINK_CORE("boost_filesystem")

     

       140
       140
       +
       @@ -157,6 +159,7 @@ ADD_OSQUERY_LINK_ADDITIONAL("cppnetlib-client-connections${WO_KEY}")

     

       141
       141
       +
        ADD_OSQUERY_LINK_CORE("glog${WO_KEY}")

     

       142
       142
       +
        

     

       143
       143
       +
        if(POSIX)

     

       144
       144
       +
       +  ADD_OSQUERY_LINK_ADDITIONAL("benchmark")

     

       145
       145
       +
          ADD_OSQUERY_LINK_ADDITIONAL("snappy")

     

       146
       146
       +
          ADD_OSQUERY_LINK_ADDITIONAL("ssl")

     

       147
       147
       +
          ADD_OSQUERY_LINK_ADDITIONAL("crypto")

     

       148
       148
       +
       @@ -336,13 +339,6 @@ if(NOT OSQUERY_BUILD_SDK_ONLY)

     

       149
       149
       +
        

     

       150
       150
       +
          install(DIRECTORY "${CMAKE_SOURCE_DIR}/packs/"

     

       151
       151
       +
            DESTINATION "${CMAKE_INSTALL_PREFIX}/share/osquery/packs" COMPONENT main)

     

       152
       152
       +
       -  if(APPLE)

     

       153
       153
       +
       -    install(FILES "${CMAKE_SOURCE_DIR}/tools/deployment/com.facebook.osqueryd.plist"

     

       154
       154
       +
       -      DESTINATION "${CMAKE_INSTALL_PREFIX}/share/osquery/" COMPONENT main)

     

       155
       155
       +
       -  else()

     

       156
       156
       +
       -    install(PROGRAMS "${CMAKE_SOURCE_DIR}/tools/deployment/osqueryd.initd"

     

       157
       157
       +
       -      DESTINATION "/etc/init.d/" RENAME "osqueryd" COMPONENT main)

     

       158
       158
       +
       -  endif()

     

       159
       159
       +
        endif()

     

       160
       160
       +
        

     

       161
       161
       +
        if(NOT SKIP_TESTS)

     

       162
       162
       +
       diff --git a/osquery/tables/system/linux/tests/md_tables_tests.cpp b/osquery/tables/system/linux/tests/md_tables_tests.cpp

     

       163
       163
       +
       index 126be362..119d361d 100644

     

       164
       164
       +
       --- a/osquery/tables/system/linux/tests/md_tables_tests.cpp

     

       165
       165
       +
       +++ b/osquery/tables/system/linux/tests/md_tables_tests.cpp

     

       166
       166
       +
       @@ -72,7 +72,7 @@ void GetDrivesForArrayTestHarness(std::string arrayName,

     

       167
       167
       +
          EXPECT_CALL(md, getArrayInfo(arrayDevPath, _))

     

       168
       168
       +
              .WillOnce(DoAll(SetArgReferee<1>(arrayInfo), Return(true)));

     

       169
       169
       +
        

     

       170
       170
       +
       -  Sequence::Sequence s1;

     

       171
       171
       +
       +  Sequence s1;

     

       172
       172
       +
          for (int i = 0; i < MD_SB_DISKS; i++) {

     

       173
       173
       +
            mdu_disk_info_t diskInfo;

     

       174
       174
       +
            diskInfo.number = i;

     

       175
       175
       +
       diff --git a/specs/windows/services.table b/specs/windows/services.table

     

       176
       176
       +
       index 4ac24ee9..657d8b99 100644

     

       177
       177
       +
       --- a/specs/windows/services.table

     

       178
       178
       +
       +++ b/specs/windows/services.table

     

       179
       179
       +
       @@ -12,7 +12,7 @@ schema([

     

       180
       180
       +
            Column("path", TEXT, "Path to Service Executable"),

     

       181
       181
       +
            Column("module_path", TEXT, "Path to ServiceDll"),

     

       182
       182
       +
            Column("description", TEXT, "Service Description"),

     

       183
       183
       +
       -    Column("user_account", TEXT, "The name of the account that the service process will be logged on as when it runs. This name can be of the form Domain\UserName. If the account belongs to the built-in domain, the name can be of the form .\UserName."),

     

       184
       184
       +
       +    Column("user_account", TEXT, "The name of the account that the service process will be logged on as when it runs. This name can be of the form Domain\\UserName. If the account belongs to the built-in domain, the name can be of the form .\\UserName."),

     

       185
       185
       +
        ])

     

       186
       186
       +
        implementation("system/windows/services@genServices")

     

       187
       187
       +
        examples([

+22

pkgs/tools/system/osquery/platform-nixos.patch

···

       1
       1
       +
       diff --git a/tools/get_platform.py b/tools/get_platform.py

     

       2
       2
       +
       index 3dd34516..f53ca83a 100644

     

       3
       3
       +
       --- a/tools/get_platform.py

     

       4
       4
       +
       +++ b/tools/get_platform.py

     

       5
       5
       +
       @@ -26,6 +26,8 @@ DEBIAN_VERSION = "/etc/debian_version"

     

       6
       6
       +
        GENTOO_RELEASE = "/etc/gentoo-release"

     

       7
       7
       +
        

     

       8
       8
       +
        def _platform():

     

       9
       9
       +
       +    return ("nixos", "nixos")

     

       10
       10
       +
       +

     

       11
       11
       +
            osType, _, _, _, _, _ = platform.uname()

     

       12
       12
       +
        

     

       13
       13
       +
            if osType == "Windows":

     

       14
       14
       +
       @@ -75,6 +77,8 @@ def _platform():

     

       15
       15
       +
                return (None, osType.lower())

     

       16
       16
       +
        

     

       17
       17
       +
        def _distro(osType):

     

       18
       18
       +
       +    return "unknown_version"

     

       19
       19
       +
       +

     

       20
       20
       +
            def getRedhatDistroVersion(pattern):

     

       21
       21
       +
                with open(SYSTEM_RELEASE, "r") as fd:

     

       22
       22
       +
                    contents = fd.read()

+10

pkgs/top-level/all-packages.nix

···

       531
       531
        
       

     

       532
       532
        
         apg = callPackage ../tools/security/apg { };

     

       533
       533
        
       

     

       534
       534
       +
         apt = callPackage ../tools/package-management/apt {

     

       535
       535
       +
           inherit (perlPackages) Po4a;

     

       536
       536
       +
         };

     

       537
       537
       +
       

     

       534
       538
        
         autorevision = callPackage ../tools/misc/autorevision { };

     

       535
       539
        
       

     

       536
       540
        
         bcachefs-tools = callPackage ../tools/filesystems/bcachefs-tools { };

     
···

       9349
       9353
        
       

     

       9350
       9354
        
         linenoise = callPackage ../development/libraries/linenoise { };

     

       9351
       9355
        
       

     

       9356
       9356
       +
         linenoise-ng = callPackage ../development/libraries/linenoise-ng { };

     

       9357
       9357
       +
       

     

       9352
       9358
        
         lirc = callPackage ../development/libraries/lirc { };

     

       9353
       9359
        
       

     

       9354
       9360
        
         liquid-dsp = callPackage ../development/libraries/liquid-dsp { };

     
···

       10087
       10093
        
         rlog = callPackage ../development/libraries/rlog { };

     

       10088
       10094
        
       

     

       10089
       10095
        
         rocksdb = callPackage ../development/libraries/rocksdb { };

     

       10096
       10096
       +
       

     

       10097
       10097
       +
         rocksdb_lite = rocksdb.override { enableLite = true; };

     

       10090
       10098
        
       

     

       10091
       10099
        
         rote = callPackage ../development/libraries/rote { };

     

       10092
       10100
        
       

     
···

       15510
       15518
        
         orpie = callPackage ../applications/misc/orpie { gsl = gsl_1; };

     

       15511
       15519
        
       

     

       15512
       15520
        
         osmo = callPackage ../applications/office/osmo { };

     

       15521
       15521
       +
       

     

       15522
       15522
       +
         osquery = callPackage ../tools/system/osquery { };

     

       15513
       15523
        
       

     

       15514
       15524
        
         palemoon = callPackage ../applications/networking/browsers/palemoon {

     

       15515
       15525
        
           # https://forum.palemoon.org/viewtopic.php?f=57&t=15296#p111146