mirror of https://github.com/grpc/grpc.git
Add new HTTP2 frame type SecurityFrame for security-related data. Also add new setting to negotiate whether the SecurityFrame type is supported.
PiperOrigin-RevId: 693054809pull/37142/head
Alisha Nanda
3 weeks ago
committed by
Copybara-Service
parent
86a68b4000
commit
e37d3848a1
30 changed files with 356 additions and 13 deletions
@ -0,0 +1,82 @@ |
|||||||
|
//
|
||||||
|
// Copyright 2024 gRPC authors.
|
||||||
|
//
|
||||||
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
// you may not use this file except in compliance with the License.
|
||||||
|
// You may obtain a copy of the License at
|
||||||
|
//
|
||||||
|
// http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
//
|
||||||
|
// Unless required by applicable law or agreed to in writing, software
|
||||||
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
// See the License for the specific language governing permissions and
|
||||||
|
// limitations under the License.
|
||||||
|
//
|
||||||
|
|
||||||
|
#include "src/core/ext/transport/chttp2/transport/frame_security.h" |
||||||
|
|
||||||
|
#include <cstddef> |
||||||
|
#include <cstdint> |
||||||
|
|
||||||
|
#include "absl/status/status.h" |
||||||
|
#include "src/core/ext/transport/chttp2/transport/internal.h" |
||||||
|
#include "src/core/ext/transport/chttp2/transport/legacy_frame.h" |
||||||
|
#include "src/core/lib/iomgr/event_engine_shims/endpoint.h" |
||||||
|
#include "src/core/lib/slice/slice.h" |
||||||
|
#include "src/core/lib/slice/slice_buffer.h" |
||||||
|
#include "src/core/lib/transport/transport_framing_endpoint_extension.h" |
||||||
|
|
||||||
|
absl::Status grpc_chttp2_security_frame_parser_parse(void* parser, |
||||||
|
grpc_chttp2_transport* t, |
||||||
|
grpc_chttp2_stream* /*s*/, |
||||||
|
const grpc_slice& slice, |
||||||
|
int is_last) { |
||||||
|
// Ignore frames from non-EventEngine endpoints.
|
||||||
|
if (t->transport_framing_endpoint_extension == nullptr) { |
||||||
|
return absl::OkStatus(); |
||||||
|
} |
||||||
|
|
||||||
|
grpc_chttp2_security_frame_parser* p = |
||||||
|
static_cast<grpc_chttp2_security_frame_parser*>(parser); |
||||||
|
p->payload.Append(grpc_core::Slice(slice)); |
||||||
|
|
||||||
|
if (is_last) { |
||||||
|
// Send security frame payload to endpoint.
|
||||||
|
t->transport_framing_endpoint_extension->ReceiveFrame( |
||||||
|
std::move(p->payload)); |
||||||
|
} |
||||||
|
|
||||||
|
return absl::OkStatus(); |
||||||
|
} |
||||||
|
|
||||||
|
absl::Status grpc_chttp2_security_frame_parser_begin_frame( |
||||||
|
grpc_chttp2_security_frame_parser* parser) { |
||||||
|
parser->payload.Clear(); |
||||||
|
return absl::OkStatus(); |
||||||
|
} |
||||||
|
|
||||||
|
void grpc_chttp2_security_frame_create(grpc_slice_buffer* payload, |
||||||
|
uint32_t length, |
||||||
|
grpc_slice_buffer* frame) { |
||||||
|
// does this frame need padding for security?
|
||||||
|
// do we need to worry about max frame size? it's 16 bytes
|
||||||
|
grpc_slice hdr; |
||||||
|
uint8_t* p; |
||||||
|
static const size_t header_size = 9; |
||||||
|
|
||||||
|
hdr = GRPC_SLICE_MALLOC(header_size); |
||||||
|
p = GRPC_SLICE_START_PTR(hdr); |
||||||
|
*p++ = static_cast<uint8_t>(length >> 16); |
||||||
|
*p++ = static_cast<uint8_t>(length >> 8); |
||||||
|
*p++ = static_cast<uint8_t>(length); |
||||||
|
*p++ = GRPC_CHTTP2_FRAME_SECURITY; |
||||||
|
*p++ = 0; // no flags
|
||||||
|
*p++ = 0; |
||||||
|
*p++ = 0; |
||||||
|
*p++ = 0; |
||||||
|
*p++ = 0; |
||||||
|
|
||||||
|
grpc_slice_buffer_add(frame, hdr); |
||||||
|
grpc_slice_buffer_move_first_no_ref(payload, payload->length, frame); |
||||||
|
} |
||||||
@ -0,0 +1,44 @@ |
|||||||
|
//
|
||||||
|
// Copyright 2024 gRPC authors.
|
||||||
|
//
|
||||||
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
// you may not use this file except in compliance with the License.
|
||||||
|
// You may obtain a copy of the License at
|
||||||
|
//
|
||||||
|
// http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
//
|
||||||
|
// Unless required by applicable law or agreed to in writing, software
|
||||||
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
// See the License for the specific language governing permissions and
|
||||||
|
// limitations under the License.
|
||||||
|
//
|
||||||
|
|
||||||
|
#ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_FRAME_SECURITY_H |
||||||
|
#define GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_FRAME_SECURITY_H |
||||||
|
|
||||||
|
#include <grpc/slice.h> |
||||||
|
#include <grpc/support/port_platform.h> |
||||||
|
#include <stdint.h> |
||||||
|
|
||||||
|
#include "src/core/ext/transport/chttp2/transport/legacy_frame.h" |
||||||
|
#include "src/core/lib/iomgr/error.h" |
||||||
|
#include "src/core/lib/slice/slice_buffer.h" |
||||||
|
#include "src/core/lib/transport/transport_framing_endpoint_extension.h" |
||||||
|
|
||||||
|
struct grpc_chttp2_security_frame_parser { |
||||||
|
grpc_core::SliceBuffer payload; |
||||||
|
}; |
||||||
|
|
||||||
|
void grpc_chttp2_security_frame_create(grpc_slice_buffer* payload, |
||||||
|
uint32_t length, |
||||||
|
grpc_slice_buffer* frame); |
||||||
|
|
||||||
|
absl::Status grpc_chttp2_security_frame_parser_begin_frame( |
||||||
|
grpc_chttp2_security_frame_parser* parser); |
||||||
|
|
||||||
|
grpc_error_handle grpc_chttp2_security_frame_parser_parse( |
||||||
|
void* parser, grpc_chttp2_transport* t, grpc_chttp2_stream* s, |
||||||
|
const grpc_slice& slice, int is_last); |
||||||
|
|
||||||
|
#endif // GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_FRAME_SECURITY_H
|
||||||
Loading…
Reference in new issue