Skip to content

fix: patch rustls and sharp security advisories #922

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
leynier merged 2 commits into from
Oct 7, 2026
Merged

fix: patch rustls and sharp security advisories #922

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7ae9c06
fix: patch rustls and sharp security advisories
leynier Oct 7, 2026
95f9f73
test: accept in-progress push delivery on stale reclaim
leynier Oct 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cloud/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

112 changes: 42 additions & 70 deletions cloud/tests/contracts/push_delivery_contract.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,47 +218,10 @@ async fn account_enrollment_and_push_contract() -> anyhow::Result<()> {
.bind(event_body["eventId"].as_str())
.execute(&pool)
.await?;
let (duplicate_a, duplicate_b) = tokio::join!(
call_status(
&app,
TestRequest {
method: Method::POST,
uri: "/v1/runtime/events",
bearer: Some(runtime_token),
body: event_body.clone(),
}
),
call_status(
&app,
TestRequest {
method: Method::POST,
uri: "/v1/runtime/events",
bearer: Some(runtime_token),
body: event_body.clone(),
}
)
assert_eq!(
concurrent_duplicate_deliveries(&app, runtime_token, &event_body).await?,
1
);
let (status_a, duplicate_a) = duplicate_a?;
let (status_b, duplicate_b) = duplicate_b?;
assert!(matches!(
status_a,
StatusCode::OK | StatusCode::SERVICE_UNAVAILABLE
));
assert!(matches!(
status_b,
StatusCode::OK | StatusCode::SERVICE_UNAVAILABLE
));
let resumed = [(status_a, &duplicate_a), (status_b, &duplicate_b)]
.into_iter()
.filter(|(status, _)| *status == StatusCode::OK)
.map(|(_, response)| response["deliveriesQueued"].as_u64().unwrap_or_default())
.sum::<u64>();
assert_eq!(resumed, 1);
for (status, response) in [(status_a, &duplicate_a), (status_b, &duplicate_b)] {
if status == StatusCode::OK {
assert_eq!(response["duplicate"].as_bool(), Some(true));
}
}
assert_eq!(sent.load(Ordering::SeqCst), 2);
let duplicate_again = call(
&app,
Expand Down Expand Up @@ -291,37 +254,10 @@ async fn account_enrollment_and_push_contract() -> anyhow::Result<()> {
.bind(event_body["eventId"].as_str())
.execute(&pool)
.await?;
let (stale_duplicate_a, stale_duplicate_b) = tokio::join!(
call(
&app,
TestRequest {
method: Method::POST,
uri: "/v1/runtime/events",
bearer: Some(runtime_token),
body: event_body.clone(),
}
),
call(
&app,
TestRequest {
method: Method::POST,
uri: "/v1/runtime/events",
bearer: Some(runtime_token),
body: event_body.clone(),
}
)
assert_eq!(
concurrent_duplicate_deliveries(&app, runtime_token, &event_body).await?,
1
);
let stale_duplicate_a = stale_duplicate_a?;
let stale_duplicate_b = stale_duplicate_b?;
assert_eq!(stale_duplicate_a["duplicate"].as_bool(), Some(true));
assert_eq!(stale_duplicate_b["duplicate"].as_bool(), Some(true));
let reclaimed = stale_duplicate_a["deliveriesQueued"]
.as_u64()
.unwrap_or_default()
+ stale_duplicate_b["deliveriesQueued"]
.as_u64()
.unwrap_or_default();
assert_eq!(reclaimed, 1);
assert_eq!(sent.load(Ordering::SeqCst), 3);
relay_authorization_cases::rejects_rotation_conflicts_and_revoked_renewals(
&app,
Expand Down Expand Up @@ -456,6 +392,42 @@ async fn account_enrollment_and_push_contract() -> anyhow::Result<()> {
Ok(())
}

async fn concurrent_duplicate_deliveries(
app: &Router,
runtime_token: &str,
event_body: &Value,
) -> anyhow::Result<u64> {
let (first, second) = tokio::join!(
call_status(app, duplicate_event_request(runtime_token, event_body)),
call_status(app, duplicate_event_request(runtime_token, event_body)),
);
let (status_a, body_a) = first?;
let (status_b, body_b) = second?;
for status in [status_a, status_b] {
assert!(matches!(
status,
StatusCode::OK | StatusCode::SERVICE_UNAVAILABLE
));
}
let mut queued = 0;
for (status, body) in [(status_a, &body_a), (status_b, &body_b)] {
if status == StatusCode::OK {
assert_eq!(body["duplicate"].as_bool(), Some(true));
queued += body["deliveriesQueued"].as_u64().unwrap_or_default();
}
}
Ok(queued)
}

fn duplicate_event_request<'a>(runtime_token: &'a str, event_body: &Value) -> TestRequest<'a> {
TestRequest {
method: Method::POST,
uri: "/v1/runtime/events",
bearer: Some(runtime_token),
body: event_body.clone(),
}
}

async fn call_status(
app: &Router,
request: TestRequest<'_>,
Expand Down
Loading
Loading