Merge branch 'main' into release-2.5

deepfence_agent/start_agent.sh

@@ -47,7 +47,12 @@ configure_cron() {
   #doesnt work smoothly inside docker!
   service cron start
   chmod 600 /etc/logrotate.d/fenced_logrotate.conf
-  (echo "*/5 * * * * /usr/sbin/logrotate /etc/logrotate.d/fenced_logrotate.conf") | crontab -
+  MARK="/etc/logrotate.d/fenced_logrotate.conf"
+  crontab_output=$(crontab -l)
+  if [ $(echo "$crontab_output" | grep -ic "$MARK") -eq 0 ]
+  then
+      { crontab -l; echo "*/5 * * * * /usr/sbin/logrotate /etc/logrotate.d/fenced_logrotate.conf"; } | crontab -
+  fi
 }
 
 launch_deepfenced() {

docs/vulnerability_feeds/listing.json

@@ -27,18 +27,6 @@
       }
     ],
     "5": [
-      {
-        "built": "2024-11-20T13:12:15.751735771Z",
-        "version": 5,
-        "url": "https://threat-intel.deepfence.io/vulnerability-db/releases/download/threatintel-vuln-v5-2024-11-20_13-08-27/threatintel-vuln-v5-2024-11-20_13-08-27.tar.gz",
-        "checksum": "88eb06bdaaa0cc58234b76c9db91d39be4c0816d1c83ecdff8cccfa5afcdf24a"
-      },
-      {
-        "built": "2024-11-21T01:33:56.389777835Z",
-        "version": 5,
-        "url": "https://threat-intel.deepfence.io/vulnerability-db/releases/download/threatintel-vuln-v5-2024-11-21_01-30-07/threatintel-vuln-v5-2024-11-21_01-30-07.tar.gz",
-        "checksum": "60063279771817f4584a08149ba7a92ef6a4f314e6b0d2857aa88d5603871102"
-      },
       {
         "built": "2024-11-21T13:12:37.632497219Z",
         "version": 5,
@@ -50,6 +38,18 @@
         "version": 5,
         "url": "https://threat-intel.deepfence.io/vulnerability-db/releases/download/threatintel-vuln-v5-2024-11-22_01-30-08/threatintel-vuln-v5-2024-11-22_01-30-08.tar.gz",
         "checksum": "163a0ec98a4f4594f4b1964880dd8d4ef502ba1c8d3b9627966e834afa10d60b"
+      },
+      {
+        "built": "2024-11-22T13:12:11.203567672Z",
+        "version": 5,
+        "url": "https://threat-intel.deepfence.io/vulnerability-db/releases/download/threatintel-vuln-v5-2024-11-22_13-08-21/threatintel-vuln-v5-2024-11-22_13-08-21.tar.gz",
+        "checksum": "cea7fa40c959b8a5a8f6344de2e6e3b1278849955dd8f1beb7659700cd5c9af6"
+      },
+      {
+        "built": "2024-11-23T01:33:39.704440701Z",
+        "version": 5,
+        "url": "https://threat-intel.deepfence.io/vulnerability-db/releases/download/threatintel-vuln-v5-2024-11-23_01-29-52/threatintel-vuln-v5-2024-11-23_01-29-52.tar.gz",
+        "checksum": "23d293ea39b89e02c269c24695397d661ba73cfe126d4361692f6f7d2011a1fb"
       }
     ]
   }