Merge branch 'main' into asan_dumps

microsoft · Aug 9, 2023 · 09a7ec8 · 09a7ec8
2 parents 919ffbf + 74ae105
commit 09a7ec8
Show file tree

Hide file tree

Showing 13 changed files with 213 additions and 235 deletions.
diff --git a/src/agent/Cargo.lock b/src/agent/Cargo.lock
diff --git a/src/agent/coverage/Cargo.toml b/src/agent/coverage/Cargo.toml
@@ -14,7 +14,7 @@ debuggable-module = { path = "../debuggable-module" }
 iced-x86 = "1.20"
 log = "0.4.17"
 regex = "1.9"
-symbolic = { version = "10.1", features = [
+symbolic = { version = "12.3", features = [
     "debuginfo",
     "demangle",
     "symcache",

diff --git a/src/agent/debuggable-module/Cargo.toml b/src/agent/debuggable-module/Cargo.toml
@@ -13,7 +13,11 @@ iced-x86 = "1.20"
 log = "0.4.17"
 pdb = "0.8.0"
 regex = "1.9"
-symbolic = { version = "10.1", features = ["debuginfo", "demangle", "symcache"] }
+symbolic = { version = "12.3", features = [
+    "debuginfo",
+    "demangle",
+    "symcache",
+] }
 thiserror = "1.0"
 
 [dev-dependencies]

diff --git a/src/agent/debugger/Cargo.toml b/src/agent/debugger/Cargo.toml
@@ -8,7 +8,7 @@ license = "MIT"
 [dependencies]
 anyhow = "1.0"
 fnv = "1.0"
-goblin = "0.5"
+goblin = "0.6"
 iced-x86 = "1.20"
 log = "0.4"
 memmap2 = "0.7"
@@ -18,4 +18,3 @@ win-util = { path = "../win-util" }
 
 [dependencies.windows]
 version = "0.48"
-
diff --git a/src/agent/onefuzz-task/Cargo.toml b/src/agent/onefuzz-task/Cargo.toml
@@ -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"

diff --git a/src/agent/onefuzz/Cargo.toml b/src/agent/onefuzz/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" }

diff --git a/src/agent/storage-queue/Cargo.toml b/src/agent/storage-queue/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"

diff --git a/src/agent/storage-queue/src/azure_queue.rs b/src/agent/storage-queue/src/azure_queue.rs
@@ -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")?;
 

diff --git a/src/cli/requirements.txt b/src/cli/requirements.txt
@@ -1,4 +1,4 @@
-msal==1.20.0
+msal==1.22.0
 # install requests >=2.31.0 to fix CVE-2023-32681
 requests>=2.31.0
 jmespath~=0.10.0
@@ -12,8 +12,8 @@ azure-storage-blob==12.14.1
 azure-applicationinsights==0.1.0
 tenacity==8.0.1
 docstring_parser==0.8.1
-azure-identity==1.10.0
-azure-cli-core==2.49.0
+azure-identity==1.14.0
+azure-cli-core==2.50.0
 PyJWT>=2.4.0
 opentelemetry-api==1.16.0
 opentelemetry-sdk==1.16.0

diff --git a/src/deployment/requirements.txt b/src/deployment/requirements.txt
@@ -1,9 +1,9 @@
-azure-cli-core==2.47.0
-azure-cli==2.47.0
-azure-identity==1.10.0
+azure-cli-core==2.50.0
+azure-cli==2.50.0
+azure-identity==1.14.0
 azure-cosmosdb-table==1.0.6
 azure-mgmt-eventgrid==10.2.0b2
-azure-mgmt-resource==22.0.0
+azure-mgmt-resource>=23.1.0b2
 azure-mgmt-storage==21.0.0
 azure-storage-blob==12.14.1
 pyfunctional==1.4.3

diff --git a/src/proxy-manager/Cargo.lock b/src/proxy-manager/Cargo.lock
diff --git a/src/utils/add-corpus-storage-accounts/requirements.txt b/src/utils/add-corpus-storage-accounts/requirements.txt
@@ -1,3 +1,3 @@
 azure-mgmt-storage~=19.0.0
-azure-cli-core==2.47.0
+azure-cli-core==2.50.0
 azure-mgmt-eventgrid==3.0.0rc9
diff --git a/src/utils/check-pr/requirements.txt b/src/utils/check-pr/requirements.txt
@@ -1,5 +1,7 @@
-azure-common~=1.1.25
-azure-identity==1.10.0
+azure-common~=1.1.28
+azure-identity==1.14.0
 PyGithub==1.56
-azure-cli-core==2.47.0
-msgraph-core==0.2.2
+azure-cli-core==2.50.0
+azure-cli==2.50.0
+azure-core==1.28.0
+msgraph-core==0.2.2