Merge pull request #436 from microsoft/main

Fork Sync: Update from parent repository

Author: AdamL-Microsoft

src/agent/Cargo.lock

@@ -19,7 +19,7 @@ clap = { version = "4", features = ["cargo", "string"] }
 cobertura = { path = "../cobertura" }
 coverage = { path = "../coverage" }
 debuggable-module = { path = "../debuggable-module" }
-crossterm = "0.26"
+crossterm = "0.27"
 env_logger = "0.10"
 flume = "0.10"
 futures = "0.3"

src/agent/onefuzz-task/Cargo.toml

@@ -9,7 +9,7 @@ license = "MIT"
 [dependencies]
 anyhow = "1.0"
 async-trait = "0.1"
-base64 = "0.13"
+base64 = "0.21"
 bytes = "1.4"
 dunce = "1.0"
 dynamic-library = { path = "../dynamic-library" }

src/agent/onefuzz/Cargo.toml

@@ -9,7 +9,7 @@ license = "MIT"
 anyhow = "1.0"
 async-trait = "0.1"
 backoff = { version = "0.4", features = ["tokio"] }
-base64 = "0.13"
+base64 = "0.21"
 bytes = { version = "1.4", features = ["serde"] }
 derivative = "2.2"
 flume = "0.10"

src/agent/storage-queue/Cargo.toml

@@ -2,6 +2,7 @@
 // Licensed under the MIT License.
 
 use anyhow::{Context, Result};
+use base64::Engine;
 use bytes::Buf;
 use reqwest::{Client, Url};
 use reqwest_retry::SendRetry;
@@ -11,6 +12,8 @@ use uuid::Uuid;
 
 pub const EMPTY_QUEUE_DELAY: Duration = Duration::from_secs(10);
 
+const BASE64: base64::engine::GeneralPurpose = base64::engine::general_purpose::STANDARD;
+
 // <QueueMessagesList>
 // 	<QueueMessage>
 // 		<MessageId>7d35e47d-f58e-42da-ba4a-9e6ac7e1214d</MessageId>
@@ -49,7 +52,7 @@ pub struct AzureQueueMessageSend {
 
 impl AzureQueueMessage {
     pub fn parse<T>(&self, parser: impl FnOnce(&[u8]) -> Result<T>) -> Result<T> {
-        let decoded = base64::decode(&self.message_text)?;
+        let decoded = BASE64.decode(&self.message_text)?;
         parser(&decoded)
     }
 
@@ -70,7 +73,7 @@ impl AzureQueueMessage {
                 .error_for_status()
                 .context("AzureQueueMessage.claim status body")?;
         }
-        let decoded = base64::decode(self.message_text)?;
+        let decoded = BASE64.decode(self.message_text)?;
         let value: T = serde_json::from_slice(&decoded)?;
         Ok(value)
     }
@@ -96,7 +99,7 @@ impl AzureQueueMessage {
     }
 
     pub fn get<T: DeserializeOwned>(&self) -> Result<T> {
-        let decoded = base64::decode(&self.message_text)?;
+        let decoded = BASE64.decode(&self.message_text)?;
         let value = serde_json::from_slice(&decoded)?;
         Ok(value)
     }
@@ -132,7 +135,7 @@ impl AzureQueueClient {
     pub async fn enqueue(&self, data: impl Serialize) -> Result<()> {
         let serialized = serde_json::to_string(&data).unwrap();
         let body = quick_xml::se::to_string(&AzureQueueMessageSend {
-            message_text: base64::encode(&serialized),
+            message_text: BASE64.encode(&serialized),
         })
         .context("serializing queue message")?;