Merge pull request #47 from dongx1x/rust-check

workflow: update rust check workflow and fix errors

Author: dongx1x

.github/workflows/pr-check-rust.yaml

@@ -5,17 +5,17 @@ on:
     branches:
       - main
     paths:
-      - 'service/quote-server/**.rs'
+      - 'service/ccnp-server/**.rs'
       - '.github/workflows/pr-check-rust.yaml'
   pull_request:
     paths:
-      - 'service/quote-server/**.rs'
+      - 'service/ccnp-server/**.rs'
       - '.github/workflows/pr-check-rust.yaml'
   workflow_dispatch:
 
 jobs:
   codescan:
-    runs-on: tdvm-ut
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout PR
         uses: actions/checkout@v3
@@ -27,11 +27,12 @@ jobs:
 
       - name: Install dependencies
         run: |
-          sudo apt update && yes | DEBIAN_FRONTEND=noninteractive sudo apt install -y libcryptsetup-dev clang protobuf-compiler protobuf-c-compiler libprotobuf-c-dev libprotobuf-c1 build-essential pkg-config libssl-dev
+          sudo apt update && DEBIAN_FRONTEND=noninteractive sudo apt install -y libcryptsetup-dev clang protobuf-compiler protobuf-c-compiler libprotobuf-c-dev libprotobuf-c1 build-essential pkg-config libssl-dev
+          wget https://github.com/protocolbuffers/protobuf/releases/download/v26.1/protoc-26.1-linux-x86_64.zip && unzip protoc-26.1-linux-x86_64.zip
+          sudo mv bin/protoc /usr/bin/protoc && sudo mv include/google/protobuf/* /usr/include/google/protobuf/
       - name: Run cargo check
         run: |
           cd service/ccnp-server
-          cargo test
           cargo check
           cargo fmt -- --check
           cargo clippy

service/ccnp-server/Cargo.toml

@@ -2,6 +2,7 @@
 name = "ccnp_server"
 version = "0.4.0"
 edition = "2021"
+license = "Apache-2.0"
 
 [[bin]] # Bin to run the quote server
 name = "ccnp_server"

service/ccnp-server/deny.toml

@@ -0,0 +1,35 @@
+[advisories]
+vulnerability = "deny"
+unmaintained = "warn"
+yanked = "warn"
+notice = "warn"
+
+[licenses]
+unlicensed = "warn"
+allow = [
+    "MIT",
+    "Apache-2.0",
+    "ISC",
+    "BSD-3-Clause",
+    "Unicode-DFS-2016",
+]
+
+copyleft = "warn"
+allow-osi-fsf-free = "neither"
+default = "deny"
+confidence-threshold = 0.8
+
+[[licenses.clarify]]
+name = "ring"
+expression = "MIT AND ISC AND OpenSSL"
+license-files = [
+    { path = "LICENSE", hash = 0xbd0eed23 }
+]
+
+[bans]
+multiple-versions = "warn"
+wildcards = "allow"
+
+[sources]
+unknown-registry = "warn"
+unknown-git = "warn"

service/ccnp-server/src/main.rs

@@ -77,20 +77,22 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
 }
 
 #[cfg(test)]
-mod ccnp_server_test{
+mod ccnp_server_test {
     use super::*;
-    use serial_test::serial;
+    use crate::agent::IMR;
+    use ccnp_pb::{
+        ccnp_client::CcnpClient, GetCcEventlogRequest, GetCcMeasurementRequest, GetCcReportRequest,
+    };
+    use cctrusted_base::{cc_type::TeeType, tcg};
     use policy::PolicyConfig;
-    use tower::service_fn;
     use rand::Rng;
+    use serial_test::serial;
     use service::Service;
     use std::fs::read_to_string;
     use tokio::net::{UnixListener, UnixStream};
     use tokio_stream::wrappers::UnixListenerStream;
-    use tonic::transport::{Server, Endpoint, Uri, Channel};
-    use cctrusted_base::{cc_type::TeeType, tcg};
-    use ccnp_pb::{ccnp_client::CcnpClient, GetCcReportRequest, GetCcMeasurementRequest, GetCcEventlogRequest};
-    use crate::agent::IMR;
+    use tonic::transport::{Channel, Endpoint, Server, Uri};
+    use tower::service_fn;
 
     async fn creat_server() {
         let sock = String::from("/tmp/ccnp-server.sock");
@@ -109,10 +111,10 @@ mod ccnp_server_test{
         let service = Service::new(policy);
         tokio::spawn(async {
             Server::builder()
-            .add_service(CcnpServer::new(service))
-            .serve_with_incoming(uds_stream)
-            .await
-            .unwrap();
+                .add_service(CcnpServer::new(service))
+                .serve_with_incoming(uds_stream)
+                .await
+                .unwrap();
         });
     }
 
@@ -142,12 +144,12 @@ mod ccnp_server_test{
             .collect();
 
         for line in data_lines {
-            if line.contains(docker_pattern){
+            if line.contains(docker_pattern) {
                 let element = line.split(docker_pattern).last();
                 if element.is_some() {
                     let (id, _) = element.unwrap().split_once('/').unwrap();
                     return id.to_string();
-                } 
+                }
             }
 
             if line.contains(k8s_pattern) {
@@ -172,7 +174,7 @@ mod ccnp_server_test{
 
         let container_id = get_container_id();
         assert_ne!(container_id.len(), 0);
-        
+
         let request = tonic::Request::new(GetCcReportRequest {
             container_id: container_id,
             user_data: Some(user_data),
@@ -211,7 +213,7 @@ mod ccnp_server_test{
 
         let container_id = get_container_id();
         assert_ne!(container_id.len(), 0);
-        
+
         let request = tonic::Request::new(GetCcReportRequest {
             container_id: container_id,
             user_data: Some("".to_string()),
@@ -229,10 +231,10 @@ mod ccnp_server_test{
         creat_server().await;
         let mut client = create_client().await;
         let user_data = base64::encode(rand::thread_rng().gen::<[u8; 32]>());
-    
+
         let container_id = get_container_id();
         assert_ne!(container_id.len(), 0);
-        
+
         let request = tonic::Request::new(GetCcReportRequest {
             container_id: container_id,
             user_data: Some(user_data),
@@ -252,14 +254,18 @@ mod ccnp_server_test{
 
         let container_id = get_container_id();
         assert_ne!(container_id.len(), 0);
-        
+
         let request = tonic::Request::new(GetCcMeasurementRequest {
             container_id: container_id,
             index: IMR::CONTAINER as u32,
             algo_id: tcg::TPM_ALG_SHA384.into(),
         });
 
-        let response = client.get_cc_measurement(request).await.unwrap().into_inner();
+        let response = client
+            .get_cc_measurement(request)
+            .await
+            .unwrap()
+            .into_inner();
         let cc_measurement = response.measurement.unwrap();
         assert_eq!(cc_measurement.algo_id, tcg::TPM_ALG_SHA384.into());
         assert_ne!(cc_measurement.hash.len(), 0)
@@ -270,7 +276,7 @@ mod ccnp_server_test{
     async fn request_to_cc_measurement_empty_container_id() {
         creat_server().await;
         let mut client = create_client().await;
-        
+
         let request = tonic::Request::new(GetCcMeasurementRequest {
             container_id: "".to_string(),
             index: IMR::CONTAINER as u32,
@@ -288,16 +294,16 @@ mod ccnp_server_test{
         let mut client = create_client().await;
 
         let container_id = get_container_id();
-        assert_ne!(container_id.len(),0);
-        
+        assert_ne!(container_id.len(), 0);
+
         let request = tonic::Request::new(GetCcMeasurementRequest {
             container_id: container_id,
             index: IMR::SYSTEM as u32,
             algo_id: tcg::TPM_ALG_SHA384.into(),
         });
 
         let result = client.get_cc_measurement(request).await;
-        assert!(result.is_err(),"Excepted an error");
+        assert!(result.is_err(), "Excepted an error");
     }
 
     #[tokio::test]
@@ -307,8 +313,8 @@ mod ccnp_server_test{
         let mut client = create_client().await;
 
         let container_id = get_container_id();
-        assert_ne!(container_id.len(),0);
-        
+        assert_ne!(container_id.len(), 0);
+
         let request = tonic::Request::new(GetCcMeasurementRequest {
             container_id: container_id,
             index: IMR::CONTAINER as u32,
@@ -327,7 +333,7 @@ mod ccnp_server_test{
 
         let container_id = get_container_id();
         assert_ne!(container_id.len(), 0);
-        
+
         let request = tonic::Request::new(GetCcEventlogRequest {
             container_id: container_id,
             start: Some(0),
@@ -348,7 +354,7 @@ mod ccnp_server_test{
     async fn request_to_cc_eventlog_empty_container_id() {
         creat_server().await;
         let mut client = create_client().await;
-        
+
         let request = tonic::Request::new(GetCcEventlogRequest {
             container_id: "".to_string(),
             start: Some(0),
@@ -366,8 +372,8 @@ mod ccnp_server_test{
         let mut client = create_client().await;
 
         let container_id = get_container_id();
-        assert_ne!(container_id.len(),0);
-        
+        assert_ne!(container_id.len(), 0);
+
         let request = tonic::Request::new(GetCcEventlogRequest {
             container_id: container_id,
             start: Some(0),