Page MenuHomePhabricator
Differential D9201

[keyserver] Don't send empty ID cleanup query in notifs code
ClosedPublic
Actions

Authored by ashoat on Sep 14 2023, 6:11 AM.
Tags
None
Referenced Files
Unknown Object (File)
Mon, Mar 17, 4:32 AM
Unknown Object (File)
Mon, Mar 17, 4:30 AM
Unknown Object (File)
Wed, Mar 12, 9:56 PM
Unknown Object (File)
Feb 25 2025, 5:29 PM
Unknown Object (File)
Feb 25 2025, 5:29 PM
Unknown Object (File)
Feb 24 2025, 3:35 PM
Unknown Object (File)
Feb 21 2025, 3:32 PM
Unknown Object (File)
Feb 14 2025, 6:23 PM
View All Files
Subscribers
None

Details

Reviewers
michal
marcin
tomek
Commits
rCOMMe8043a84cc5a: [keyserver] Don't send empty ID cleanup query in notifs code
Summary

I introduced a regression in D9175. The issue is detailed in this Linear comment thread, but basically there's a possibility of dbIDs being non-empty when it's checked, but empty by the time the query is run.

The core issue here is that we're not waiting for the code that dequeues from dbIDs to complete before checking (and running) the cleanup query. This diff makes sure we wait until deliveryPromises are all resolved before checking and running the cleanup query.

Test Plan

I was able to repro the issue in my local environment before this diff (see Linear comment thread). After this diff, the issue no longer repro'd

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Revision Contents
Changeset List

PathSize
keyserver/
src/
push/
23 lines

Diff 31135

View Options

keyserver/src/push/send.js

use clap::{Parser, Subcommand};
use tonic::transport::Server; use tonic::transport::Server;
mod keygen;
mod opaque;
mod service; mod service;
use keygen::generate_and_persist_keypair;
use service::{IdentityServiceServer, MyIdentityService}; use service::{IdentityServiceServer, MyIdentityService};
const IDENTITY_SERVICE_SOCKET_ADDR: &str = "[::]:50051"; const IDENTITY_SERVICE_SOCKET_ADDR: &str = "[::]:50051";
const DEFAULT_SECRETS_DIRECTORY: &str = "secrets";
#[derive(Parser)]
#[clap(author, version, about, long_about = None)]
#[clap(propagate_version = true)]
struct Cli {
#[clap(subcommand)]
command: Commands,
}
#[derive(Subcommand)]
enum Commands {
/// Runs the server
Server,
/// Generates and persists a keypair to use for PAKE registration and login
Keygen {
#[clap(short, long)]
#[clap(default_value_t = String::from(DEFAULT_SECRETS_DIRECTORY))]
dir: String,
},
}
#[tokio::main] #[tokio::main]
async fn main() -> Result<(), Box<dyn std::error::Error>> { async fn main() -> Result<(), Box<dyn std::error::Error>> {
let cli = Cli::parse();
match &cli.command {
Commands::Keygen { dir } => {
generate_and_persist_keypair(dir)?;
}
Commands::Server => {
let addr = IDENTITY_SERVICE_SOCKET_ADDR.parse()?; let addr = IDENTITY_SERVICE_SOCKET_ADDR.parse()?;
let identity_service = MyIdentityService::default(); let identity_service = MyIdentityService::default();
Server::builder() Server::builder()
.add_service(IdentityServiceServer::new(identity_service)) .add_service(IdentityServiceServer::new(identity_service))
.serve(addr) .serve(addr)
.await?; .await?;
}
}
Ok(()) Ok(())
} }