diff --git a/attestation-container/go.mod b/attestation-container/go.mod index 52f038b179fd..3181a4eb4940 100644 --- a/attestation-container/go.mod +++ b/attestation-container/go.mod @@ -5,7 +5,7 @@ go 1.20 require ( golang.org/x/sys v0.6.0 google.golang.org/grpc v1.53.0 - google.golang.org/protobuf v1.28.1 + google.golang.org/protobuf v1.29.0 ) require ( diff --git a/attestation-container/go.sum b/attestation-container/go.sum index 1e7041c6c9d6..71060b61cb32 100644 --- a/attestation-container/go.sum +++ b/attestation-container/go.sum @@ -16,5 +16,5 @@ google.golang.org/grpc v1.53.0 h1:LAv2ds7cmFV/XTS3XG1NneeENYrXGmorPxsBbptIjNc= google.golang.org/grpc v1.53.0/go.mod h1:OnIrk0ipVdj4N5d9IUoFUx72/VlD7+jUsHwZgwSMQpw= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w= -google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.29.0 h1:44S3JjaKmLEE4YIkjzexaP+NzZsudE3Zin5Njn/pYX0= +google.golang.org/protobuf v1.29.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= diff --git a/src/node/rpc/frontend.h b/src/node/rpc/frontend.h index bb17b3ef8386..c04e59a40416 100644 --- a/src/node/rpc/frontend.h +++ b/src/node/rpc/frontend.h @@ -521,6 +521,7 @@ namespace ccf HTTP_STATUS_INTERNAL_SERVER_ERROR, ccf::errors::InternalError, "Illegal endpoint implementation"); + // TODO: clear headers return; } // else args owns a valid Tx relating to a non-pending response, which @@ -574,6 +575,7 @@ namespace ccf fmt::format( "Failed to execute local commit handler func: {}", e.what())); + // TODO: clear headers } catch (...) { @@ -584,6 +586,7 @@ namespace ccf HTTP_STATUS_INTERNAL_SERVER_ERROR, ccf::errors::InternalError, "Failed to execute local commit handler func"); + // TODO: clear headers } } @@ -609,6 +612,7 @@ namespace ccf HTTP_STATUS_SERVICE_UNAVAILABLE, ccf::errors::TransactionReplicationFailed, "Transaction failed to replicate."); + // TODO: clear headers update_metrics(ctx); return; } @@ -625,6 +629,7 @@ namespace ccf catch (RpcException& e) { ctx->set_error(std::move(e.error)); + // TODO: clear headers update_metrics(ctx); return; } @@ -632,6 +637,7 @@ namespace ccf { ctx->set_error( HTTP_STATUS_BAD_REQUEST, ccf::errors::InvalidInput, e.describe()); + // TODO: clear headers update_metrics(ctx); return; } @@ -639,6 +645,7 @@ namespace ccf { ctx->set_error( HTTP_STATUS_BAD_REQUEST, ccf::errors::InvalidInput, e.what()); + // TODO: clear headers update_metrics(ctx); return; } @@ -657,6 +664,7 @@ namespace ccf HTTP_STATUS_INTERNAL_SERVER_ERROR, ccf::errors::InternalError, e.what()); + // TODO: clear headers update_metrics(ctx); return; } @@ -669,6 +677,7 @@ namespace ccf "Transaction continued to conflict after {} attempts. Retry " "later.", max_attempts)); + // TODO: clear headers static constexpr size_t retry_after_seconds = 3; ctx->set_response_header(http::headers::RETRY_AFTER, retry_after_seconds);