Почетна Преглед Помоћ
Пријавите се
carto
/
grpc
2
0
Креирај огранак 0
Датотеке Дискусије 0 Захтеви за спајање 0 Вики
Преглед изворни кода

Merge pull request #10222 from makdharma/caching_with_uri

using URI query to communicate payload
makdharma пре 8 година
родитељ
9d67ee7222 f7c48945d0
комит
c4478a103b
21 измењених фајлова са 173 додато и 48 уклоњено
Подељен поглед Покажи статистику Diff
  1. 2 0
      BUILD
  2. 5 2
      CMakeLists.txt
  3. 5 3
      Makefile
  4. 1 1
      binding.gyp
  5. 1 0
      build.yaml
  6. 1 1
      config.m4
  7. 1 1
      gRPC-Core.podspec
  8. 1 1
      grpc.gemspec
  9. 1 1
      package.xml
  10. 49 10
      src/core/lib/channel/http_client_filter.c
  11. 44 16
      src/core/lib/channel/http_server_filter.c
  12. 20 5
      src/core/lib/security/util/b64.c
  13. 13 1
      src/core/lib/security/util/b64.h
  14. 1 1
      src/python/grpcio/grpc_core_dependencies.py
  15. 1 0
      tools/run_tests/generated/sources_and_headers.json
  16. 2 2
      vsprojects/vcxproj/grpc/grpc.vcxproj
  17. 3 3
      vsprojects/vcxproj/grpc/grpc.vcxproj.filters
  18. 2 0
      vsprojects/vcxproj/grpc_test_util/grpc_test_util.vcxproj
  19. 9 0
      vsprojects/vcxproj/grpc_test_util/grpc_test_util.vcxproj.filters
  20. 2 0
      vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj
  21. 9 0
      vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters

+ 2 - 0
BUILD
Прегледај датотеку 

@@ -511,6 +511,7 @@ grpc_cc_library(
 
         "src/core/lib/json/json_reader.c",
 
         "src/core/lib/json/json_string.c",
 
         "src/core/lib/json/json_writer.c",
 
+        "src/core/lib/security/util/b64.c",
 
         "src/core/lib/slice/percent_encoding.c",
 
         "src/core/lib/slice/slice.c",
 
         "src/core/lib/slice/slice_buffer.c",
 
@@ -629,6 +630,7 @@ grpc_cc_library(
 
         "src/core/lib/json/json_common.h",
 
         "src/core/lib/json/json_reader.h",
 
         "src/core/lib/json/json_writer.h",
 
+        "src/core/lib/security/util/b64.h",
 
         "src/core/lib/slice/percent_encoding.h",
 
         "src/core/lib/slice/slice_hash_table.h",
 
         "src/core/lib/slice/slice_internal.h",

+ 5 - 2
CMakeLists.txt
Прегледај датотеку 

@@ -993,6 +993,7 @@ add_library(grpc
 
   src/core/lib/json/json_reader.c
 
   src/core/lib/json/json_string.c
 
   src/core/lib/json/json_writer.c
 
+  src/core/lib/security/util/b64.c
 
   src/core/lib/slice/percent_encoding.c
 
   src/core/lib/slice/slice.c
 
   src/core/lib/slice/slice_buffer.c
 
@@ -1075,7 +1076,6 @@ add_library(grpc
 
   src/core/lib/security/transport/security_handshaker.c
 
   src/core/lib/security/transport/server_auth_filter.c
 
   src/core/lib/security/transport/tsi_error.c
 
-  src/core/lib/security/util/b64.c
 
   src/core/lib/security/util/json_util.c
 
   src/core/lib/surface/init_secure.c
 
   src/core/lib/tsi/fake_transport_security.c
 
@@ -1314,6 +1314,7 @@ add_library(grpc_cronet
 
   src/core/lib/json/json_reader.c
 
   src/core/lib/json/json_string.c
 
   src/core/lib/json/json_writer.c
 
+  src/core/lib/security/util/b64.c
 
   src/core/lib/slice/percent_encoding.c
 
   src/core/lib/slice/slice.c
 
   src/core/lib/slice/slice_buffer.c
 
@@ -1419,7 +1420,6 @@ add_library(grpc_cronet
 
   src/core/lib/security/transport/security_handshaker.c
 
   src/core/lib/security/transport/server_auth_filter.c
 
   src/core/lib/security/transport/tsi_error.c
 
-  src/core/lib/security/util/b64.c
 
   src/core/lib/security/util/json_util.c
 
   src/core/lib/surface/init_secure.c
 
   src/core/lib/tsi/fake_transport_security.c
 
@@ -1622,6 +1622,7 @@ add_library(grpc_test_util
 
   src/core/lib/json/json_reader.c
 
   src/core/lib/json/json_string.c
 
   src/core/lib/json/json_writer.c
 
+  src/core/lib/security/util/b64.c
 
   src/core/lib/slice/percent_encoding.c
 
   src/core/lib/slice/slice.c
 
   src/core/lib/slice/slice_buffer.c
 
@@ -1881,6 +1882,7 @@ add_library(grpc_unsecure
 
   src/core/lib/json/json_reader.c
 
   src/core/lib/json/json_string.c
 
   src/core/lib/json/json_writer.c
 
+  src/core/lib/security/util/b64.c
 
   src/core/lib/slice/percent_encoding.c
 
   src/core/lib/slice/slice.c
 
   src/core/lib/slice/slice_buffer.c
 
@@ -2511,6 +2513,7 @@ add_library(grpc++_cronet
 
   src/core/lib/json/json_reader.c
 
   src/core/lib/json/json_string.c
 
   src/core/lib/json/json_writer.c
 
+  src/core/lib/security/util/b64.c
 
   src/core/lib/slice/percent_encoding.c
 
   src/core/lib/slice/slice.c
 
   src/core/lib/slice/slice_buffer.c

+ 5 - 3
Makefile
Прегледај датотеку 

@@ -2887,6 +2887,7 @@ LIBGRPC_SRC = \
 
     src/core/lib/json/json_reader.c \
 
     src/core/lib/json/json_string.c \
 
     src/core/lib/json/json_writer.c \
 
+    src/core/lib/security/util/b64.c \
 
     src/core/lib/slice/percent_encoding.c \
 
     src/core/lib/slice/slice.c \
 
     src/core/lib/slice/slice_buffer.c \
 
@@ -2969,7 +2970,6 @@ LIBGRPC_SRC = \
 
     src/core/lib/security/transport/security_handshaker.c \
 
     src/core/lib/security/transport/server_auth_filter.c \
 
     src/core/lib/security/transport/tsi_error.c \
 
-    src/core/lib/security/util/b64.c \
 
     src/core/lib/security/util/json_util.c \
 
     src/core/lib/surface/init_secure.c \
 
     src/core/lib/tsi/fake_transport_security.c \
 
@@ -3206,6 +3206,7 @@ LIBGRPC_CRONET_SRC = \
 
     src/core/lib/json/json_reader.c \
 
     src/core/lib/json/json_string.c \
 
     src/core/lib/json/json_writer.c \
 
+    src/core/lib/security/util/b64.c \
 
     src/core/lib/slice/percent_encoding.c \
 
     src/core/lib/slice/slice.c \
 
     src/core/lib/slice/slice_buffer.c \
 
@@ -3311,7 +3312,6 @@ LIBGRPC_CRONET_SRC = \
 
     src/core/lib/security/transport/security_handshaker.c \
 
     src/core/lib/security/transport/server_auth_filter.c \
 
     src/core/lib/security/transport/tsi_error.c \
 
-    src/core/lib/security/util/b64.c \
 
     src/core/lib/security/util/json_util.c \
 
     src/core/lib/surface/init_secure.c \
 
     src/core/lib/tsi/fake_transport_security.c \
 
@@ -3513,6 +3513,7 @@ LIBGRPC_TEST_UTIL_SRC = \
 
     src/core/lib/json/json_reader.c \
 
     src/core/lib/json/json_string.c \
 
     src/core/lib/json/json_writer.c \
 
+    src/core/lib/security/util/b64.c \
 
     src/core/lib/slice/percent_encoding.c \
 
     src/core/lib/slice/slice.c \
 
     src/core/lib/slice/slice_buffer.c \
 
@@ -3744,6 +3745,7 @@ LIBGRPC_UNSECURE_SRC = \
 
     src/core/lib/json/json_reader.c \
 
     src/core/lib/json/json_string.c \
 
     src/core/lib/json/json_writer.c \
 
+    src/core/lib/security/util/b64.c \
 
     src/core/lib/slice/percent_encoding.c \
 
     src/core/lib/slice/slice.c \
 
     src/core/lib/slice/slice_buffer.c \
 
@@ -4360,6 +4362,7 @@ LIBGRPC++_CRONET_SRC = \
 
     src/core/lib/json/json_reader.c \
 
     src/core/lib/json/json_string.c \
 
     src/core/lib/json/json_writer.c \
 
+    src/core/lib/security/util/b64.c \
 
     src/core/lib/slice/percent_encoding.c \
 
     src/core/lib/slice/slice.c \
 
     src/core/lib/slice/slice_buffer.c \
 
@@ -18806,7 +18809,6 @@ src/core/lib/security/transport/security_connector.c: $(OPENSSL_DEP)
 
 src/core/lib/security/transport/security_handshaker.c: $(OPENSSL_DEP)
 
 src/core/lib/security/transport/server_auth_filter.c: $(OPENSSL_DEP)
 
 src/core/lib/security/transport/tsi_error.c: $(OPENSSL_DEP)
 
-src/core/lib/security/util/b64.c: $(OPENSSL_DEP)
 
 src/core/lib/security/util/json_util.c: $(OPENSSL_DEP)
 
 src/core/lib/surface/init_secure.c: $(OPENSSL_DEP)
 
 src/core/lib/tsi/fake_transport_security.c: $(OPENSSL_DEP)

+ 1 - 1
binding.gyp
Прегледај датотеку 

@@ -700,6 +700,7 @@
 
         'src/core/lib/json/json_reader.c',
 
         'src/core/lib/json/json_string.c',
 
         'src/core/lib/json/json_writer.c',
 
+        'src/core/lib/security/util/b64.c',
 
         'src/core/lib/slice/percent_encoding.c',
 
         'src/core/lib/slice/slice.c',
 
         'src/core/lib/slice/slice_buffer.c',
 
@@ -782,7 +783,6 @@
 
         'src/core/lib/security/transport/security_handshaker.c',
 
         'src/core/lib/security/transport/server_auth_filter.c',
 
         'src/core/lib/security/transport/tsi_error.c',
 
-        'src/core/lib/security/util/b64.c',
 
         'src/core/lib/security/util/json_util.c',
 
         'src/core/lib/surface/init_secure.c',
 
         'src/core/lib/tsi/fake_transport_security.c',

+ 1 - 0
build.yaml
Прегледај датотеку 

@@ -369,6 +369,7 @@ filegroups:
 
   - src/core/lib/json/json_reader.c
 
   - src/core/lib/json/json_string.c
 
   - src/core/lib/json/json_writer.c
 
+  - src/core/lib/security/util/b64.c
 
   - src/core/lib/slice/percent_encoding.c
 
   - src/core/lib/slice/slice.c
 
   - src/core/lib/slice/slice_buffer.c

+ 1 - 1
config.m4
Прегледај датотеку 

@@ -168,6 +168,7 @@ if test "$PHP_GRPC" != "no"; then
 
     src/core/lib/json/json_reader.c \
 
     src/core/lib/json/json_string.c \
 
     src/core/lib/json/json_writer.c \
 
+    src/core/lib/security/util/b64.c \
 
     src/core/lib/slice/percent_encoding.c \
 
     src/core/lib/slice/slice.c \
 
     src/core/lib/slice/slice_buffer.c \
 
@@ -250,7 +251,6 @@ if test "$PHP_GRPC" != "no"; then
 
     src/core/lib/security/transport/security_handshaker.c \
 
     src/core/lib/security/transport/server_auth_filter.c \
 
     src/core/lib/security/transport/tsi_error.c \
 
-    src/core/lib/security/util/b64.c \
 
     src/core/lib/security/util/json_util.c \
 
     src/core/lib/surface/init_secure.c \
 
     src/core/lib/tsi/fake_transport_security.c \

+ 1 - 1
gRPC-Core.podspec
Прегледај датотеку 

@@ -543,6 +543,7 @@ Pod::Spec.new do |s|
 
                       'src/core/lib/json/json_reader.c',
 
                       'src/core/lib/json/json_string.c',
 
                       'src/core/lib/json/json_writer.c',
 
+                      'src/core/lib/security/util/b64.c',
 
                       'src/core/lib/slice/percent_encoding.c',
 
                       'src/core/lib/slice/slice.c',
 
                       'src/core/lib/slice/slice_buffer.c',
 
@@ -625,7 +626,6 @@ Pod::Spec.new do |s|
 
                       'src/core/lib/security/transport/security_handshaker.c',
 
                       'src/core/lib/security/transport/server_auth_filter.c',
 
                       'src/core/lib/security/transport/tsi_error.c',
 
-                      'src/core/lib/security/util/b64.c',
 
                       'src/core/lib/security/util/json_util.c',
 
                       'src/core/lib/surface/init_secure.c',
 
                       'src/core/lib/tsi/fake_transport_security.c',

+ 1 - 1
grpc.gemspec
Прегледај датотеку 

@@ -459,6 +459,7 @@ Gem::Specification.new do |s|
 
   s.files += %w( src/core/lib/json/json_reader.c )
 
   s.files += %w( src/core/lib/json/json_string.c )
 
   s.files += %w( src/core/lib/json/json_writer.c )
 
+  s.files += %w( src/core/lib/security/util/b64.c )
 
   s.files += %w( src/core/lib/slice/percent_encoding.c )
 
   s.files += %w( src/core/lib/slice/slice.c )
 
   s.files += %w( src/core/lib/slice/slice_buffer.c )
 
@@ -541,7 +542,6 @@ Gem::Specification.new do |s|
 
   s.files += %w( src/core/lib/security/transport/security_handshaker.c )
 
   s.files += %w( src/core/lib/security/transport/server_auth_filter.c )
 
   s.files += %w( src/core/lib/security/transport/tsi_error.c )
 
-  s.files += %w( src/core/lib/security/util/b64.c )
 
   s.files += %w( src/core/lib/security/util/json_util.c )
 
   s.files += %w( src/core/lib/surface/init_secure.c )
 
   s.files += %w( src/core/lib/tsi/fake_transport_security.c )

+ 1 - 1
package.xml
Прегледај датотеку 

@@ -468,6 +468,7 @@
 
     <file baseinstalldir="/" name="src/core/lib/json/json_reader.c" role="src" />
 
     <file baseinstalldir="/" name="src/core/lib/json/json_string.c" role="src" />
 
     <file baseinstalldir="/" name="src/core/lib/json/json_writer.c" role="src" />
 
+    <file baseinstalldir="/" name="src/core/lib/security/util/b64.c" role="src" />
 
     <file baseinstalldir="/" name="src/core/lib/slice/percent_encoding.c" role="src" />
 
     <file baseinstalldir="/" name="src/core/lib/slice/slice.c" role="src" />
 
     <file baseinstalldir="/" name="src/core/lib/slice/slice_buffer.c" role="src" />
 
@@ -550,7 +551,6 @@
 
     <file baseinstalldir="/" name="src/core/lib/security/transport/security_handshaker.c" role="src" />
 
     <file baseinstalldir="/" name="src/core/lib/security/transport/server_auth_filter.c" role="src" />
 
     <file baseinstalldir="/" name="src/core/lib/security/transport/tsi_error.c" role="src" />
 
-    <file baseinstalldir="/" name="src/core/lib/security/util/b64.c" role="src" />
 
     <file baseinstalldir="/" name="src/core/lib/security/util/json_util.c" role="src" />
 
     <file baseinstalldir="/" name="src/core/lib/surface/init_secure.c" role="src" />
 
     <file baseinstalldir="/" name="src/core/lib/tsi/fake_transport_security.c" role="src" />

+ 49 - 10
src/core/lib/channel/http_client_filter.c
Прегледај датотеку 

@@ -36,6 +36,7 @@
 
 #include <grpc/support/string_util.h>
 
 #include <string.h>
 
 #include "src/core/lib/profiling/timers.h"
 
+#include "src/core/lib/security/util/b64.h"
 
 #include "src/core/lib/slice/percent_encoding.h"
 
 #include "src/core/lib/slice/slice_internal.h"
 
 #include "src/core/lib/slice/slice_string_helpers.h"
 
@@ -56,7 +57,6 @@ typedef struct call_data {
 
   grpc_linked_mdelem te_trailers;
 
   grpc_linked_mdelem content_type;
 
   grpc_linked_mdelem user_agent;
 
-  grpc_linked_mdelem payload_bin;
 
 
   grpc_metadata_batch *recv_initial_metadata;
 
   grpc_metadata_batch *recv_trailing_metadata;
 
@@ -292,19 +292,58 @@ static grpc_error *hc_mutate_op(grpc_exec_ctx *exec_ctx,
 
       continue_send_message(exec_ctx, elem);
 
 
       if (calld->send_message_blocked == false) {
 
-        /* when all the send_message data is available, then create a MDELEM and
 
-        append to headers */
 
-        grpc_mdelem payload_bin = grpc_mdelem_from_slices(
 
-            exec_ctx, GRPC_MDSTR_GRPC_PAYLOAD_BIN,
 
-            grpc_slice_from_copied_buffer((const char *)calld->payload_bytes,
 
-                                          op->send_message->length));
 
-        error =
 
-            grpc_metadata_batch_add_tail(exec_ctx, op->send_initial_metadata,
 
-                                         &calld->payload_bin, payload_bin);
 
+        /* when all the send_message data is available, then modify the path
 
+         * MDELEM by appending base64 encoded query to the path */
 
+        const int k_url_safe = 1;
 
+        const int k_multi_line = 0;
 
+        const unsigned char k_query_separator = '?';
 
+
 
+        grpc_slice path_slice =
 
+            GRPC_MDVALUE(op->send_initial_metadata->idx.named.path->md);
 
+        /* sum up individual component's lengths and allocate enough memory to
 
+         * hold combined path+query */
 
+        size_t estimated_len = GRPC_SLICE_LENGTH(path_slice);
 
+        estimated_len++; /* for the '?' */
 
+        estimated_len += grpc_base64_estimate_encoded_size(
 
+            op->send_message->length, k_url_safe, k_multi_line);
 
+        estimated_len += 1; /* for the trailing 0 */
 
+        grpc_slice path_with_query_slice = grpc_slice_malloc(estimated_len);
 
+
 
+        /* memcopy individual pieces into this slice */
 
+        uint8_t *write_ptr =
 
+            (uint8_t *)GRPC_SLICE_START_PTR(path_with_query_slice);
 
+        uint8_t *original_path = (uint8_t *)GRPC_SLICE_START_PTR(path_slice);
 
+        memcpy(write_ptr, original_path, GRPC_SLICE_LENGTH(path_slice));
 
+        write_ptr += GRPC_SLICE_LENGTH(path_slice);
 
+
 
+        *write_ptr = k_query_separator;
 
+        write_ptr++; /* for the '?' */
 
+
 
+        grpc_base64_encode_core((char *)write_ptr, calld->payload_bytes,
 
+                                op->send_message->length, k_url_safe,
 
+                                k_multi_line);
 
+
 
+        /* remove trailing unused memory and add trailing 0 to terminate string
 
+         */
 
+        char *t = (char *)GRPC_SLICE_START_PTR(path_with_query_slice);
 
+        /* safe to use strlen since base64_encode will always add '\0' */
 
+        size_t path_length = strlen(t) + 1;
 
+        *(t + path_length) = '\0';
 
+        path_with_query_slice =
 
+            grpc_slice_sub(path_with_query_slice, 0, path_length);
 
+
 
+        /* substitute previous path with the new path+query */
 
+        grpc_mdelem mdelem_path_and_query = grpc_mdelem_from_slices(
 
+            exec_ctx, GRPC_MDSTR_PATH, path_with_query_slice);
 
+        grpc_metadata_batch *b = op->send_initial_metadata;
 
+        error = grpc_metadata_batch_substitute(exec_ctx, b, b->idx.named.path,
 
+                                               mdelem_path_and_query);
 
         if (error != GRPC_ERROR_NONE) return error;
 
+
 
         calld->on_complete = op->on_complete;
 
         op->on_complete = &calld->hc_on_complete;
 
         op->send_message = NULL;
 
+        grpc_slice_unref_internal(exec_ctx, path_with_query_slice);
 
       } else {
 
         /* Not all data is available. Fall back to POST. */
 
         gpr_log(GPR_DEBUG,

+ 44 - 16
src/core/lib/channel/http_server_filter.c
Прегледај датотеку 

@@ -37,6 +37,7 @@
 
 #include <grpc/support/log.h>
 
 #include <string.h>
 
 #include "src/core/lib/profiling/timers.h"
 
+#include "src/core/lib/security/util/b64.h"
 
 #include "src/core/lib/slice/percent_encoding.h"
 
 #include "src/core/lib/slice/slice_internal.h"
 
 #include "src/core/lib/slice/slice_string_helpers.h"
 
@@ -51,8 +52,8 @@ typedef struct call_data {
 
   grpc_linked_mdelem status;
 
   grpc_linked_mdelem content_type;
 
 
-  /* did this request come with payload-bin */
 
-  bool seen_payload_bin;
 
+  /* did this request come with path query containing request payload */
 
+  bool seen_path_with_query;
 
   /* flag to ensure payload_bin is delivered only once */
 
   bool payload_bin_delivered;
 
 
@@ -61,7 +62,7 @@ typedef struct call_data {
 
   bool *recv_cacheable_request;
 
   /** Closure to call when finished with the hs_on_recv hook */
 
   grpc_closure *on_done_recv;
 
-  /** Closure to call when we retrieve read message from the payload-bin header
 
+  /** Closure to call when we retrieve read message from the path URI
 
    */
 
   grpc_closure *recv_message_ready;
 
   grpc_closure *on_complete;
 
@@ -205,6 +206,43 @@ static grpc_error *server_filter_incoming_metadata(grpc_exec_ctx *exec_ctx,
 
               grpc_error_set_str(
 
                   GRPC_ERROR_CREATE_FROM_STATIC_STRING("Missing header"),
 
                   GRPC_ERROR_STR_KEY, grpc_slice_from_static_string(":path")));
 
+  } else if (*calld->recv_cacheable_request == true) {
 
+    /* We have a cacheable request made with GET verb. The path contains the
 
+     * query parameter which is base64 encoded request payload. */
 
+    const char k_query_separator = '?';
 
+    grpc_slice path_slice = GRPC_MDVALUE(b->idx.named.path->md);
 
+    uint8_t *path_ptr = (uint8_t *)GRPC_SLICE_START_PTR(path_slice);
 
+    size_t path_length = GRPC_SLICE_LENGTH(path_slice);
 
+    /* offset of the character '?' */
 
+    size_t offset = 0;
 
+    for (offset = 0; *path_ptr != k_query_separator && offset < path_length;
 
+         path_ptr++, offset++)
 
+      ;
 
+    if (offset < path_length) {
 
+      grpc_slice query_slice =
 
+          grpc_slice_sub(path_slice, offset + 1, path_length);
 
+
 
+      /* substitute path metadata with just the path (not query) */
 
+      grpc_mdelem mdelem_path_without_query = grpc_mdelem_from_slices(
 
+          exec_ctx, GRPC_MDSTR_PATH, grpc_slice_sub(path_slice, 0, offset));
 
+
 
+      grpc_metadata_batch_substitute(exec_ctx, b, b->idx.named.path,
 
+                                     mdelem_path_without_query);
 
+
 
+      /* decode payload from query and add to the slice buffer to be returned */
 
+      const int k_url_safe = 1;
 
+      grpc_slice_buffer_add(
 
+          &calld->read_slice_buffer,
 
+          grpc_base64_decode(exec_ctx,
 
+                             (const char *)GRPC_SLICE_START_PTR(query_slice),
 
+                             k_url_safe));
 
+      grpc_slice_buffer_stream_init(&calld->read_stream,
 
+                                    &calld->read_slice_buffer, 0);
 
+      calld->seen_path_with_query = true;
 
+      grpc_slice_unref_internal(exec_ctx, query_slice);
 
+    } else {
 
+      gpr_log(GPR_ERROR, "GET request without QUERY");
 
+    }
 
   }
 
 
   if (b->idx.named.host != NULL && b->idx.named.authority == NULL) {
 
@@ -228,16 +266,6 @@ static grpc_error *server_filter_incoming_metadata(grpc_exec_ctx *exec_ctx,
 
             GRPC_ERROR_STR_KEY, grpc_slice_from_static_string(":authority")));
 
   }
 
 
-  if (b->idx.named.grpc_payload_bin != NULL) {
 
-    calld->seen_payload_bin = true;
 
-    grpc_slice_buffer_add(&calld->read_slice_buffer,
 
-                          grpc_slice_ref_internal(
 
-                              GRPC_MDVALUE(b->idx.named.grpc_payload_bin->md)));
 
-    grpc_slice_buffer_stream_init(&calld->read_stream,
 
-                                  &calld->read_slice_buffer, 0);
 
-    grpc_metadata_batch_remove(exec_ctx, b, b->idx.named.grpc_payload_bin);
 
-  }
 
-
 
   return error;
 
 }
 
 
@@ -258,8 +286,8 @@ static void hs_on_complete(grpc_exec_ctx *exec_ctx, void *user_data,
 
                            grpc_error *err) {
 
   grpc_call_element *elem = user_data;
 
   call_data *calld = elem->call_data;
 
-  /* Call recv_message_ready if we got the payload via the header field */
 
-  if (calld->seen_payload_bin && calld->recv_message_ready != NULL) {
 
+  /* Call recv_message_ready if we got the payload via the path field */
 
+  if (calld->seen_path_with_query && calld->recv_message_ready != NULL) {
 
     *calld->pp_recv_message = calld->payload_bin_delivered
 
                                   ? NULL
 
                                   : (grpc_byte_stream *)&calld->read_stream;
 
@@ -274,7 +302,7 @@ static void hs_recv_message_ready(grpc_exec_ctx *exec_ctx, void *user_data,
 
                                   grpc_error *err) {
 
   grpc_call_element *elem = user_data;
 
   call_data *calld = elem->call_data;
 
-  if (calld->seen_payload_bin) {
 
+  if (calld->seen_path_with_query) {
 
     /* do nothing. This is probably a GET request, and payload will be returned
 
     in hs_on_complete callback. */
 
   } else {

+ 20 - 5
src/core/lib/security/util/b64.c
Прегледај датотеку 

@@ -71,15 +71,31 @@ static const char base64_url_safe_chars[] =
 
 
 char *grpc_base64_encode(const void *vdata, size_t data_size, int url_safe,
 
                          int multiline) {
 
-  const unsigned char *data = vdata;
 
-  const char *base64_chars =
 
-      url_safe ? base64_url_safe_chars : base64_url_unsafe_chars;
 
+  size_t result_projected_size =
 
+      grpc_base64_estimate_encoded_size(data_size, url_safe, multiline);
 
+  char *result = gpr_malloc(result_projected_size);
 
+  grpc_base64_encode_core(result, vdata, data_size, url_safe, multiline);
 
+  return result;
 
+}
 
+
 
+size_t grpc_base64_estimate_encoded_size(size_t data_size, int url_safe,
 
+                                         int multiline) {
 
   size_t result_projected_size =
 
       4 * ((data_size + 3) / 3) +
 
       2 * (multiline ? (data_size / (3 * GRPC_BASE64_MULTILINE_NUM_BLOCKS))
 
                      : 0) +
 
       1;
 
-  char *result = gpr_malloc(result_projected_size);
 
+  return result_projected_size;
 
+}
 
+
 
+void grpc_base64_encode_core(char *result, const void *vdata, size_t data_size,
 
+                             int url_safe, int multiline) {
 
+  const unsigned char *data = vdata;
 
+  const char *base64_chars =
 
+      url_safe ? base64_url_safe_chars : base64_url_unsafe_chars;
 
+  const size_t result_projected_size =
 
+      grpc_base64_estimate_encoded_size(data_size, url_safe, multiline);
 
+
 
   char *current = result;
 
   size_t num_blocks = 0;
 
   size_t i = 0;
 
@@ -119,7 +135,6 @@ char *grpc_base64_encode(const void *vdata, size_t data_size, int url_safe,
 
   GPR_ASSERT(current >= result);
 
   GPR_ASSERT((uintptr_t)(current - result) < result_projected_size);
 
   result[current - result] = '\0';
 
-  return result;
 
 }
 
 
 grpc_slice grpc_base64_decode(grpc_exec_ctx *exec_ctx, const char *b64,

+ 13 - 1
src/core/lib/security/util/b64.h
Прегледај датотеку 

@@ -37,10 +37,22 @@
 
 #include <grpc/slice.h>
 
 
 /* Encodes data using base64. It is the caller's responsability to free
 
-   the returned char * using gpr_free. Returns NULL on NULL input. */
 
+   the returned char * using gpr_free. Returns NULL on NULL input.
 
+   TODO(makdharma) : change the flags to bool from int */
 
 char *grpc_base64_encode(const void *data, size_t data_size, int url_safe,
 
                          int multiline);
 
 
+/* estimate the upper bound on size of base64 encoded data. The actual size
 
+ * is guaranteed to be less than or equal to the size returned here. */
 
+size_t grpc_base64_estimate_encoded_size(size_t data_size, int url_safe,
 
+                                         int multiline);
 
+
 
+/* Encodes data using base64 and write it to memory pointed to by result. It is
 
+ * the caller's responsiblity to allocate enough memory in |result| to fit the
 
+ * encoded data. */
 
+void grpc_base64_encode_core(char *result, const void *vdata, size_t data_size,
 
+                             int url_safe, int multiline);
 
+
 
 /* Decodes data according to the base64 specification. Returns an empty
 
    slice in case of failure. */
 
 grpc_slice grpc_base64_decode(grpc_exec_ctx *exec_ctx, const char *b64,

+ 1 - 1
src/python/grpcio/grpc_core_dependencies.py
Прегледај датотеку 

@@ -162,6 +162,7 @@ CORE_SOURCE_FILES = [
 
   'src/core/lib/json/json_reader.c',
 
   'src/core/lib/json/json_string.c',
 
   'src/core/lib/json/json_writer.c',
 
+  'src/core/lib/security/util/b64.c',
 
   'src/core/lib/slice/percent_encoding.c',
 
   'src/core/lib/slice/slice.c',
 
   'src/core/lib/slice/slice_buffer.c',
 
@@ -244,7 +245,6 @@ CORE_SOURCE_FILES = [
 
   'src/core/lib/security/transport/security_handshaker.c',
 
   'src/core/lib/security/transport/server_auth_filter.c',
 
   'src/core/lib/security/transport/tsi_error.c',
 
-  'src/core/lib/security/util/b64.c',
 
   'src/core/lib/security/util/json_util.c',
 
   'src/core/lib/surface/init_secure.c',
 
   'src/core/lib/tsi/fake_transport_security.c',

+ 1 - 0
tools/run_tests/generated/sources_and_headers.json
Прегледај датотеку 

@@ -7787,6 +7787,7 @@
 
       "src/core/lib/json/json_string.c", 
       "src/core/lib/json/json_writer.c", 
       "src/core/lib/json/json_writer.h", 
+      "src/core/lib/security/util/b64.c", 
       "src/core/lib/slice/percent_encoding.c", 
       "src/core/lib/slice/percent_encoding.h", 
       "src/core/lib/slice/slice.c",

+ 2 - 2
vsprojects/vcxproj/grpc/grpc.vcxproj
Прегледај датотеку 

@@ -675,6 +675,8 @@
 
     </ClCompile>
 
     <ClCompile Include="$(SolutionDir)\..\src\core\lib\json\json_writer.c">
 
     </ClCompile>
 
+    <ClCompile Include="$(SolutionDir)\..\src\core\lib\security\util\b64.c">
 
+    </ClCompile>
 
     <ClCompile Include="$(SolutionDir)\..\src\core\lib\slice\percent_encoding.c">
 
     </ClCompile>
 
     <ClCompile Include="$(SolutionDir)\..\src\core\lib\slice\slice.c">
 
@@ -839,8 +841,6 @@
 
     </ClCompile>
 
     <ClCompile Include="$(SolutionDir)\..\src\core\lib\security\transport\tsi_error.c">
 
     </ClCompile>
 
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\security\util\b64.c">
 
-    </ClCompile>
 
     <ClCompile Include="$(SolutionDir)\..\src\core\lib\security\util\json_util.c">
 
     </ClCompile>
 
     <ClCompile Include="$(SolutionDir)\..\src\core\lib\surface\init_secure.c">

+ 3 - 3
vsprojects/vcxproj/grpc/grpc.vcxproj.filters
Прегледај датотеку 

@@ -259,6 +259,9 @@
 
     <ClCompile Include="$(SolutionDir)\..\src\core\lib\json\json_writer.c">
 
       <Filter>src\core\lib\json</Filter>
 
     </ClCompile>
 
+    <ClCompile Include="$(SolutionDir)\..\src\core\lib\security\util\b64.c">
 
+      <Filter>src\core\lib\security\util</Filter>
 
+    </ClCompile>
 
     <ClCompile Include="$(SolutionDir)\..\src\core\lib\slice\percent_encoding.c">
 
       <Filter>src\core\lib\slice</Filter>
 
     </ClCompile>
 
@@ -505,9 +508,6 @@
 
     <ClCompile Include="$(SolutionDir)\..\src\core\lib\security\transport\tsi_error.c">
 
       <Filter>src\core\lib\security\transport</Filter>
 
     </ClCompile>
 
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\security\util\b64.c">
 
-      <Filter>src\core\lib\security\util</Filter>
 
-    </ClCompile>
 
     <ClCompile Include="$(SolutionDir)\..\src\core\lib\security\util\json_util.c">
 
       <Filter>src\core\lib\security\util</Filter>
 
     </ClCompile>

+ 2 - 0
vsprojects/vcxproj/grpc_test_util/grpc_test_util.vcxproj
Прегледај датотеку 

@@ -516,6 +516,8 @@
 
     </ClCompile>
 
     <ClCompile Include="$(SolutionDir)\..\src\core\lib\json\json_writer.c">
 
     </ClCompile>
 
+    <ClCompile Include="$(SolutionDir)\..\src\core\lib\security\util\b64.c">
 
+    </ClCompile>
 
     <ClCompile Include="$(SolutionDir)\..\src\core\lib\slice\percent_encoding.c">
 
     </ClCompile>
 
     <ClCompile Include="$(SolutionDir)\..\src\core\lib\slice\slice.c">

+ 9 - 0
vsprojects/vcxproj/grpc_test_util/grpc_test_util.vcxproj.filters
Прегледај датотеку 

@@ -316,6 +316,9 @@
 
     <ClCompile Include="$(SolutionDir)\..\src\core\lib\json\json_writer.c">
 
       <Filter>src\core\lib\json</Filter>
 
     </ClCompile>
 
+    <ClCompile Include="$(SolutionDir)\..\src\core\lib\security\util\b64.c">
 
+      <Filter>src\core\lib\security\util</Filter>
 
+    </ClCompile>
 
     <ClCompile Include="$(SolutionDir)\..\src\core\lib\slice\percent_encoding.c">
 
       <Filter>src\core\lib\slice</Filter>
 
     </ClCompile>
 
@@ -941,6 +944,12 @@
 
     <Filter Include="src\core\lib\json">
 
       <UniqueIdentifier>{89bc8f83-e29a-ddab-8f6b-22df11cdc867}</UniqueIdentifier>
 
     </Filter>
 
+    <Filter Include="src\core\lib\security">
 
+      <UniqueIdentifier>{83d9c8a0-c579-769e-e2df-270c67b8c159}</UniqueIdentifier>
 
+    </Filter>
 
+    <Filter Include="src\core\lib\security\util">
 
+      <UniqueIdentifier>{d55417ff-35a3-ef69-80c4-e6a95673728b}</UniqueIdentifier>
 
+    </Filter>
 
     <Filter Include="src\core\lib\slice">
 
       <UniqueIdentifier>{4d172bbc-20c4-6e7d-872a-2d287b589aa0}</UniqueIdentifier>
 
     </Filter>

+ 2 - 0
vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj
Прегледај датотеку 

@@ -642,6 +642,8 @@
 
     </ClCompile>
 
     <ClCompile Include="$(SolutionDir)\..\src\core\lib\json\json_writer.c">
 
     </ClCompile>
 
+    <ClCompile Include="$(SolutionDir)\..\src\core\lib\security\util\b64.c">
 
+    </ClCompile>
 
     <ClCompile Include="$(SolutionDir)\..\src\core\lib\slice\percent_encoding.c">
 
     </ClCompile>
 
     <ClCompile Include="$(SolutionDir)\..\src\core\lib\slice\slice.c">

+ 9 - 0
vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters
Прегледај датотеку 

@@ -262,6 +262,9 @@
 
     <ClCompile Include="$(SolutionDir)\..\src\core\lib\json\json_writer.c">
 
       <Filter>src\core\lib\json</Filter>
 
     </ClCompile>
 
+    <ClCompile Include="$(SolutionDir)\..\src\core\lib\security\util\b64.c">
 
+      <Filter>src\core\lib\security\util</Filter>
 
+    </ClCompile>
 
     <ClCompile Include="$(SolutionDir)\..\src\core\lib\slice\percent_encoding.c">
 
       <Filter>src\core\lib\slice</Filter>
 
     </ClCompile>
 
@@ -1352,6 +1355,12 @@
 
     <Filter Include="src\core\lib\json">
 
       <UniqueIdentifier>{681cdaeb-c47f-8853-d985-bf13c2873947}</UniqueIdentifier>
 
     </Filter>
 
+    <Filter Include="src\core\lib\security">
 
+      <UniqueIdentifier>{02c849c5-66eb-e42f-c9f7-2cf7cc9db06a}</UniqueIdentifier>
 
+    </Filter>
 
+    <Filter Include="src\core\lib\security\util">
 
+      <UniqueIdentifier>{c22aef1f-8b7b-6b5c-9e22-321b11f6352d}</UniqueIdentifier>
 
+    </Filter>
 
     <Filter Include="src\core\lib\slice">
 
       <UniqueIdentifier>{74c81ab7-e329-a362-3890-4c41b90f0511}</UniqueIdentifier>
 
     </Filter>