Avoid HTTP request body cloning. (#574)

Consume body passed to post_message(body, url) and update callers.

Fold some long lines while I'm here to improve code readability.

Signed-off-by: Artem Mironov <artem.mironov@absa.africa>

Signed-off-by: Artem Mironov <artem.mironov@absa.africa>
Co-authored-by: Artem Mironov <artem.mironov@absa.africa>

Author: left-arm

agency_client/src/api/agent.rs

@@ -26,7 +26,7 @@ impl AgencyClient {
                 agent_vk,
             )
             .await?;
-        let response = self.post_to_agency(&data).await?;
+        let response = self.post_to_agency(data).await?;
         let mut response = self.parse_response_from_agency(&response).await?;
 
         match response.remove(0) {
@@ -56,7 +56,7 @@ impl AgencyClient {
         let data = self
             .prepare_message_for_agent(&Client2AgencyMessage::CreateKey(message), &agent_pwdid)
             .await?;
-        let response = self.post_to_agency(&data).await?;
+        let response = self.post_to_agency(data).await?;
         let mut response = self.parse_response_from_agency(&response).await?;
 
         match response.remove(0) {
@@ -81,7 +81,7 @@ impl AgencyClient {
         let agent_did = self.get_agent_pwdid();
         let message = Client2AgencyMessage::UpdateComMethod(UpdateComMethod::build(com_method));
         let data = self.prepare_message_for_agent(&message, &agent_did).await?;
-        let response = self.post_to_agency(&data).await?;
+        let response = self.post_to_agency(data).await?;
         self.parse_response_from_agency(&response).await?;
 
         Ok(())

agency_client/src/api/messaging.rs

@@ -31,7 +31,7 @@ impl AgencyClient {
                 &agent_did,
             )
             .await?;
-        let response = self.post_to_agency(&data).await?;
+        let response = self.post_to_agency(data).await?;
         let mut response = self.parse_response_from_agency(&response).await?;
 
         match response.remove(0) {
@@ -69,7 +69,7 @@ impl AgencyClient {
         let data = self
             .prepare_message_for_connection_agent(vec![message], to_pw_vk, agent_did, agent_vk)
             .await?;
-        let response = self.post_to_agency(&data).await?;
+        let response = self.post_to_agency(data).await?;
         let mut response = self.parse_response_from_agency(&response).await?;
 
         match response.remove(0) {

agency_client/src/httpclient.rs

@@ -23,7 +23,7 @@ lazy_static! {
         .unwrap();
 }
 
-pub async fn post_message(body_content: &Vec<u8>, url: &str) -> AgencyClientResult<Vec<u8>> {
+pub async fn post_message(body_content: Vec<u8>, url: &str) -> AgencyClientResult<Vec<u8>> {
     if mocking::agency_mocks_enabled() {
         if HttpClientMockResponse::has_response() {
             warn!("post_message >> mocking response for POST {}", url);
@@ -42,7 +42,8 @@ pub async fn post_message(body_content: &Vec<u8>, url: &str) -> AgencyClientResu
         return Ok(mocked_response);
     }
 
-    //Setting SSL Certs location. This is needed on android platform. Or openssl will fail to verify the certs
+    // Setting SSL Certs location. This is needed on android
+    // platform. Or openssl will fail to verify the certs
     if cfg!(target_os = "android") {
         info!("::Android code");
         set_ssl_cert_location();
@@ -52,7 +53,7 @@ pub async fn post_message(body_content: &Vec<u8>, url: &str) -> AgencyClientResu
 
     let response = HTTP_CLIENT
         .post(url)
-        .body(body_content.to_owned())
+        .body(body_content)
         .header(CONTENT_TYPE, "application/ssi-agent-wire")
         .header(USER_AGENT, "reqwest")
         .send()
@@ -71,19 +72,32 @@ pub async fn post_message(body_content: &Vec<u8>, url: &str) -> AgencyClientResu
             if response_status.is_success() {
                 Ok(payload.into_bytes())
             } else {
-                Err(AgencyClientError::from_msg(AgencyClientErrorKind::PostMessageFailed, format!("POST {} failed due to non-success HTTP status: {}, response body: {}", url, response_status, payload)))
+                Err(AgencyClientError::from_msg(
+                    AgencyClientErrorKind::PostMessageFailed,
+                    format!("POST {} failed due to non-success HTTP status: {}, response body: {}",
+                            url, response_status, payload)))
             }
         }
-        Err(error) => Err(AgencyClientError::from_msg(AgencyClientErrorKind::PostMessageFailed, format!("POST {} failed because response could not be decoded as utf-8, HTTP status: {}, content-length header: {:?}, error: {:?}", url, response_status, content_length, error))),
+        Err(error) => Err(AgencyClientError::from_msg(
+            AgencyClientErrorKind::PostMessageFailed,
+            format!("POST {} failed because response could not be decoded as utf-8, HTTP status: {}, \
+                     content-length header: {:?}, error: {:?}",
+                    url, response_status, content_length, error))),
     }
 }
 
 fn set_ssl_cert_location() {
     let ssl_cert_file = "SSL_CERT_FILE";
-    env::set_var(ssl_cert_file, env::var("EXTERNAL_STORAGE").unwrap() + "/cacert.pem"); //TODO: CHANGE ME, HARDCODING FOR TESTING ONLY
+
+    // TODO: CHANGE ME, HARDCODING FOR TESTING ONLY
+    env::set_var(ssl_cert_file, env::var("EXTERNAL_STORAGE").unwrap() + "/cacert.pem");
+
     match env::var(ssl_cert_file) {
         Ok(val) => info!("{}:: {:?}", ssl_cert_file, val),
-        Err(e) => error!("couldn't find var in env {}:: {}. This needs to be set on Android to make https calls.\n See https://github.com/seanmonstar/reqwest/issues/70 for more info", ssl_cert_file, e),
+        Err(e) => error!("couldn't find var in env {}:: {}. \
+                          This needs to be set on Android to make https calls.\n\
+                          See https://github.com/seanmonstar/reqwest/issues/70 for more info",
+                         ssl_cert_file, e),
     }
     info!("::SSL_CERT_FILE has been set");
 }

agency_client/src/internal/messaging.rs

@@ -9,7 +9,7 @@ use core::u8;
 use serde_json::Value;
 
 impl AgencyClient {
-    pub async fn post_to_agency(&self, body_content: &Vec<u8>) -> AgencyClientResult<Vec<u8>> {
+    pub async fn post_to_agency(&self, body_content: Vec<u8>) -> AgencyClientResult<Vec<u8>> {
         let url = self.get_agency_url_full();
         httpclient::post_message(body_content, &url).await
     }
@@ -203,7 +203,7 @@ impl AgencyClient {
     ) -> AgencyClientResult<Vec<Client2AgencyMessage>> {
         trace!("send_message_to_agency >>> message: ..., did: {}", did);
         let data = self.prepare_message_for_agency(message, did, verkey).await?;
-        let response = self.post_to_agency(&data).await?;
+        let response = self.post_to_agency(data).await?;
         self.parse_response_from_agency(&response).await
     }
 }

aries_vcx/src/utils/mod.rs

@@ -77,8 +77,16 @@ pub async fn send_message(
     message: A2AMessage,
 ) -> VcxResult<()> {
     trace!("send_message >>> message: {:?}, did_doc: {:?}", message, &did_doc);
-    let envelope = EncryptionEnvelope::create(wallet_handle, &message, Some(&sender_verkey), &did_doc).await?;
-    agency_client::httpclient::post_message(&envelope.0, &did_doc.get_endpoint()).await?;
+
+    let EncryptionEnvelope(envelope) = EncryptionEnvelope::create(
+        wallet_handle,
+        &message,
+        Some(&sender_verkey),
+        &did_doc)
+        .await?;
+
+    agency_client::httpclient::post_message(envelope, &did_doc.get_endpoint()).await?;
+
     Ok(())
 }
 
@@ -92,7 +100,15 @@ pub async fn send_message_anonymously(
         message,
         &did_doc
     );
-    let envelope = EncryptionEnvelope::create(wallet_handle, message, None, did_doc).await?;
-    agency_client::httpclient::post_message(&envelope.0, &did_doc.get_endpoint()).await?;
+
+    let EncryptionEnvelope(envelope) = EncryptionEnvelope::create(
+        wallet_handle,
+        message,
+        None,
+        did_doc)
+        .await?;
+
+    agency_client::httpclient::post_message(envelope, &did_doc.get_endpoint()).await?;
+
     Ok(())
 }