starred/yaak
1
0
Fork 0
mirror of https://github.com/mountain-loop/yaak.git synced 2026-04-23 17:28:29 +02:00
Code Issues 8 Packages Projects Releases 10 Wiki Activity

Fix "Validate TLS Certificates" option for WS and GRPC (#218)

Browse Source
This commit is contained in:
Andy Bao
2025-05-29 10:02:27 -04:00
committed by GitHub
parent 085b640b3c
commit bd1986f31f
17 changed files with 124 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src-tauri/yaak-grpc/src/manager.rs
View File

@@ -181,10 +181,11 @@ impl GrpcHandle {
uri: &str,
proto_files: &Vec<PathBuf>,
metadata: &BTreeMap<String, String>,
validate_certificates: bool,
) -> Result<(), String> {
let pool = if proto_files.is_empty() {
let full_uri = uri_from_str(uri)?;
fill_pool_from_reflection(&full_uri, metadata).await
fill_pool_from_reflection(&full_uri, metadata, validate_certificates).await
} else {
fill_pool_from_files(&self.app_handle, proto_files).await
}?;
@@ -199,9 +200,10 @@ impl GrpcHandle {
uri: &str,
proto_files: &Vec<PathBuf>,
metadata: &BTreeMap<String, String>,
validate_certificates: bool,
) -> Result<Vec<ServiceDefinition>, String> {
// Ensure reflection is up-to-date
self.reflect(id, uri, proto_files, metadata).await?;
self.reflect(id, uri, proto_files, metadata, validate_certificates).await?;
let pool = self.get_pool(id, uri, proto_files).ok_or("Failed to get pool".to_string())?;
Ok(self.services_from_pool(&pool))
@@ -238,12 +240,13 @@ impl GrpcHandle {
uri: &str,
proto_files: &Vec<PathBuf>,
metadata: &BTreeMap<String, String>,
validate_certificates: bool,
) -> Result<GrpcConnection, String> {
self.reflect(id, uri, proto_files, metadata).await?;
self.reflect(id, uri, proto_files, metadata, validate_certificates).await?;
let pool = self.get_pool(id, uri, proto_files).ok_or("Failed to get pool")?;
let uri = uri_from_str(uri)?;
let conn = get_transport();
let conn = get_transport(validate_certificates);
let connection = GrpcConnection {
pool: pool.clone(),
conn,