Page MenuHomePhabricator
Differential D11610

[keyserver] Narrow `updateRelationshipInputValidator` to exclude `farcaster` action
ClosedPublic
Actions

Authored by atul on Apr 9 2024, 9:53 PM.
Tags
None
Referenced Files
Unknown Object (File)
Sat, Mar 15, 12:36 AM
Unknown Object (File)
Wed, Mar 5, 5:15 AM
Unknown Object (File)
Wed, Mar 5, 5:15 AM
Unknown Object (File)
Wed, Mar 5, 5:15 AM
Unknown Object (File)
Wed, Mar 5, 5:15 AM
Unknown Object (File)
Wed, Mar 5, 5:15 AM
Unknown Object (File)
Wed, Mar 5, 5:15 AM
Unknown Object (File)
Mon, Mar 3, 8:19 PM
View All 83 Files
Subscribers
ashoat

Details

Reviewers
ginsu
tomek
varun
will
Commits
rCOMM8eef17ad3a41: [keyserver] Narrow `updateRelationshipInputValidator` to exclude `farcaster`…
Summary

Modify updateRelationshipInputValidator so action is an enum of traditionalRelationshipActionsList vs relationshipActionsList.

Depends on D11609

Test Plan

Tried making request with farcaster action and it failed as expected.

Diff Detail

Repository
rCOMM Comm
Lint
No Lint Coverage
Unit
No Test Coverage

Event Timeline

atul created this revision.Apr 9 2024, 9:53 PM
Herald added a subscriber: ashoat. · View Herald TranscriptApr 9 2024, 9:53 PM
Harbormaster returned this revision to the author for changes because remote builds failed.Apr 9 2024, 9:55 PM
Harbormaster failed remote builds in B28112: Diff 38968!
atul added a child revision: D11611: [keyserver] Update `updateRelationshipsResponder` to handle `RelationshipRequest`.Apr 9 2024, 10:11 PM
atul requested review of this revision.Apr 10 2024, 8:09 AM
Harbormaster completed remote builds in B28112: Diff 38968.Apr 10 2024, 10:03 AM
atul updated this revision to Diff 39007.Apr 10 2024, 12:21 PM

rebasing

Harbormaster completed remote builds in B28139: Diff 39007.Apr 10 2024, 12:40 PM
tomek accepted this revision.Apr 11 2024, 2:24 AM
tomek added inline comments.
keyserver/src/responders/relationship-responders.js
17–20 ↗(On Diff #39007)

Does that mean it's not possible to update Farcaster relationship?

This revision is now accepted and ready to land.Apr 11 2024, 2:24 AM
atul added inline comments.Apr 18 2024, 1:18 PM
keyserver/src/responders/relationship-responders.js
17–20 ↗(On Diff #39007)

It will be via FarcasterRelationshipRequest, just not with TraditionalRelationshipRequest.

atul updated this revision to Diff 39250.Apr 18 2024, 1:20 PM

rebase and land

This revision was landed with ongoing or failed builds.Apr 18 2024, 1:26 PM
Closed by commit rCOMM8eef17ad3a41: [keyserver] Narrow `updateRelationshipInputValidator` to exclude `farcaster`… (authored by atul). · Explain Why
This revision was automatically updated to reflect the committed changes.
atul added a commit: rCOMM8eef17ad3a41: [keyserver] Narrow `updateRelationshipInputValidator` to exclude `farcaster`….
Harbormaster completed remote builds in B28309: Diff 39250.Apr 18 2024, 1:56 PM

Revision Contents
Changeset List

PathSize
keyserver/
src/
responders/
7 lines
lib/
types/
2 lines

Diff 39250

View Options

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

lib/types/relationship-types.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?)
} }