Merge #672

672: Problem: random broken pipe failures in sgx-cargo-1804-hw2 r=tomtau a=tomtau

Solution: added more details to error messages to know where exactly it failed
+ explicit flushing after writing to streams

Co-authored-by: Tomas Tauber <[email protected]>

Author: bors[bot]

chain-tx-enclave/tx-query/enclave/src/lib.rs

@@ -100,6 +100,7 @@ fn handle_decryption_request(
         let _ = tls.sock.shutdown(Shutdown::Both);
         return sgx_status_t::SGX_ERROR_UNEXPECTED;
     }
+    let _ = tls.flush();
 
     match tls.read(&mut plain) {
         Ok(l) => {
@@ -113,6 +114,7 @@ fn handle_decryption_request(
                 }
                 if let Some(reply) = process_decryption_request(&dr.body) {
                     let _ = tls.write(&reply.encode());
+                    let _ = tls.flush();
                 } else {
                     let _ = tls.sock.shutdown(Shutdown::Both);
                     return sgx_status_t::SGX_ERROR_INVALID_PARAMETER;
@@ -246,6 +248,7 @@ fn handle_encryption_request(
                             let _ = tls.write(&EncryptionResponse { resp: Err(e) }.encode());
                         }
                     };
+                    let _ = tls.flush();
                     sgx_status_t::SGX_SUCCESS
                 }
                 _ => {

client-core/src/cipher/default.rs

@@ -81,9 +81,15 @@ impl TransactionObfuscation for DefaultTransactionObfuscation {
                 .chain(|| {
                     (
                         ErrorKind::IoError,
-                        "Unable to write to TQE connection stream",
+                        "Unable to write to TQE connection stream (init decrypt)",
                     )
                 })?;
+            tls.flush().chain(|| {
+                (
+                    ErrorKind::IoError,
+                    "Unable to write to TQE connection stream (init decrypt flush)",
+                )
+            })?;
             let mut challenge = [0u8; 33];
             tls.read_exact(&mut challenge).chain(|| {
                 (
@@ -112,10 +118,15 @@ impl TransactionObfuscation for DefaultTransactionObfuscation {
             tls.write_all(&request.encode()).chain(|| {
                 (
                     ErrorKind::IoError,
-                    "Unable to write to TQE connection stream",
+                    "Unable to write to TQE connection stream (decrypt request)",
+                )
+            })?;
+            tls.flush().chain(|| {
+                (
+                    ErrorKind::IoError,
+                    "Unable to write to TQE connection stream (decrypt request flush)",
                 )
             })?;
-
             let mut plaintext = Vec::new();
             let result = match tls.read_to_end(&mut plaintext) {
                 Ok(_) => {
@@ -186,7 +197,13 @@ impl TransactionObfuscation for DefaultTransactionObfuscation {
         tls.write_all(&request.encode()).chain(|| {
             (
                 ErrorKind::IoError,
-                "Unable to write to TQE connection stream",
+                "Unable to write to TQE connection stream (encrypt request)",
+            )
+        })?;
+        tls.flush().chain(|| {
+            (
+                ErrorKind::IoError,
+                "Unable to write to TQE connection stream (encrypt request flush)",
             )
         })?;
         let mut plaintext = Vec::new();