Skip to content

Commit 10470fd

Browse files
committed
workflow: update rust check workflow and fix errors
Signed-off-by: Xiaocheng Dong <[email protected]>
1 parent 45c9909 commit 10470fd

File tree

4 files changed

+77
-34
lines changed

4 files changed

+77
-34
lines changed

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@ on:
55
branches:
66
- main
77
paths:
8-
- 'service/quote-server/**.rs'
8+
- 'service/ccnp-server/**.rs'
99
- '.github/workflows/pr-check-rust.yaml'
1010
pull_request:
1111
paths:
12-
- 'service/quote-server/**.rs'
12+
- 'service/ccnp-server/**.rs'
1313
- '.github/workflows/pr-check-rust.yaml'
1414
workflow_dispatch:
1515

1616
jobs:
1717
codescan:
18-
runs-on: tdvm-ut
18+
runs-on: ubuntu-latest
1919
steps:
2020
- name: Checkout PR
2121
uses: actions/checkout@v3
@@ -27,11 +27,12 @@ jobs:
2727

2828
- name: Install dependencies
2929
run: |
30-
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
30+
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
31+
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
32+
sudo mv bin/protoc /usr/bin/protoc && sudo mv include/google/protobuf/* /usr/include/google/protobuf/
3133
- name: Run cargo check
3234
run: |
3335
cd service/ccnp-server
34-
cargo test
3536
cargo check
3637
cargo fmt -- --check
3738
cargo clippy

service/ccnp-server/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
name = "ccnp_server"
33
version = "0.4.0"
44
edition = "2021"
5+
license = "Apache-2.0"
56

67
[[bin]] # Bin to run the quote server
78
name = "ccnp_server"

service/ccnp-server/deny.toml

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
[advisories]
2+
vulnerability = "deny"
3+
unmaintained = "warn"
4+
yanked = "warn"
5+
notice = "warn"
6+
7+
[licenses]
8+
unlicensed = "warn"
9+
allow = [
10+
"MIT",
11+
"Apache-2.0",
12+
"ISC",
13+
"BSD-3-Clause",
14+
"Unicode-DFS-2016",
15+
]
16+
17+
copyleft = "warn"
18+
allow-osi-fsf-free = "neither"
19+
default = "deny"
20+
confidence-threshold = 0.8
21+
22+
[[licenses.clarify]]
23+
name = "ring"
24+
expression = "MIT AND ISC AND OpenSSL"
25+
license-files = [
26+
{ path = "LICENSE", hash = 0xbd0eed23 }
27+
]
28+
29+
[bans]
30+
multiple-versions = "warn"
31+
wildcards = "allow"
32+
33+
[sources]
34+
unknown-registry = "warn"
35+
unknown-git = "warn"

service/ccnp-server/src/main.rs

Lines changed: 35 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -77,20 +77,22 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
7777
}
7878

7979
#[cfg(test)]
80-
mod ccnp_server_test{
80+
mod ccnp_server_test {
8181
use super::*;
82-
use serial_test::serial;
82+
use crate::agent::IMR;
83+
use ccnp_pb::{
84+
ccnp_client::CcnpClient, GetCcEventlogRequest, GetCcMeasurementRequest, GetCcReportRequest,
85+
};
86+
use cctrusted_base::{cc_type::TeeType, tcg};
8387
use policy::PolicyConfig;
84-
use tower::service_fn;
8588
use rand::Rng;
89+
use serial_test::serial;
8690
use service::Service;
8791
use std::fs::read_to_string;
8892
use tokio::net::{UnixListener, UnixStream};
8993
use tokio_stream::wrappers::UnixListenerStream;
90-
use tonic::transport::{Server, Endpoint, Uri, Channel};
91-
use cctrusted_base::{cc_type::TeeType, tcg};
92-
use ccnp_pb::{ccnp_client::CcnpClient, GetCcReportRequest, GetCcMeasurementRequest, GetCcEventlogRequest};
93-
use crate::agent::IMR;
94+
use tonic::transport::{Channel, Endpoint, Server, Uri};
95+
use tower::service_fn;
9496

9597
async fn creat_server() {
9698
let sock = String::from("/tmp/ccnp-server.sock");
@@ -109,10 +111,10 @@ mod ccnp_server_test{
109111
let service = Service::new(policy);
110112
tokio::spawn(async {
111113
Server::builder()
112-
.add_service(CcnpServer::new(service))
113-
.serve_with_incoming(uds_stream)
114-
.await
115-
.unwrap();
114+
.add_service(CcnpServer::new(service))
115+
.serve_with_incoming(uds_stream)
116+
.await
117+
.unwrap();
116118
});
117119
}
118120

@@ -142,12 +144,12 @@ mod ccnp_server_test{
142144
.collect();
143145

144146
for line in data_lines {
145-
if line.contains(docker_pattern){
147+
if line.contains(docker_pattern) {
146148
let element = line.split(docker_pattern).last();
147149
if element.is_some() {
148150
let (id, _) = element.unwrap().split_once('/').unwrap();
149151
return id.to_string();
150-
}
152+
}
151153
}
152154

153155
if line.contains(k8s_pattern) {
@@ -172,7 +174,7 @@ mod ccnp_server_test{
172174

173175
let container_id = get_container_id();
174176
assert_ne!(container_id.len(), 0);
175-
177+
176178
let request = tonic::Request::new(GetCcReportRequest {
177179
container_id: container_id,
178180
user_data: Some(user_data),
@@ -211,7 +213,7 @@ mod ccnp_server_test{
211213

212214
let container_id = get_container_id();
213215
assert_ne!(container_id.len(), 0);
214-
216+
215217
let request = tonic::Request::new(GetCcReportRequest {
216218
container_id: container_id,
217219
user_data: Some("".to_string()),
@@ -229,10 +231,10 @@ mod ccnp_server_test{
229231
creat_server().await;
230232
let mut client = create_client().await;
231233
let user_data = base64::encode(rand::thread_rng().gen::<[u8; 32]>());
232-
234+
233235
let container_id = get_container_id();
234236
assert_ne!(container_id.len(), 0);
235-
237+
236238
let request = tonic::Request::new(GetCcReportRequest {
237239
container_id: container_id,
238240
user_data: Some(user_data),
@@ -252,14 +254,18 @@ mod ccnp_server_test{
252254

253255
let container_id = get_container_id();
254256
assert_ne!(container_id.len(), 0);
255-
257+
256258
let request = tonic::Request::new(GetCcMeasurementRequest {
257259
container_id: container_id,
258260
index: IMR::CONTAINER as u32,
259261
algo_id: tcg::TPM_ALG_SHA384.into(),
260262
});
261263

262-
let response = client.get_cc_measurement(request).await.unwrap().into_inner();
264+
let response = client
265+
.get_cc_measurement(request)
266+
.await
267+
.unwrap()
268+
.into_inner();
263269
let cc_measurement = response.measurement.unwrap();
264270
assert_eq!(cc_measurement.algo_id, tcg::TPM_ALG_SHA384.into());
265271
assert_ne!(cc_measurement.hash.len(), 0)
@@ -270,7 +276,7 @@ mod ccnp_server_test{
270276
async fn request_to_cc_measurement_empty_container_id() {
271277
creat_server().await;
272278
let mut client = create_client().await;
273-
279+
274280
let request = tonic::Request::new(GetCcMeasurementRequest {
275281
container_id: "".to_string(),
276282
index: IMR::CONTAINER as u32,
@@ -288,16 +294,16 @@ mod ccnp_server_test{
288294
let mut client = create_client().await;
289295

290296
let container_id = get_container_id();
291-
assert_ne!(container_id.len(),0);
292-
297+
assert_ne!(container_id.len(), 0);
298+
293299
let request = tonic::Request::new(GetCcMeasurementRequest {
294300
container_id: container_id,
295301
index: IMR::SYSTEM as u32,
296302
algo_id: tcg::TPM_ALG_SHA384.into(),
297303
});
298304

299305
let result = client.get_cc_measurement(request).await;
300-
assert!(result.is_err(),"Excepted an error");
306+
assert!(result.is_err(), "Excepted an error");
301307
}
302308

303309
#[tokio::test]
@@ -307,8 +313,8 @@ mod ccnp_server_test{
307313
let mut client = create_client().await;
308314

309315
let container_id = get_container_id();
310-
assert_ne!(container_id.len(),0);
311-
316+
assert_ne!(container_id.len(), 0);
317+
312318
let request = tonic::Request::new(GetCcMeasurementRequest {
313319
container_id: container_id,
314320
index: IMR::CONTAINER as u32,
@@ -327,7 +333,7 @@ mod ccnp_server_test{
327333

328334
let container_id = get_container_id();
329335
assert_ne!(container_id.len(), 0);
330-
336+
331337
let request = tonic::Request::new(GetCcEventlogRequest {
332338
container_id: container_id,
333339
start: Some(0),
@@ -348,7 +354,7 @@ mod ccnp_server_test{
348354
async fn request_to_cc_eventlog_empty_container_id() {
349355
creat_server().await;
350356
let mut client = create_client().await;
351-
357+
352358
let request = tonic::Request::new(GetCcEventlogRequest {
353359
container_id: "".to_string(),
354360
start: Some(0),
@@ -366,8 +372,8 @@ mod ccnp_server_test{
366372
let mut client = create_client().await;
367373

368374
let container_id = get_container_id();
369-
assert_ne!(container_id.len(),0);
370-
375+
assert_ne!(container_id.len(), 0);
376+
371377
let request = tonic::Request::new(GetCcEventlogRequest {
372378
container_id: container_id,
373379
start: Some(0),

0 commit comments

Comments
 (0)