Where the sbom is describing a container, use the tagging information…

… from obom Signed-off-by: Prabhu Subramanian <[email protected]>
CycloneDX · Nov 14, 2024 · 3e57c81 · 3e57c81
1 parent b5fc67d
commit 3e57c81
Showing 1 changed file with 16 additions and 13 deletions.
diff --git a/data/component-tags.json b/data/component-tags.json
@@ -255,7 +255,7 @@
       { "kernel": ["^(linux|kernel|os-image)"] },
       {
         "security": [
-          "(selinux|apparmor|security|boringssl|openssl|libressl|gnutls|jose|keyutils|passwd|libssl|libaudit|gcrypt)"
+          "(selinux|apparmor|security|boringssl|openssl|libressl|gnutls|jose|keyutils|passwd|libssl|libaudit|gcrypt|libpam|libseccomp)"
         ]
       },
       {
@@ -265,45 +265,47 @@
       },
       {
         "build": [
-          "(cpp|fortran|gcc|make|meson|bazel|maven|gradle|sbt|ant|gdb|boost|compiler|kotlin|cargo|rustc|llvm)"
+          "(cpp|fortran|gcc|make|meson|bazel|maven|gradle|sbt|ant|gdb|boost|compiler|kotlin|cargo|rustc|llvm|libstdc)"
         ]
       },
       {
         "network": [
-          "(tailscale|wireguard|openvpn|dns|cockpit|cups|dhcp|network|iproute|iptables|mosh|netavark|openssh|rsync|tcpdump)"
+          "(tailscale|wireguard|openvpn|dns|cockpit|cups|dhcp|network|iproute|iptables|mosh|netavark|openssh|rsync|tcpdump|libssh)"
         ]
       },
       { "webserver": ["(httpd|http2|tomcat|jboss)"] },
       {
         "crypto": [
-          "(crypt|gpg|keys|certificates|gnupg|certifi|pubkey|keyutils|nss)"
+          "(crypt|gpg|keys|certificates|gnupg|certifi|pubkey|keyutils|nss|keyring)"
         ]
       },
       { "repository": ["(-repos|-release|ostree|appstream)"] },
-      { "shell": ["(bash|zsh|csh|fish|binsh)"] },
+      { "shell": ["(bash|zsh|csh|fish|binsh|dash|oilsh)"] },
       { "bluetooth": ["(bluez|bluetooth)"] },
       { "sound": ["(alsa|pulseaudio|wireplumber|flac|codecs|ldac|sound)"] },
       {
         "compression": [
-          "(brotli|xz-utils|zstd|lz4|zlib|bz2|lzma5)",
-          "(tar|zip|webp)$"
+          "(brotli|xz-utils|zstd|lz4|zlib|bz2|lzma5|bzip2|libarchive)",
+          "(tar|zip|webp|zchunk)$"
         ]
       },
       {
         "runtime": [
-          "(perl|lua|php|python|ruby|dotnet|java|swift|runtime|glibc|musl|wasm|.net|asp.net|node.js|node|groovy)"
+          "(perl|lua|php|python|ruby|dotnet|java|swift|runtime|glibc|libc6|musl|wasm|\\.net|asp\\.net|node.js|node|groovy)"
         ]
       },
       { "editor": ["(vim|emacs|nano|hexedit)"] },
       { "xml": ["(xml|expat)"] },
-      { "boot": ["(grub|systemd-boot|syslinux)"] },
+      { "boot": ["(grub|systemd-boot|syslinux|init-system|sysvinit)"] },
       {
-        "gui": ["(wayland|xorg|X11|mesa|vulkan|tk|wkhtmltox|electron|Xrender)"]
+        "gui": [
+          "(wayland|xorg|X11|mesa|vulkan|tk|wkhtmltox|electron|Xrender|glib2)"
+        ]
       },
       {
         "package": [
-          "(rpm|dnf|yum|apt|zypper|apk|conda)$",
-          "^(conda_package_|conda-package-)"
+          "(rpm|dnf|yum|apt|zypper|apk|conda|dpkg|dnf5)$",
+          "^(conda_package_|conda-package-|libapt|dnf5-|libdnf5)"
         ]
       },
       {
@@ -316,7 +318,8 @@
       {
         "chat": ["(webex|teams|slack|discord|vesktop|matrix|signal|whatsapp)"]
       },
-      { "logging": ["(log4j|logging|slf4j)"] }
+      { "logging": ["(log4j|logging|slf4j)"] },
+      { "root": ["^(sudo|systemd|pam|shadow)$"] }
     ]
   }
 }