Skip to content
This repository was archived by the owner on Nov 1, 2023. It is now read-only.

Commit 09a7ec8

Browse files
PorgesPorges
authored
Merge branch 'main' into asan_dumps
2 parents 919ffbf + 74ae105 commit 09a7ec8

File tree

13 files changed

+213
-235
lines changed

13 files changed

+213
-235
lines changed

‎src/agent/Cargo.lock‎

Lines changed: 180 additions & 204 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/agent/coverage/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ debuggable-module = { path = "../debuggable-module" }
1414
iced-x86 = "1.20"
1515
log = "0.4.17"
1616
regex = "1.9"
17-
symbolic = { version = "10.1", features = [
17+
symbolic = { version = "12.3", features = [
1818
"debuginfo",
1919
"demangle",
2020
"symcache",

‎src/agent/debuggable-module/Cargo.toml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,11 @@ iced-x86 = "1.20"
1313
log = "0.4.17"
1414
pdb = "0.8.0"
1515
regex = "1.9"
16-
symbolic = { version = "10.1", features = ["debuginfo", "demangle", "symcache"] }
16+
symbolic = { version = "12.3", features = [
17+
"debuginfo",
18+
"demangle",
19+
"symcache",
20+
] }
1721
thiserror = "1.0"
1822

1923
[dev-dependencies]

‎src/agent/debugger/Cargo.toml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ license = "MIT"
88
[dependencies]
99
anyhow = "1.0"
1010
fnv = "1.0"
11-
goblin = "0.5"
11+
goblin = "0.6"
1212
iced-x86 = "1.20"
1313
log = "0.4"
1414
memmap2 = "0.7"
@@ -18,4 +18,3 @@ win-util = { path = "../win-util" }
1818

1919
[dependencies.windows]
2020
version = "0.48"
21-

‎src/agent/onefuzz-task/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ clap = { version = "4", features = ["cargo", "string"] }
1919
cobertura = { path = "../cobertura" }
2020
coverage = { path = "../coverage" }
2121
debuggable-module = { path = "../debuggable-module" }
22-
crossterm = "0.26"
22+
crossterm = "0.27"
2323
env_logger = "0.10"
2424
flume = "0.10"
2525
futures = "0.3"

‎src/agent/onefuzz/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ license = "MIT"
99
[dependencies]
1010
anyhow = "1.0"
1111
async-trait = "0.1"
12-
base64 = "0.13"
12+
base64 = "0.21"
1313
bytes = "1.4"
1414
dunce = "1.0"
1515
dynamic-library = { path = "../dynamic-library" }

‎src/agent/storage-queue/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ license = "MIT"
99
anyhow = "1.0"
1010
async-trait = "0.1"
1111
backoff = { version = "0.4", features = ["tokio"] }
12-
base64 = "0.13"
12+
base64 = "0.21"
1313
bytes = { version = "1.4", features = ["serde"] }
1414
derivative = "2.2"
1515
flume = "0.10"

‎src/agent/storage-queue/src/azure_queue.rs‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// Licensed under the MIT License.
33

44
use anyhow::{Context, Result};
5+
use base64::Engine;
56
use bytes::Buf;
67
use reqwest::{Client, Url};
78
use reqwest_retry::SendRetry;
@@ -11,6 +12,8 @@ use uuid::Uuid;
1112

1213
pub const EMPTY_QUEUE_DELAY: Duration = Duration::from_secs(10);
1314

15+
const BASE64: base64::engine::GeneralPurpose = base64::engine::general_purpose::STANDARD;
16+
1417
// <QueueMessagesList>
1518
// <QueueMessage>
1619
// <MessageId>7d35e47d-f58e-42da-ba4a-9e6ac7e1214d</MessageId>
@@ -49,7 +52,7 @@ pub struct AzureQueueMessageSend {
4952

5053
impl AzureQueueMessage {
5154
pub fn parse<T>(&self, parser: impl FnOnce(&[u8]) -> Result<T>) -> Result<T> {
52-
let decoded = base64::decode(&self.message_text)?;
55+
let decoded = BASE64.decode(&self.message_text)?;
5356
parser(&decoded)
5457
}
5558

@@ -70,7 +73,7 @@ impl AzureQueueMessage {
7073
.error_for_status()
7174
.context("AzureQueueMessage.claim status body")?;
7275
}
73-
let decoded = base64::decode(self.message_text)?;
76+
let decoded = BASE64.decode(self.message_text)?;
7477
let value: T = serde_json::from_slice(&decoded)?;
7578
Ok(value)
7679
}
@@ -96,7 +99,7 @@ impl AzureQueueMessage {
9699
}
97100

98101
pub fn get<T: DeserializeOwned>(&self) -> Result<T> {
99-
let decoded = base64::decode(&self.message_text)?;
102+
let decoded = BASE64.decode(&self.message_text)?;
100103
let value = serde_json::from_slice(&decoded)?;
101104
Ok(value)
102105
}
@@ -132,7 +135,7 @@ impl AzureQueueClient {
132135
pub async fn enqueue(&self, data: impl Serialize) -> Result<()> {
133136
let serialized = serde_json::to_string(&data).unwrap();
134137
let body = quick_xml::se::to_string(&AzureQueueMessageSend {
135-
message_text: base64::encode(&serialized),
138+
message_text: BASE64.encode(&serialized),
136139
})
137140
.context("serializing queue message")?;
138141

‎src/cli/requirements.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
msal==1.20.0
1+
msal==1.22.0
22
# install requests >=2.31.0 to fix CVE-2023-32681
33
requests>=2.31.0
44
jmespath~=0.10.0
@@ -12,8 +12,8 @@ azure-storage-blob==12.14.1
1212
azure-applicationinsights==0.1.0
1313
tenacity==8.0.1
1414
docstring_parser==0.8.1
15-
azure-identity==1.10.0
16-
azure-cli-core==2.49.0
15+
azure-identity==1.14.0
16+
azure-cli-core==2.50.0
1717
PyJWT>=2.4.0
1818
opentelemetry-api==1.16.0
1919
opentelemetry-sdk==1.16.0

‎src/deployment/requirements.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
azure-cli-core==2.47.0
2-
azure-cli==2.47.0
3-
azure-identity==1.10.0
1+
azure-cli-core==2.50.0
2+
azure-cli==2.50.0
3+
azure-identity==1.14.0
44
azure-cosmosdb-table==1.0.6
55
azure-mgmt-eventgrid==10.2.0b2
6-
azure-mgmt-resource==22.0.0
6+
azure-mgmt-resource>=23.1.0b2
77
azure-mgmt-storage==21.0.0
88
azure-storage-blob==12.14.1
99
pyfunctional==1.4.3

0 commit comments

Comments
 (0)