cc-kbc: fix kbs url in resource request

Signed-off-by: Xynnn007 <xynnn@linux.alibaba.com>
confidential-containers · Jul 17, 2023 · 88dcc14 · 88dcc14
1 parent f48fb31
commit 88dcc14
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/attestation-agent/kbc/src/cc_kbc/mod.rs b/attestation-agent/kbc/src/cc_kbc/mod.rs
@@ -66,7 +66,7 @@ impl Kbc {
     }
 
     fn kbs_uri(&self) -> &str {
-        self.kbs_uri.as_str()
+        self.kbs_uri.as_str().trim_end_matches('/')
     }
 
     fn kbs_protocol_wrapper(&mut self) -> &mut KbsProtocolWrapper {
@@ -93,7 +93,7 @@ impl Kbc {
             );
         }
 
-        let kbs_addr = &self.kbs_uri();
+        let kbs_addr = self.kbs_uri();
         let repo = &resource.repository;
         let r#type = &resource.r#type;
         let tag = &resource.tag;

diff --git a/attestation-agent/kbs_protocol/src/lib.rs b/attestation-agent/kbs_protocol/src/lib.rs
@@ -96,7 +96,7 @@ impl KbsProtocolWrapper {
     async fn attestation(&mut self, kbs_root_url: String) -> Result<String> {
         let challenge = self
             .http_client()
-            .post(format!("{kbs_root_url}/{KBS_PREFIX}/auth"))
+            .post(format!("{kbs_root_url}{KBS_PREFIX}/auth"))
             .header("Content-Type", "application/json")
             .json(&Request::new(self.tee().to_string()))
             .send()
@@ -107,7 +107,7 @@ impl KbsProtocolWrapper {
 
         let attest_response = self
             .http_client()
-            .post(format!("{kbs_root_url}/{KBS_PREFIX}/attest"))
+            .post(format!("{kbs_root_url}{KBS_PREFIX}/attest"))
             .header("Content-Type", "application/json")
             .json(&self.generate_evidence()?)
             .send()