load private parsers too

kevoreilly · Aug 29, 2023 · c7764d1 · c7764d1
1 parent cb0a6c9
commit c7764d1
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 16 deletions.
diff --git a/installer/kvm-qemu.sh b/installer/kvm-qemu.sh
@@ -628,7 +628,7 @@ function install_virt_manager() {
     gstreamer1.0-x adwaita-icon-theme at-spi2-core augeas-lenses cpu-checker dconf-gsettings-backend dconf-service \
     fontconfig fontconfig-config fonts-dejavu-core genisoimage gir1.2-appindicator3-0.1 gir1.2-secret-1 \
     gobject-introspection intltool pkg-config libxml2-dev libxslt-dev python3-dev gir1.2-gtk-vnc-2.0 gir1.2-spiceclientgtk-3.0 libgtk-3-dev \
-    mlocate gir1.2-gtksource-4 libgtksourceview-4-0 libgtksourceview-4-common checkinstall -y
+    mlocate gir1.2-gtksource-4 libgtksourceview-4-0 libgtksourceview-4-common -y
     # should be installed first
     # moved out as some 20.04 doesn't have this libs %)
     aptitude install -f -y python3-ntlm-auth libpython3-stdlib libbrlapi-dev libgirepository1.0-dev python3-testresources
@@ -656,20 +656,19 @@ function install_virt_manager() {
         gpg --verify "libvirt-glib-3.0.0.tar.gz.asc"
 
     fi
+    # ToDo add blacklist
     tar xf libvirt-glib-3.0.0.tar.gz
     cd libvirt-glib-3.0.0 || return
     aclocal && libtoolize --force
     automake --add-missing
     ./configure
-    # mkdir -p /tmp/libvirt-glib_builded/DEBIAN
-    # echo -e "Package: libvirt-glib-1.0-0\nVersion: 1.0-0\nArchitecture: $ARCH\nMaintainer: $MAINTAINER\nDescription: libvirt-glib-1.0-0" > /tmp/libvirt-glib_builded/DEBIAN/control
-    # make -j"$(nproc)" install DESTDIR=/tmp/libvirt-glib_builded
-    # dpkg-deb --build --root-owner-group /tmp/libvirt-glib_builded
-    # apt -y -o Dpkg::Options::="--force-overwrite" install /tmp/libvirt-glib_builded.deb
-
+    mkdir -p /tmp/libvirt-glib_builded/DEBIAN
+    echo -e "Package: libvirt-glib\nVersion: 1.0-0\nArchitecture: $ARCH\nMaintainer: $MAINTAINER\nDescription: Custom libvirt-glib-1.0-0" > /tmp/libvirt-glib-1.0-0_builded/DEBIAN/control
+    make -j"$(nproc)" install DESTDIR=/tmp/libvirt-glib_builded
+    dpkg-deb --build --root-owner-group /tmp/libvirt-glib_builded
+    apt -y -o Dpkg::Options::="--force-overwrite" install /tmp/libvirt-glib_builded.deb
     make -j"$(nproc)"
-    # ToDo add blacklist
-    checkinstall --pkgname=libvirt-glib-1.0-0 --default
+
     # v4 is meson based
     # sudo meson build -D system=true
     cd /tmp || return
@@ -895,12 +894,8 @@ function install_qemu() {
                 mkdir -p /tmp/qemu-"$qemu_version"_builded/DEBIAN
                 echo -e "Package: qemu\nVersion: $qemu_version\nArchitecture: $ARCH\nMaintainer: $MAINTAINER\nDescription: Custom antivm qemu" > /tmp/qemu-"$qemu_version"_builded/DEBIAN/control
                 make -j"$(nproc)" install DESTDIR=/tmp/qemu-"$qemu_version"_builded
-                if [ "$OS" = "Linux" ]; then
-                    dpkg-deb --build --root-owner-group /tmp/qemu-"$qemu_version"_builded
-                    apt -y -o Dpkg::Options::="--force-overwrite" install /tmp/qemu-"$qemu_version"_builded.deb
-                elif [ "$OS" = "Darwin" ]; then
-                    make -j"$(nproc)" install
-                fi
+                dpkg-deb --build --root-owner-group /tmp/qemu-"$qemu_version"_builded
+                apt -y -o Dpkg::Options::="--force-overwrite" install /tmp/qemu-"$qemu_version"_builded.deb
                 # hack for libvirt/virt-manager
                 if [ ! -f /usr/bin/qemu-system-x86_64-spice ]; then
                     ln -s /usr/bin/qemu-system-x86_64 /usr/bin/qemu-system-x86_64-spice
@@ -930,7 +925,7 @@ function install_qemu() {
     if [ "$OS" = "linux" ]; then
         dpkg --get-selections | grep "qemu" | xargs apt-mark hold
         dpkg --get-selections | grep "libvirt" | xargs apt-mark hold
-        apt-mark unhold qemu libvirt
+        apt-mark hold qemu libvirt
     fi
 
 }

diff --git a/lib/cuckoo/common/load_extra_modules.py b/lib/cuckoo/common/load_extra_modules.py
@@ -40,6 +40,9 @@ def cape_load_decoders(CUCKOO_ROOT: str):
     cape_decoders = os.path.join(CUCKOO_ROOT, "modules", "processing", "parsers", "CAPE")
     CAPE_DECODERS = [os.path.basename(decoder)[:-3] for decoder in glob.glob(f"{cape_decoders}/[!_]*.py")]
 
+    private_cape_decoders = os.path.join(CUCKOO_ROOT, "private", "parsers")
+    CAPE_DECODERS += [os.path.basename(decoder)[:-3] for decoder in glob.glob(f"{private_cape_decoders}/[!_]*.py")]
+
     for name in CAPE_DECODERS:
         try:
             # The name of the module must match what's given as the cape_type for yara