P 491 - url checking (#2511)

* this should be a warn message. * keep consistency with tee-worker * fix the typo error, which causes crash * remove `build_client`; all use `build_client_with_cert`. * remove DataProviderConfig::default() * add url sanity check at initialization * add missing return value --------- Co-authored-by: Yang <[email protected]>
litentry · Feb 23, 2024 · 655fc19 · 655fc19
1 parent 717e39f
commit 655fc19
Show file tree

Hide file tree

Showing 25 changed files with 109 additions and 87 deletions.
diff --git a/bitacross-worker/core-primitives/settings/src/lib.rs b/bitacross-worker/core-primitives/settings/src/lib.rs
@@ -28,7 +28,7 @@ pub mod files {
 
 	// used by enclave
 	/// Path to the light-client db for the Integritee parentchain.
-	pub const LITENTRY_PARENTCHAIN_LIGHT_CLIENT_DB_PATH: &str = "integritee_lcdb";
+	pub const LITENTRY_PARENTCHAIN_LIGHT_CLIENT_DB_PATH: &str = "litentry_lcdb";
 
 	/// Path to the light-client db for the Target A parentchain.
 	pub const TARGET_A_PARENTCHAIN_LIGHT_CLIENT_DB_PATH: &str = "target_a_lcdb";

diff --git a/tee-worker/enclave-runtime/src/initialization/mod.rs b/tee-worker/enclave-runtime/src/initialization/mod.rs
@@ -216,8 +216,11 @@ pub(crate) fn init_enclave(
 		Arc::new(IntelAttestationHandler::new(ocall_api, signing_key_repository));
 	GLOBAL_ATTESTATION_HANDLER_COMPONENT.initialize(attestation_handler);
 
-	let data_provider_config = DataProviderConfig::new();
-	GLOBAL_DATA_PROVIDER_CONFIG.initialize(data_provider_config.into());
+	if let Ok(data_provider_config) = DataProviderConfig::new() {
+		GLOBAL_DATA_PROVIDER_CONFIG.initialize(data_provider_config.into());
+	} else {
+		return Err(Error::Other("data provider initialize error".into()))
+	}
 
 	Ok(())
 }

diff --git a/tee-worker/litentry/core/assertion-build-v2/src/nft_holder/mod.rs b/tee-worker/litentry/core/assertion-build-v2/src/nft_holder/mod.rs
@@ -189,7 +189,7 @@ mod tests {
 		let _ = env_logger::builder().is_test(true).try_init();
 		let url = run(0).unwrap();
 
-		let mut data_provider_config = DataProviderConfig::default();
+		let mut data_provider_config = DataProviderConfig::new().unwrap();
 
 		data_provider_config.set_nodereal_api_key("d416f55179dbd0e45b1a8ed030e3".into());
 		data_provider_config.set_nodereal_api_chain_network_url(url.clone() + "/nodereal_jsonrpc/");

diff --git a/tee-worker/litentry/core/assertion-build-v2/src/platform_user/mod.rs b/tee-worker/litentry/core/assertion-build-v2/src/platform_user/mod.rs
@@ -88,7 +88,7 @@ mod tests {
 		let _ = env_logger::builder().is_test(true).try_init();
 		let url = run(0).unwrap() + "/karat_dao/";
 
-		let mut config = DataProviderConfig::new();
+		let mut config = DataProviderConfig::new().unwrap();
 		config.set_karat_dao_api_url(url);
 		config
 	}

diff --git a/tee-worker/litentry/core/assertion-build-v2/src/token_holding_amount/mod.rs b/tee-worker/litentry/core/assertion-build-v2/src/token_holding_amount/mod.rs
@@ -287,7 +287,7 @@ mod tests {
 		let _ = env_logger::builder().is_test(true).try_init();
 		let url = run(0).unwrap();
 
-		let mut data_provider_config = DataProviderConfig::default();
+		let mut data_provider_config = DataProviderConfig::new().unwrap();
 
 		data_provider_config.set_nodereal_api_key("d416f55179dbd0e45b1a8ed030e3".into());
 		data_provider_config.set_nodereal_api_chain_network_url(url.clone() + "/nodereal_jsonrpc/");

diff --git a/tee-worker/litentry/core/assertion-build/src/a14.rs b/tee-worker/litentry/core/assertion-build/src/a14.rs
@@ -28,11 +28,11 @@ use http::header::{AUTHORIZATION, CONNECTION};
 use http_req::response::Headers;
 use itc_rest_client::{
 	error::Error as RestClientError,
-	http_client::{DefaultSend, HttpClient},
+	http_client::{HttpClient, SendWithCertificateVerification},
 	rest_client::RestClient,
 	RestPath, RestPost,
 };
-use lc_data_providers::{build_client, DataProviderConfig};
+use lc_data_providers::{build_client_with_cert, DataProviderConfig};
 use serde::{Deserialize, Serialize};
 
 const VC_A14_SUBJECT_DESCRIPTION: &str =
@@ -67,7 +67,7 @@ pub struct A14Response {
 
 // TODO: merge it to new achainable API client once the migration is done
 pub struct A14Client {
-	client: RestClient<HttpClient<DefaultSend>>,
+	client: RestClient<HttpClient<SendWithCertificateVerification>>,
 }
 
 impl A14Client {
@@ -79,7 +79,7 @@ impl A14Client {
 			data_provider_config.achainable_auth_key.clone().as_str(),
 		);
 		let client =
-			build_client("https://label-production.graph.tdf-labs.io/v1/run/labels/a719e99c-1f9b-432e-8f1d-cb3de0f14dde", headers);
+			build_client_with_cert("https://label-production.graph.tdf-labs.io/v1/run/labels/a719e99c-1f9b-432e-8f1d-cb3de0f14dde", headers);
 		A14Client { client }
 	}
 

diff --git a/tee-worker/litentry/core/assertion-build/src/a2.rs b/tee-worker/litentry/core/assertion-build/src/a2.rs
@@ -94,7 +94,7 @@ mod tests {
 
 	#[test]
 	fn build_a2_works() {
-		let mut data_provider_config = DataProviderConfig::new();
+		let mut data_provider_config = DataProviderConfig::new().unwrap();
 		data_provider_config
 			.set_litentry_discord_microservice_url("http://localhost:19527".to_string());
 		let guild_id_u: u64 = 919848390156767232;

diff --git a/tee-worker/litentry/core/assertion-build/src/a20.rs b/tee-worker/litentry/core/assertion-build/src/a20.rs
@@ -23,7 +23,7 @@ extern crate sgx_tstd as std;
 use http::header::CONNECTION;
 use http_req::response::Headers;
 use itc_rest_client::{error::Error as RestClientError, RestGet, RestPath};
-use lc_data_providers::{build_client, DataProviderConfig};
+use lc_data_providers::{build_client_with_cert, DataProviderConfig};
 use serde::{Deserialize, Serialize};
 
 #[cfg(all(not(feature = "std"), feature = "sgx"))]
@@ -65,7 +65,7 @@ pub fn build(
 
 	let mut headers = Headers::new();
 	headers.insert(CONNECTION.as_str(), "close");
-	let mut client = build_client(&data_provider_config.litentry_archive_url, headers);
+	let mut client = build_client_with_cert(&data_provider_config.litentry_archive_url, headers);
 	let query = vec![("account", who.as_str())];
 	let value = client
 		.get_with::<String, EarlyBirdResponse>("".to_string(), query.as_slice())

diff --git a/tee-worker/litentry/core/assertion-build/src/a3.rs b/tee-worker/litentry/core/assertion-build/src/a3.rs
@@ -117,7 +117,7 @@ mod tests {
 
 	#[test]
 	fn build_a3_works() {
-		let mut data_provider_config = DataProviderConfig::new();
+		let mut data_provider_config = DataProviderConfig::new().unwrap();
 		data_provider_config
 			.set_litentry_discord_microservice_url("http://localhost:19527".to_string());
 		let guild_id_u: u64 = 919848390156767232;

diff --git a/tee-worker/litentry/core/assertion-build/src/generic_discord_role.rs b/tee-worker/litentry/core/assertion-build/src/generic_discord_role.rs
@@ -109,7 +109,7 @@ mod tests {
 	fn init() -> DataProviderConfig {
 		let _ = env_logger::builder().is_test(true).try_init();
 		let url = run(0).unwrap();
-		let mut data_provider_conifg = DataProviderConfig::new();
+		let mut data_provider_conifg = DataProviderConfig::new().unwrap();
 
 		data_provider_conifg.set_litentry_discord_microservice_url(url);
 		data_provider_conifg.set_contest_legend_discord_role_id("1034083718425493544".to_string());

diff --git a/tee-worker/litentry/core/assertion-build/src/holding_time.rs b/tee-worker/litentry/core/assertion-build/src/holding_time.rs
@@ -345,7 +345,7 @@ mod tests {
 	fn init() -> DataProviderConfig {
 		let _ = env_logger::builder().is_test(true).try_init();
 		let url = run(0).unwrap();
-		let mut data_provider_config = DataProviderConfig::new();
+		let mut data_provider_config = DataProviderConfig::new().unwrap();
 		data_provider_config.set_achainable_url(url);
 		data_provider_config
 	}

diff --git a/tee-worker/litentry/core/assertion-build/src/lit_staking.rs b/tee-worker/litentry/core/assertion-build/src/lit_staking.rs
@@ -20,14 +20,14 @@ use frame_support::{StorageHasher, Twox64Concat};
 use http::header::CONNECTION;
 use itc_rest_client::{
 	error::Error as RestClientError,
-	http_client::{DefaultSend, HttpClient},
+	http_client::{HttpClient, SendWithCertificateVerification},
 	rest_client::{Headers, RestClient},
 	RestPath, RestPost,
 };
 use itp_stf_primitives::types::AccountId;
 use itp_utils::hex_display::AsBytesRef;
 use lc_credentials::litentry_profile::lit_staking::UpdateLITStakingAmountCredential;
-use lc_data_providers::build_client;
+use lc_data_providers::build_client_with_cert;
 use litentry_primitives::ParentchainBalance;
 use pallet_parachain_staking::types::Delegator;
 use serde::{Deserialize, Serialize};
@@ -70,7 +70,7 @@ pub struct JsonRPCResponse {
 }
 
 pub struct LitentryStakingClient {
-	client: RestClient<HttpClient<DefaultSend>>,
+	client: RestClient<HttpClient<SendWithCertificateVerification>>,
 }
 
 impl Default for LitentryStakingClient {
@@ -83,7 +83,7 @@ impl LitentryStakingClient {
 	pub fn new() -> Self {
 		let mut headers = Headers::new();
 		headers.insert(CONNECTION.as_str(), "close");
-		let client = build_client("https://litentry-rpc.dwellir.com:443", headers);
+		let client = build_client_with_cert("https://litentry-rpc.dwellir.com:443", headers);
 		LitentryStakingClient { client }
 	}
 

diff --git a/tee-worker/litentry/core/assertion-build/src/nodereal/amount_holding/evm_amount_holding.rs b/tee-worker/litentry/core/assertion-build/src/nodereal/amount_holding/evm_amount_holding.rs
@@ -169,7 +169,7 @@ mod tests {
 	fn init() -> DataProviderConfig {
 		let _ = env_logger::builder().is_test(true).try_init();
 		let url = run(0).unwrap() + "/nodereal_jsonrpc/";
-		let mut data_provider_config = DataProviderConfig::default();
+		let mut data_provider_config = DataProviderConfig::new().unwrap();
 
 		data_provider_config.set_nodereal_api_key("d416f55179dbd0e45b1a8ed030e3".into());
 		data_provider_config.set_nodereal_api_chain_network_url(url);

diff --git a/tee-worker/litentry/core/assertion-build/src/nodereal/nft_holder/weirdo_ghost_gang_holder.rs b/tee-worker/litentry/core/assertion-build/src/nodereal/nft_holder/weirdo_ghost_gang_holder.rs
@@ -120,7 +120,7 @@ mod tests {
 	fn init() -> DataProviderConfig {
 		let _ = env_logger::builder().is_test(true).try_init();
 		let url = run(0).unwrap() + "/nodereal_jsonrpc/";
-		let mut config = DataProviderConfig::new();
+		let mut config = DataProviderConfig::new().unwrap();
 
 		config.set_nodereal_api_key("d416f55179dbd0e45b1a8ed030e3".to_string());
 		config.set_nodereal_api_chain_network_url(url);

diff --git a/tee-worker/litentry/core/assertion-build/src/oneblock/mod.rs b/tee-worker/litentry/core/assertion-build/src/oneblock/mod.rs
@@ -26,7 +26,7 @@ use crate::*;
 use http::header::{AUTHORIZATION, CONNECTION};
 use http_req::response::Headers;
 use itc_rest_client::{error::Error as RestClientError, RestGet, RestPath};
-use lc_data_providers::{build_client, DataProviderConfig};
+use lc_data_providers::{build_client_with_cert, DataProviderConfig};
 use serde::{Deserialize, Serialize};
 use std::string::ToString;
 
@@ -55,7 +55,7 @@ fn fetch_data_from_notion(
 	headers.insert("Notion-Version", "2022-06-28");
 	headers.insert(AUTHORIZATION.as_str(), oneblock_notion_key.as_str());
 
-	let mut client = build_client(oneblock_notion_url.as_str(), headers);
+	let mut client = build_client_with_cert(oneblock_notion_url.as_str(), headers);
 
 	client.get::<String, OneBlockResponse>(String::default()).map_err(|e| {
 		Error::RequestVCFailed(

diff --git a/tee-worker/litentry/core/data-providers/src/achainable.rs b/tee-worker/litentry/core/data-providers/src/achainable.rs
@@ -1441,7 +1441,7 @@ mod tests {
 		let _ = env_logger::builder().is_test(true).try_init();
 		let url = run(0).unwrap();
 
-		let mut data_provider_config = DataProviderConfig::new();
+		let mut data_provider_config = DataProviderConfig::new().unwrap();
 		data_provider_config.set_achainable_url(url);
 		AchainableClient::new(&data_provider_config)
 	}

diff --git a/tee-worker/litentry/core/data-providers/src/discord_litentry.rs b/tee-worker/litentry/core/data-providers/src/discord_litentry.rs
@@ -161,7 +161,7 @@ mod tests {
 	fn init() -> DataProviderConfig {
 		let _ = env_logger::builder().is_test(true).try_init();
 		let url = run(0).unwrap();
-		let mut data_provider_config = DataProviderConfig::new();
+		let mut data_provider_config = DataProviderConfig::new().unwrap();
 		data_provider_config.set_litentry_discord_microservice_url(url);
 		data_provider_config
 	}

diff --git a/tee-worker/litentry/core/data-providers/src/discord_official.rs b/tee-worker/litentry/core/data-providers/src/discord_official.rs
@@ -125,7 +125,7 @@ mod tests {
 	fn init() -> DataProviderConfig {
 		let _ = env_logger::builder().is_test(true).try_init();
 		let url = run(0).unwrap();
-		let mut data_provider_config = DataProviderConfig::new();
+		let mut data_provider_config = DataProviderConfig::new().unwrap();
 		data_provider_config.set_discord_official_url(url);
 		data_provider_config
 	}

diff --git a/tee-worker/litentry/core/data-providers/src/karat_dao.rs b/tee-worker/litentry/core/data-providers/src/karat_dao.rs
@@ -21,12 +21,13 @@ use crate::sgx_reexport_prelude::*;
 extern crate sgx_tstd as std;
 
 use crate::{
-	build_client, DataProviderConfig, Error, HttpError, ReqPath, RetryOption, RetryableRestGet,
+	build_client_with_cert, DataProviderConfig, Error, HttpError, ReqPath, RetryOption,
+	RetryableRestGet,
 };
 use http::header::CONNECTION;
 use http_req::response::Headers;
 use itc_rest_client::{
-	http_client::{DefaultSend, HttpClient},
+	http_client::{HttpClient, SendWithCertificateVerification},
 	rest_client::RestClient,
 	RestPath,
 };
@@ -41,7 +42,7 @@ use std::{
 
 pub struct KaratDaoClient {
 	retry_option: RetryOption,
-	client: RestClient<HttpClient<DefaultSend>>,
+	client: RestClient<HttpClient<SendWithCertificateVerification>>,
 }
 
 #[derive(Debug)]
@@ -60,7 +61,7 @@ impl KaratDaoClient {
 
 		let mut headers = Headers::new();
 		headers.insert(CONNECTION.as_str(), "close");
-		let client = build_client(api_url.as_str(), headers);
+		let client = build_client_with_cert(api_url.as_str(), headers);
 
 		KaratDaoClient { retry_option, client }
 	}
@@ -146,7 +147,7 @@ mod tests {
 		let _ = env_logger::builder().is_test(true).try_init();
 		let url = run(0).unwrap() + "/karat_dao/";
 
-		let mut config = DataProviderConfig::new();
+		let mut config = DataProviderConfig::new().unwrap();
 		config.set_karat_dao_api_url(url);
 		config
 	}