CDH | Fix ttrpc memory bug and gRPC lock bug

.github/workflows/aa_basic.yml

@@ -40,12 +40,10 @@ jobs:
         include:
           - instance: ubuntu-22.04
             make_args: ""
-            cargo_test_opts: "--features openssl,rust-crypto,all-attesters,kbs,coco_as"
-            cargo_lint_opts: "--workspace"
+            cargo_test_opts: "--features openssl,rust-crypto,all-attesters,kbs,coco_as,ttrpc,grpc"
           - instance: s390x
             make_args: "ATTESTER=se-attester TEE_PLATFORM=se"
             cargo_test_opts: "--no-default-features --features openssl,passport,se-attester,kbs,coco_as"
-            cargo_lint_opts: "--no-default-features --features openssl,se-attester,kbs,coco_as -p attestation-agent -p attester -p coco_keyprovider -p kbc -p kbs_protocol -p crypto -p resource_uri"
     runs-on: ${{ matrix.instance }}
     steps:
       - name: Code checkout
@@ -109,8 +107,5 @@ jobs:
           args: --all -- --check
 
       - name: Run rust lint check
-        uses: actions-rs/cargo@v1
-        with:
-          command: clippy
-          # We are getting error in generated code due to derive_partial_eq_without_eq check, so ignore it for now
-          args: ${{ matrix.cargo_lint_opts }} -- -D warnings -A clippy::derive-partial-eq-without-eq
+        run: |
+          make lint

Cargo.toml

@@ -65,7 +65,7 @@ tokio = "1.39"
 toml = "0.8.19"
 tonic = "0.12"
 tonic-build = "0.12"
-ttrpc = "0.8.0"
+ttrpc = "0.8.2"
 ttrpc-codegen = "0.4.2"
 url = "2.5.2"
 uuid = "1"

api-server-rest/build.rs

@@ -88,23 +88,6 @@ fn main() -> std::io::Result<()> {
     ];
     let protobuf_customized = ProtobufCustomize::default().gen_mod_rs(false);
 
-    use std::fs::File;
-    use std::io::{Read, Write};
-
-    fn replace_text_in_file(file_name: &str, from: &str, to: &str) -> Result<(), std::io::Error> {
-        let mut src = File::open(file_name)?;
-        let mut contents = String::new();
-        src.read_to_string(&mut contents).unwrap();
-        drop(src);
-
-        let new_contents = contents.replace(from, to);
-
-        let mut dst = File::create(file_name)?;
-        dst.write_all(new_contents.as_bytes())?;
-
-        Ok(())
-    }
-
     Codegen::new()
         .out_dir("src/ttrpc_proto")
         .inputs(&protos)
@@ -118,17 +101,6 @@ fn main() -> std::io::Result<()> {
         .run()
         .expect("Generate ttrpc protocol code failed.");
 
-    // Fix clippy warnings of code generated from ttrpc_codegen
-    replace_text_in_file(
-        "src/ttrpc_proto/attestation_agent_ttrpc.rs",
-        "#![allow(box_pointers)]\n",
-        "",
-    )?;
-    replace_text_in_file(
-        "src/ttrpc_proto/confidential_data_hub_ttrpc.rs",
-        "#![allow(box_pointers)]\n",
-        "",
-    )?;
     generate_openapi_document().expect("Generate restful OpenAPI yaml failed.");
 
     Ok(())

api-server-rest/src/ttrpc_proto/attestation_agent_ttrpc.rs

@@ -1,4 +1,4 @@
-// This file is generated by ttrpc-compiler 0.6.2. Do not edit
+// This file is generated by ttrpc-compiler 0.6.3. Do not edit
 // @generated
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
@@ -43,7 +43,7 @@ impl AttestationAgentServiceClient {
 }
 
 struct GetEvidenceMethod {
-    service: Arc<Box<dyn AttestationAgentService + Send + Sync>>,
+    service: Arc<dyn AttestationAgentService + Send + Sync>,
 }
 
 #[async_trait]
@@ -54,7 +54,7 @@ impl ::ttrpc::r#async::MethodHandler for GetEvidenceMethod {
 }
 
 struct GetTokenMethod {
-    service: Arc<Box<dyn AttestationAgentService + Send + Sync>>,
+    service: Arc<dyn AttestationAgentService + Send + Sync>,
 }
 
 #[async_trait]
@@ -74,7 +74,7 @@ pub trait AttestationAgentService: Sync {
     }
 }
 
-pub fn create_attestation_agent_service(service: Arc<Box<dyn AttestationAgentService + Send + Sync>>) -> HashMap<String, ::ttrpc::r#async::Service> {
+pub fn create_attestation_agent_service(service: Arc<dyn AttestationAgentService + Send + Sync>) -> HashMap<String, ::ttrpc::r#async::Service> {
     let mut ret = HashMap::new();
     let mut methods = HashMap::new();
     let streams = HashMap::new();

api-server-rest/src/ttrpc_proto/confidential_data_hub_ttrpc.rs

@@ -1,4 +1,4 @@
-// This file is generated by ttrpc-compiler 0.6.2. Do not edit
+// This file is generated by ttrpc-compiler 0.6.3. Do not edit
 // @generated
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
@@ -38,7 +38,7 @@ impl GetResourceServiceClient {
 }
 
 struct GetResourceMethod {
-    service: Arc<Box<dyn GetResourceService + Send + Sync>>,
+    service: Arc<dyn GetResourceService + Send + Sync>,
 }
 
 #[async_trait]
@@ -55,7 +55,7 @@ pub trait GetResourceService: Sync {
     }
 }
 
-pub fn create_get_resource_service(service: Arc<Box<dyn GetResourceService + Send + Sync>>) -> HashMap<String, ::ttrpc::r#async::Service> {
+pub fn create_get_resource_service(service: Arc<dyn GetResourceService + Send + Sync>) -> HashMap<String, ::ttrpc::r#async::Service> {
     let mut ret = HashMap::new();
     let mut methods = HashMap::new();
     let streams = HashMap::new();

attestation-agent/Makefile

@@ -108,12 +108,26 @@ else
     features := $(features),rust-crypto
 endif
 
+ifeq ($(ARCH), s390x)
+    LINT_OPTION = lint-s390x
+else
+    LINT_OPTION = lint-default
+endif
+
 build:
 	cd attestation-agent && $(RUST_FLAGS) cargo build $(release) --no-default-features --features "$(features)" $(binary) $(LIBC_FLAG)
 	mv $(TARGET_DIR)/$(binary_name) $(TARGET)
 
 TARGET := $(TARGET_DIR)/$(BIN_NAME)
 
+lint: $(LINT_OPTION)
+
+lint-default:
+	cd attestation-agent && cargo clippy --features kbs,coco_as,bin,grpc,ttrpc,all-attesters
+
+lint-s390x:
+	cd attestation-agent && cargo clippy --no-default-features --features openssl,kbs,coco_as,bin,grpc,ttrpc
+
 install: 
 	install -D -m0755 $(TARGET) $(DESTDIR)/$(BIN_NAME)
 

attestation-agent/attestation-agent/src/bin/ttrpc-aa/server.rs

@@ -165,8 +165,7 @@ impl AttestationAgentService for AA {
 }
 
 pub fn start_ttrpc_service(aa: AttestationAgent) -> Result<HashMap<String, Service>> {
-    let service = Box::new(AA { inner: aa }) as Box<dyn AttestationAgentService + Send + Sync>;
-
+    let service = AA { inner: aa };
     let service = Arc::new(service);
     let get_resource_service = create_attestation_agent_service(service);
     Ok(get_resource_service)

attestation-agent/attestation-agent/src/bin/ttrpc-aa/ttrpc_protocol/attestation_agent.rs

@@ -1,4 +1,4 @@
-// This file is generated by rust-protobuf 3.5.0. Do not edit
+// This file is generated by rust-protobuf 3.5.1. Do not edit
 // .proto file is parsed by pure
 // @generated
 
@@ -9,7 +9,6 @@
 #![allow(unused_attributes)]
 #![cfg_attr(rustfmt, rustfmt::skip)]
 
-#![allow(box_pointers)]
 #![allow(dead_code)]
 #![allow(missing_docs)]
 #![allow(non_camel_case_types)]
@@ -23,7 +22,7 @@
 
 /// Generated files are compatible only with the same version
 /// of protobuf runtime.
-const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_3_5_0;
+const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_3_5_1;
 
 // @@protoc_insertion_point(message:attestation_agent.GetEvidenceRequest)
 #[derive(PartialEq,Clone,Default,Debug)]

attestation-agent/attestation-agent/src/bin/ttrpc-aa/ttrpc_protocol/attestation_agent_ttrpc.rs

@@ -1,10 +1,9 @@
-// This file is generated by ttrpc-compiler 0.6.2. Do not edit
+// This file is generated by ttrpc-compiler 0.6.3. Do not edit
 // @generated
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unknown_lints)]
 #![allow(clipto_camel_casepy)]
-#![allow(box_pointers)]
 #![allow(dead_code)]
 #![allow(missing_docs)]
 #![allow(non_camel_case_types)]
@@ -64,7 +63,7 @@ impl AttestationAgentServiceClient {
 }
 
 struct GetEvidenceMethod {
-    service: Arc<Box<dyn AttestationAgentService + Send + Sync>>,
+    service: Arc<dyn AttestationAgentService + Send + Sync>,
 }
 
 #[async_trait]
@@ -75,7 +74,7 @@ impl ::ttrpc::r#async::MethodHandler for GetEvidenceMethod {
 }
 
 struct GetTokenMethod {
-    service: Arc<Box<dyn AttestationAgentService + Send + Sync>>,
+    service: Arc<dyn AttestationAgentService + Send + Sync>,
 }
 
 #[async_trait]
@@ -86,7 +85,7 @@ impl ::ttrpc::r#async::MethodHandler for GetTokenMethod {
 }
 
 struct ExtendRuntimeMeasurementMethod {
-    service: Arc<Box<dyn AttestationAgentService + Send + Sync>>,
+    service: Arc<dyn AttestationAgentService + Send + Sync>,
 }
 
 #[async_trait]
@@ -97,7 +96,7 @@ impl ::ttrpc::r#async::MethodHandler for ExtendRuntimeMeasurementMethod {
 }
 
 struct CheckInitDataMethod {
-    service: Arc<Box<dyn AttestationAgentService + Send + Sync>>,
+    service: Arc<dyn AttestationAgentService + Send + Sync>,
 }
 
 #[async_trait]
@@ -108,7 +107,7 @@ impl ::ttrpc::r#async::MethodHandler for CheckInitDataMethod {
 }
 
 struct UpdateConfigurationMethod {
-    service: Arc<Box<dyn AttestationAgentService + Send + Sync>>,
+    service: Arc<dyn AttestationAgentService + Send + Sync>,
 }
 
 #[async_trait]
@@ -119,7 +118,7 @@ impl ::ttrpc::r#async::MethodHandler for UpdateConfigurationMethod {
 }
 
 struct GetTeeTypeMethod {
-    service: Arc<Box<dyn AttestationAgentService + Send + Sync>>,
+    service: Arc<dyn AttestationAgentService + Send + Sync>,
 }
 
 #[async_trait]
@@ -151,7 +150,7 @@ pub trait AttestationAgentService: Sync {
     }
 }
 
-pub fn create_attestation_agent_service(service: Arc<Box<dyn AttestationAgentService + Send + Sync>>) -> HashMap<String, ::ttrpc::r#async::Service> {
+pub fn create_attestation_agent_service(service: Arc<dyn AttestationAgentService + Send + Sync>) -> HashMap<String, ::ttrpc::r#async::Service> {
     let mut ret = HashMap::new();
     let mut methods = HashMap::new();
     let streams = HashMap::new();

attestation-agent/kbs_protocol/build.rs

@@ -46,11 +46,6 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
             "client: client",
             "client",
         )?;
-        replace_text_in_file(
-            "src/token_provider/aa/attestation_agent_ttrpc.rs",
-            "#![allow(box_pointers)]\n",
-            "",
-        )?;
     }
 
     Ok(())

attestation-agent/kbs_protocol/src/token_provider/aa/attestation_agent_ttrpc.rs

@@ -1,4 +1,4 @@
-// This file is generated by ttrpc-compiler 0.6.2. Do not edit
+// This file is generated by ttrpc-compiler 0.6.3. Do not edit
 // @generated
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
@@ -63,7 +63,7 @@ impl AttestationAgentServiceClient {
 }
 
 struct GetEvidenceMethod {
-    service: Arc<Box<dyn AttestationAgentService + Send + Sync>>,
+    service: Arc<dyn AttestationAgentService + Send + Sync>,
 }
 
 #[async_trait]
@@ -74,7 +74,7 @@ impl ::ttrpc::r#async::MethodHandler for GetEvidenceMethod {
 }
 
 struct GetTokenMethod {
-    service: Arc<Box<dyn AttestationAgentService + Send + Sync>>,
+    service: Arc<dyn AttestationAgentService + Send + Sync>,
 }
 
 #[async_trait]
@@ -85,7 +85,7 @@ impl ::ttrpc::r#async::MethodHandler for GetTokenMethod {
 }
 
 struct ExtendRuntimeMeasurementMethod {
-    service: Arc<Box<dyn AttestationAgentService + Send + Sync>>,
+    service: Arc<dyn AttestationAgentService + Send + Sync>,
 }
 
 #[async_trait]
@@ -96,7 +96,7 @@ impl ::ttrpc::r#async::MethodHandler for ExtendRuntimeMeasurementMethod {
 }
 
 struct CheckInitDataMethod {
-    service: Arc<Box<dyn AttestationAgentService + Send + Sync>>,
+    service: Arc<dyn AttestationAgentService + Send + Sync>,
 }
 
 #[async_trait]
@@ -107,7 +107,7 @@ impl ::ttrpc::r#async::MethodHandler for CheckInitDataMethod {
 }
 
 struct UpdateConfigurationMethod {
-    service: Arc<Box<dyn AttestationAgentService + Send + Sync>>,
+    service: Arc<dyn AttestationAgentService + Send + Sync>,
 }
 
 #[async_trait]
@@ -118,7 +118,7 @@ impl ::ttrpc::r#async::MethodHandler for UpdateConfigurationMethod {
 }
 
 struct GetTeeTypeMethod {
-    service: Arc<Box<dyn AttestationAgentService + Send + Sync>>,
+    service: Arc<dyn AttestationAgentService + Send + Sync>,
 }
 
 #[async_trait]
@@ -150,7 +150,7 @@ pub trait AttestationAgentService: Sync {
     }
 }
 
-pub fn create_attestation_agent_service(service: Arc<Box<dyn AttestationAgentService + Send + Sync>>) -> HashMap<String, ::ttrpc::r#async::Service> {
+pub fn create_attestation_agent_service(service: Arc<dyn AttestationAgentService + Send + Sync>) -> HashMap<String, ::ttrpc::r#async::Service> {
     let mut ret = HashMap::new();
     let mut methods = HashMap::new();
     let streams = HashMap::new();

confidential-data-hub/hub/build.rs

@@ -51,16 +51,6 @@ fn main() {
 
         // Fix clippy warnings of code generated from ttrpc_codegen
         replace_text_in_file("src/bin/protos/api_ttrpc.rs", "client: client", "client");
-        replace_text_in_file(
-            "src/bin/protos/api_ttrpc.rs",
-            "#![allow(box_pointers)]\n",
-            "",
-        );
-        replace_text_in_file(
-            "src/bin/protos/keyprovider_ttrpc.rs",
-            "#![allow(box_pointers)]\n",
-            "",
-        );
     }
 
     #[cfg(feature = "bin")]