talksik/tonic
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

chore(examples): Remove relative path from reading data (#1220)

Browse Source
This commit is contained in:
tottoto
2023-01-09 12:47:40 -05:00
committed by GitHub
parent 0ca0630993
commit 1bef5f5757
8 changed files with 25 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/src/tls_client_auth/client.rs
+4 -3
View File
@@ -7,10 +7,11 @@ use tonic::transport::{Certificate, Channel, ClientTlsConfig, Identity};
#[tokio::main]
async fn main() -> Result<(), Box<dyn std::error::Error>> {
let server_root_ca_cert = std::fs::read_to_string("examples/data/tls/ca.pem")?;
let data_dir = std::path::PathBuf::from_iter([std::env!("CARGO_MANIFEST_DIR"), "data"]);
let server_root_ca_cert = std::fs::read_to_string(data_dir.join("tls/ca.pem"))?;
let server_root_ca_cert = Certificate::from_pem(server_root_ca_cert);
let client_cert = std::fs::read_to_string("examples/data/tls/client1.pem")?;
let client_key = std::fs::read_to_string("examples/data/tls/client1.key")?;
let client_cert = std::fs::read_to_string(data_dir.join("tls/client1.pem"))?;
let client_key = std::fs::read_to_string(data_dir.join("tls/client1.key"))?;
let client_identity = Identity::from_pem(client_cert, client_key);
let tls = ClientTlsConfig::new()
examples/src/tls_client_auth/server.rs
+4 -3
View File
@@ -27,11 +27,12 @@ impl pb::echo_server::Echo for EchoServer {
#[tokio::main]
async fn main() -> Result<(), Box<dyn std::error::Error>> {
let cert = std::fs::read_to_string("examples/data/tls/server.pem")?;
let key = std::fs::read_to_string("examples/data/tls/server.key")?;
let data_dir = std::path::PathBuf::from_iter([std::env!("CARGO_MANIFEST_DIR"), "data"]);
let cert = std::fs::read_to_string(data_dir.join("tls/server.pem"))?;
let key = std::fs::read_to_string(data_dir.join("tls/server.key"))?;
let server_identity = Identity::from_pem(cert, key);
let client_ca_cert = std::fs::read_to_string("examples/data/tls/client_ca.pem")?;
let client_ca_cert = std::fs::read_to_string(data_dir.join("tls/client_ca.pem"))?;
let client_ca_cert = Certificate::from_pem(client_ca_cert);
let addr = "[::1]:50051".parse().unwrap();