[keyserver] Unify LatestMessageInfo type
ClosedPublic
Actions

Authored by ashoat on Feb 11 2025, 12:06 AM.

Details

Reviewers

tomek
angelika

Commits

rCOMM6774b11a11d1: [keyserver] Unify LatestMessageInfo type

Summary

These changes will simplify later diffs.

Depends on D14330

Test Plan

Flow

Diff Detail

Repository

rCOMM Comm

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

ashoat created this revision.Feb 11 2025, 12:06 AM

ashoat added a child revision: D14332: [keyserver] Consider all new messages in determineLatestMessagesPerThread.

Harbormaster completed remote builds in B33447: Diff 46979.Feb 11 2025, 12:28 AM

ashoat requested review of this revision.Feb 11 2025, 12:28 AM

tomek accepted this revision.Feb 11 2025, 5:36 AM

This revision is now accepted and ready to land.Feb 11 2025, 5:36 AM

Closed by commit rCOMM6774b11a11d1: [keyserver] Unify LatestMessageInfo type (authored by ashoat). · Explain WhyFeb 12 2025, 5:59 AM

This revision was automatically updated to reflect the committed changes.

ashoat added a commit: rCOMM6774b11a11d1: [keyserver] Unify LatestMessageInfo type.

Revision Contents
Changeset List

Path

Size

keyserver/

src/

creators/

message-creator.js

53 lines

Diff 47028

View Options

keyserver/src/creators/message-creator.js

	pub mod error;			pub mod error;
	pub mod identity;			pub mod identity;
	pub mod tunnelbroker;			pub mod tunnelbroker;

	// Re-export some dependencies which may need to be used by downstream crates			// Re-export some dependencies which may need to be used by downstream crates
	pub use tonic;			pub use tonic;

	use error::Error;			use error::Error;
	use std::path::Path;
	use std::time::Duration;			use std::time::Duration;
	use tonic::transport::{Certificate, Channel, ClientTlsConfig};			use tonic::transport::Channel;
	use tracing::info;			use tracing::info;

	const CERT_PATHS: &[&str] = &[
	// MacOS and newer Ubuntu
	"/etc/ssl/cert.pem",
	// Common CA cert paths
	"/etc/ssl/certs/ca-bundle.crt",
	"/etc/ssl/certs/ca-certificates.crt",
	];
	const CONNECT_TIMEOUT_DURATION: Duration = Duration::from_secs(5);			const CONNECT_TIMEOUT_DURATION: Duration = Duration::from_secs(5);

	pub(crate) fn get_ca_cert_contents() -> Option<String> {
	CERT_PATHS
	.iter()
	.map(Path::new)
	.filter(\|p\| p.exists())
	.filter_map(\|f\| std::fs::read_to_string(f).ok())
	.next()
	}
	pub(crate) async fn get_grpc_service_channel(			pub(crate) async fn get_grpc_service_channel(
	url: &str,			url: &str,
	) -> Result<Channel, Error> {			) -> Result<Channel, Error> {
	let ca_cert = crate::get_ca_cert_contents().expect("Unable to get CA bundle");

	info!("Connecting to gRPC service at {}", url);			info!("Connecting to gRPC service at {}", url);
	let mut channel = Channel::from_shared(url.to_string())?			let channel = Channel::from_shared(url.to_string())?
	.connect_timeout(CONNECT_TIMEOUT_DURATION);			.connect_timeout(CONNECT_TIMEOUT_DURATION);

	// tls_config will fail if the underlying URI is only http://
	if url.starts_with("https:") {
	channel = channel.tls_config(
	ClientTlsConfig::new().ca_certificate(Certificate::from_pem(&ca_cert)),
	)?
	}

	Ok(channel.connect().await?)			Ok(channel.connect().await?)
	}			}

[keyserver] Unify LatestMessageInfo typeClosedPublicActions