Page MenuHomePhabricator
Differential D8508

[keyserver][lib] Simplify leaveThread/deleteThread return type following deprecation of old codeVersions
ClosedPublic
Actions

Authored by ashoat on Jul 15 2023, 8:04 PM.
Tags
None
Referenced Files
Unknown Object (File)
Sun, Mar 23, 1:36 PM
Unknown Object (File)
Sun, Mar 23, 6:48 AM
Unknown Object (File)
Sun, Mar 23, 6:48 AM
Unknown Object (File)
Sun, Mar 23, 6:48 AM
Unknown Object (File)
Sat, Mar 22, 8:49 PM
Unknown Object (File)
Mon, Mar 17, 10:44 PM
Unknown Object (File)
Mon, Mar 17, 10:44 PM
Unknown Object (File)
Mon, Mar 17, 10:43 PM
View All 95 Files
Subscribers
tomek

Details

Reviewers
michal
kamil
Commits
rCOMM84637fc28e1a: [keyserver][lib] Simplify leaveThread/deleteThread return type following…
Summary

See the first diff in the stack. We're no longer expecting to see these old codeVersions, so we're simplifying this code.

Doing these two together because they share the same types and validators.

Depends on D8507

Test Plan

I tested this whole stack together by playing around with the web app and making sure thread mutation endpoints seemed to work correctly

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Revision Contents
Changeset List

PathSize
keyserver/
src/
deleters/
28 lines
responders/
1 line
updaters/
27 lines
lib/
types/
1 line

Diff 28743

View Options

keyserver/src/deleters/thread-deleters.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(())
} }
View Options

keyserver/src/responders/thread-responders.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(())
} }
View Options

keyserver/src/updaters/thread-updaters.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(())
} }
View Options

lib/types/thread-types.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(())
} }