Page MenuHomePhabricator
Differential D11346

[lib][native] Call backup restore protocol after QR auth
ClosedPublic
Actions

Authored by bartek on Mar 18 2024, 4:31 AM.
Tags
None
Referenced Files
Unknown Object (File)
Thu, Mar 20, 4:49 AM
Unknown Object (File)
Thu, Feb 27, 10:08 PM
Unknown Object (File)
Feb 27 2025, 7:26 PM
Unknown Object (File)
Feb 27 2025, 7:26 PM
Unknown Object (File)
Feb 27 2025, 7:26 PM
Unknown Object (File)
Feb 27 2025, 7:26 PM
Unknown Object (File)
Feb 26 2025, 8:07 AM
Unknown Object (File)
Feb 22 2025, 11:01 AM
View All Files
Subscribers
ashoat
tomek

Details

Reviewers
michal
kamil
Commits
rCOMMc0e96428f4c2: [lib][native] Call backup restore protocol after QR auth
Summary
  • On primary device, replaced stub values with actual backup keys
  • On secondary device, added a function to call backup restore protocol when received backup keys from primary device

Depends on D11345

Test Plan
  • Verified that backup keys are retrieved and sent to the secondary device
  • Verified that backup data is downloaded on the secondary device

Diff Detail

Repository
rCOMM Comm
Lint
No Lint Coverage
Unit
No Test Coverage

Revision Contents
Changeset List

PathSize
lib/
components/
15 lines
types/
17 lines
native/
backup/
2 lines
profile/
19 lines
qr-code/
11 lines

Diff 38122

View Options

lib/components/qr-auth-handler.react.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/backup-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?)
} }
View Options

native/backup/use-client-backup.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

native/profile/secondary-device-qr-code-scanner.react.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

native/qr-code/qr-code-screen.react.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?)
} }