Adjustments for the new location of http

Author: dreemkiller

Cargo.toml

@@ -10,4 +10,5 @@ anyhow = "1"
 base64 = { version = "0.13.0", default-features = false }
 err-derive = "0.2"
 log = "0.4.13"
+reqwest = { version = "0.11", default-features = false, features = ["blocking", "multipart"] }
 uuid = { version = "1.1.2", features = ["serde"] }

src/http.rs

@@ -16,9 +16,6 @@ use err_derive::Error;
 use log::{error, info};
 use reqwest::{blocking, Error as ReqwestError, header, StatusCode};
 use std::{collections::HashMap, string::String, vec::Vec};
-use transport_protocol::{
-    ProxyAttestationServerResponse, TransportProtocolError,
-};
 
 ///////////////////////////////////////////////////////////////////////////////
 // Errors.
@@ -39,23 +36,12 @@ pub enum HttpError {
     /// Response did not contain a field that we expected
     #[error(display = "Response did not contain an expected field.")]
     PoorlyFormedResponse,
-    #[error(
-        display = "A transport protocol message could not be (de)serialized: {}.",
-        _0
-    )]
-    SerializationError(TransportProtocolError),
     #[error(
         display = "A base64-encoded message could not be (de)serialized: {}.",
         _0
     )]
     Base64Error(base64::DecodeError),
-    #[error(display = "A transport protocol error occurred: {}.", _0)]
-    TransportProtocolError(TransportProtocolError),
-    #[error(display = "An attestation-related error occurred: {}.", _0)]
-    AttestationError(TransportProtocolError),
     #[error(display = "The proxy attestation service issued an unexpected reply.")]
-    ProtocolError(ProxyAttestationServerResponse),
-    #[error(display = "Unable to convert bytes to UTF8: {}.", _0)]
     Utf8Error(std::str::Utf8Error),
 }
 

src/lib.rs

@@ -21,7 +21,7 @@ mod http;
 #[derive(Debug, Error)]
 pub enum ProxyAttestationClientError {
     #[error(display = "ProxyAttestationClient: HttpError: {:?}", _0)]
-    HttpError(io_utils::http::HttpError),
+    HttpError(http::HttpError),
     #[error(display = "ProxyAttestationClient: Bad Response")]
     BadResponse,
 }
@@ -40,14 +40,14 @@ pub fn start_proxy_attestation<U: AsRef<str>>(
     let url = format!("http://{}/proxy/v1/Start", proxy_attestation_server_url_base);
     let empty_buffer: String = "".to_string();
 
-    let (id, nonce) = match post_buffer(&url, &empty_buffer, None).map_err(|e| {
+    let (id, nonce) = match http::post_buffer(&url, &empty_buffer, None).map_err(|e| {
             error!(
                 "Failed to send proxy attestation service start message.  Error produced: {}.",
                 e
             );
             e
         })? {
-        HttpResponse::Created(location, body) => {
+        http::HttpResponse::Created(location, body) => {
             (location, body)
         }
         non_created => {
@@ -77,10 +77,10 @@ pub fn complete_proxy_attestation_nitro(
     form_fields.insert("token".to_string(), base64::encode(att_doc));
     form_fields.insert("csr".to_string(), base64::encode(csr));
 
-    let response = post_form(url, &form_fields)
+    let response = http::post_form(url, &form_fields)
         .map_err(|err| ProxyAttestationClientError::HttpError(err))?;
     match response {
-        HttpResponse::Ok(data) => return Ok(data),
+        http::HttpResponse::Ok(data) => return Ok(data),
         _ => return Err(anyhow!(ProxyAttestationClientError::BadResponse)),
     }
 }
@@ -96,10 +96,10 @@ pub fn complete_proxy_attestation_linux(
     form_fields.insert("token".to_string(), base64::encode(token));
     form_fields.insert("csr".to_string(), base64::encode(csr));
 
-    let response = post_form(url, &form_fields)
+    let response = http::post_form(url, &form_fields)
         .map_err(|err| ProxyAttestationClientError::HttpError(err))?;
     match response {
-        HttpResponse::Ok(data) => return Ok(data),
+        http::HttpResponse::Ok(data) => return Ok(data),
         _ => return Err(anyhow!(ProxyAttestationClientError::BadResponse)),
     }
 }