smal bug fix

admin/admin.py

@@ -74,13 +74,21 @@
     )
     parser.add_argument("-u", "--username", default="jenkins", action="store", required=False)
     parser.add_argument(
-        "-r",
+        "-rs",
         "--restart-service",
         help="Restart processing, to be used with deployment options",
         action="store_true",
         default=False,
         required=False,
     )
+    parser.add_argument(
+        "-rw",
+        "--restart-uwsgi",
+        help="Restart UWSGI, by touching control file",
+        action="store_true",
+        default=False,
+        required=False,
+    )
     parser.add_argument(
         "-ci",
         "--continues-integration",
@@ -339,10 +347,6 @@
         gen_hashfile(args.generate_files_listing, args.filename)
     elif args.check_files_difference:
         compare_hashed_files(args.check_files_difference, servers, jumpbox, args.private_repo)
-
-    # comparing done
-    elif args.restart_service:
-        pass
     else:
         parser.print_help()
     if args.deploy_local_changes or args.deploy_remote_changes or args.sync_community or args.deploy_remote_head or args.custom:
@@ -353,3 +357,6 @@
 
     if args.restart_service and POSTPROCESS:
         execute_command_on_all(POSTPROCESS, servers, jumpbox)
+
+    if args.restart_uwsgi:
+        execute_command_on_all("touch /tmp/capeuwsgireload", servers, jumpbox)

lib/cuckoo/common/demux.py

@@ -191,7 +191,7 @@ def demux_sflock(filename: bytes, options: str) -> List[bytes]:
             unpacked = unpack(filename, check_shellcode=True)
 
         if unpacked.package in whitelist_extensions:
-            return [filename]
+            return filename
         if unpacked.package in blacklist_extensions:
             return retlist
         for sf_child in unpacked.children:

uwsgi/cape.ini

@@ -29,3 +29,4 @@
     #max-worker-lifetime = 30
     ;Some files found in this directory are processed by uWSGI init.d script as
     ;uWSGI configuration files.
+    touch-reload=/tmp/capeuwsgireload

uwsgi/capedist.ini

@@ -27,3 +27,4 @@
     harakiri = 30
     hunder-lock = True
     stats = 127.0.0.1:9191
+    touch-reload=/tmp/capeuwsgidistreload