Merge pull request #3111 from ctiller/reject-the-stuffs

Outlaw comma in non-binary metadata values
10 years ago · a620e99a32
parent 400e0cdd32 e535aacfac
commit a620e99a32
2 changed files with 5 additions and 2 deletions
--- a/src/core/transport/metadata.c
+++ b/src/core/transport/metadata.c
@ -703,7 +703,7 @@ int grpc_mdstr_is_legal_header(grpc_mdstr *s) {

 int grpc_mdstr_is_legal_nonbin_header(grpc_mdstr *s) {
  static const gpr_uint8 legal_header_bits[256 / 8] = {
-      0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+      0x00, 0x00, 0x00, 0x00, 0xff, 0xef, 0xff, 0xff, 0xff, 0xff, 0xff,
      0xff, 0xff, 0xff, 0xff, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
  return conforms_to(s, legal_header_bits);
--- a/tools/codegen/core/gen_legal_metadata_characters.c
+++ b/tools/codegen/core/gen_legal_metadata_characters.c
@ -66,7 +66,10 @@ int main(void) {
  dump();

  clear();
-  for (i = 32; i <= 126; i++) legal(i);
+  for (i = 32; i <= 126; i++) {
+    if (i == ',') continue;
+    legal(i);
+  }
  dump();

  return 0;