Merge branch 'master' into snyk-upgrade-fbc451ac001c7bb02a73bbe1c301c674

Velocidex · Dec 7, 2023 · bf8f554 · bf8f554
2 parents 6496947 + 8a3da80
commit bf8f554
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/artifacts/definitions/Server/Utils/CreateCollector.yaml b/artifacts/definitions/Server/Utils/CreateCollector.yaml
@@ -413,7 +413,7 @@ sources:
       )
 
       LET use_server_cert = encryption_scheme =~ "x509"
-         AND NOT encryption_args.public_key =~ "----BEGIN CERTIFICATE-----"
+         AND NOT encryption_args.public_key =~ "-----BEGIN CERTIFICATE-----"
          AND log(message="Pubkey encryption specified, but no cert/key provided. Defaulting to server frontend cert")
 
       -- For x509, if no public key cert is specified, we use the

diff --git a/bin/offline.go b/bin/offline.go
@@ -177,6 +177,7 @@ SELECT * FROM Artifact.Server.Utils.CreateCollector(
    target=Spec.Target,
    target_args=Spec.TargetArgs,
    encryption_scheme=Spec.EncryptionScheme,
+   encryption_args=Spec.EncryptionArgs,
    opt_verbose=Spec.OptVerbose,
    opt_banner=Spec.OptBanner,
    opt_prompt=Spec.OptPrompt,

diff --git a/gui/velociraptor/package-lock.json b/gui/velociraptor/package-lock.json
diff --git a/gui/velociraptor/package.json b/gui/velociraptor/package.json
@@ -13,7 +13,8 @@
         "@fortawesome/react-fontawesome": "0.2.0",
         "@popperjs/core": "^2.11.8",
         "axios": ">=1.6.2",
-        "axios-retry": "3.8.1",
+        "axios": ">=1.6.1",
+        "axios-retry": "3.9.0",
         "ace-builds": "1.31.1",
         "bootstrap": "^4.6.2",
         "classnames": "^2.3.2",