[PPML] Fix format error of quote from attestation service (#5732)

* Fix format error of quote fom attestatioon service * Refine * Refine * skip dummy verify Co-authored-by: xiangyuT <[email protected]>
intel-analytics · Sep 13, 2022 · 0bfc0d7 · 0bfc0d7
1 parent ccec13e
commit 0bfc0d7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/scala/ppml/src/main/scala/com/intel/analytics/bigdl/ppml/attestation/AttestationCLI.scala b/scala/ppml/src/main/scala/com/intel/analytics/bigdl/ppml/attestation/AttestationCLI.scala
@@ -75,11 +75,14 @@ object AttestationCLI {
         }
 
         val challengeString = params.challenge
-        if (challengeString.length() > 0) {
-            val asQuote = as.getQuoteFromServer(challengeString)
-            // System.out.print(asQuote)
+        if (challengeString.length() > 0 && params.asType != ATTESTATION_CONVENTION.MODE_DUMMY) {
+            val asQuote = params.asType match {
+              case ATTESTATION_CONVENTION.MODE_EHSM_KMS =>
+                Base64.getDecoder().decode(as.getQuoteFromServer(challengeString))
+              case _ => throw new AttestationRuntimeException("Wrong Attestation service type")
+            }
             val quoteVerifier = new SGXDCAPQuoteVerifierImpl()
-            val verifyQuoteResult = quoteVerifier.verifyQuote(asQuote.getBytes())
+            val verifyQuoteResult = quoteVerifier.verifyQuote(asQuote)
             if (verifyQuoteResult == 0) {
               System.out.println("Quote Verification Success!")
             } else {

diff --git a/...ml/src/main/scala/com/intel/analytics/bigdl/ppml/attestation/EHSMAttestationService.scala b/...ml/src/main/scala/com/intel/analytics/bigdl/ppml/attestation/EHSMAttestationService.scala
@@ -20,7 +20,6 @@ package com.intel.analytics.bigdl.ppml.attestation
 import com.intel.analytics.bigdl.dllib.utils.Log4Error
 import com.intel.analytics.bigdl.ppml.utils.EHSMParams
 import com.intel.analytics.bigdl.ppml.utils.HTTPUtil.postRequest
-import java.util.Base64
 import org.apache.logging.log4j.LogManager
 import org.json.JSONObject
 
@@ -69,8 +68,7 @@ class EHSMAttestationService(kmsServerIP: String, kmsServerPort: String,
     if (challenge != postResult.getString(RES_CHALLENGE)) {
       Log4Error.invalidOperationError(false, "Challenge not matched")
     }
-    val quote = Base64.getDecoder().decode(postResult.getString(RES_QUOTE))
-    new String(quote)
+    postResult.getString(RES_QUOTE)
   }
 
   override def attestWithServer(quote: String): (Boolean, String) = {