grpc 1.83.1-x86_64-linux-gnu → 1.84.0.pre1-x86_64-linux-gnu

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 686d9167b6e121dae169d6ca546b7000eb2b6698a60eb3204ae9d1a8b50f4870
-  data.tar.gz: 4b3b396c5654be1c322c023ee7e96094afda2cd3079fa2fb0f553e05d5a04f6b
+  metadata.gz: a1e1b5d8e74f8b9675b91ed9672854f23e9e2bb4b43826f03e73e9214bc92f36
+  data.tar.gz: 163c727170861482d980500e744425b95feeb2f58e4ed2d12f8c3f18d802c607
 SHA512:
-  metadata.gz: cca42128596eabc15aa94036e4a2cabcf38877d678995a7a0d92cfee61cfb67c3dc095870e020b5720a91120580f3c2e772a2ba04b4698c5bc7833cd103a2923
-  data.tar.gz: b6aa4d36265de911a52f804dae34e33425d1a2b53e4c96bbc6092a104f55a984a090acbd0b5b0e8016d1abce5a0211a1ebae255ff416b0e0d3a58fc431bcfff6
+  metadata.gz: 19fee8ef4fa22670546e61e905fd05d38643b4c8a24270c0ec1a6bca63f9fac8ec7a2038bb285c3a12373177b346a9fcd213a301be7993b02b00d0de216524b7
+  data.tar.gz: bb5c2a304f0bb19a701d157ba4b43222a2cbdd4f853bc2c4e4bff8fe880aa04233f0861a02626f1a4fa0f69b6eb27c81d0acc6402b08a36056dbd9ed607a4d1b

data/src/ruby/ext/grpc/rb_call.c

@@ -401,7 +401,6 @@ static int grpc_rb_md_ary_fill_hash_cb(VALUE key, VALUE val, VALUE md_ary_obj) {
   long i;
   grpc_slice key_slice;
   grpc_slice value_slice;
-  char* tmp_str = NULL;
 
   if (TYPE(key) == T_SYMBOL) {
     key_slice = grpc_slice_from_static_string(rb_id2name(SYM2ID(key)));
@@ -415,9 +414,11 @@ static int grpc_rb_md_ary_fill_hash_cb(VALUE key, VALUE val, VALUE md_ary_obj) {
   }
 
   if (!grpc_header_key_is_legal(key_slice)) {
-    tmp_str = grpc_slice_to_c_string(key_slice);
+    grpc_slice_unref(key_slice);
     rb_raise(rb_eArgError,
-             "'%s' is an invalid header key, must match [a-z0-9-_.]+", tmp_str);
+             "'%" PRIsVALUE
+             "' is an invalid header key, must match [a-z0-9-_.]+",
+             key);
     return ST_STOP;
   }
 
@@ -429,18 +430,25 @@ static int grpc_rb_md_ary_fill_hash_cb(VALUE key, VALUE val, VALUE md_ary_obj) {
     array_length = RARRAY_LEN(val);
     /* If the value is an array, add capacity for each value in the array */
     for (i = 0; i < array_length; i++) {
-      value_slice = grpc_slice_from_copied_buffer(
-          RSTRING_PTR(rb_ary_entry(val, i)), RSTRING_LEN(rb_ary_entry(val, i)));
+      VALUE val_entry = rb_ary_entry(val, i);
+      if (TYPE(val_entry) != T_STRING) {
+        grpc_slice_unref(key_slice);
+        rb_raise(rb_eTypeError, "Header values in array must be strings");
+        return ST_STOP;
+      }
+      value_slice = grpc_slice_from_copied_buffer(RSTRING_PTR(val_entry),
+                                                  RSTRING_LEN(val_entry));
       if (!grpc_is_binary_header(key_slice) &&
           !grpc_header_nonbin_value_is_legal(value_slice)) {
-        // The value has invalid characters
-        tmp_str = grpc_slice_to_c_string(value_slice);
-        rb_raise(rb_eArgError, "Header value '%s' has invalid characters",
-                 tmp_str);
+        grpc_slice_unref(value_slice);
+        grpc_slice_unref(key_slice);
+        rb_raise(rb_eArgError,
+                 "Header value '%" PRIsVALUE "' has invalid characters",
+                 val_entry);
         return ST_STOP;
       }
       GRPC_RUBY_ASSERT(md_ary->count < md_ary->capacity);
-      md_ary->metadata[md_ary->count].key = key_slice;
+      md_ary->metadata[md_ary->count].key = grpc_slice_ref(key_slice);
       md_ary->metadata[md_ary->count].value = value_slice;
       md_ary->count += 1;
     }
@@ -449,20 +457,23 @@ static int grpc_rb_md_ary_fill_hash_cb(VALUE key, VALUE val, VALUE md_ary_obj) {
         grpc_slice_from_copied_buffer(RSTRING_PTR(val), RSTRING_LEN(val));
     if (!grpc_is_binary_header(key_slice) &&
         !grpc_header_nonbin_value_is_legal(value_slice)) {
-      // The value has invalid characters
-      tmp_str = grpc_slice_to_c_string(value_slice);
-      rb_raise(rb_eArgError, "Header value '%s' has invalid characters",
-               tmp_str);
+      grpc_slice_unref(value_slice);
+      grpc_slice_unref(key_slice);
+      rb_raise(rb_eArgError,
+               "Header value '%" PRIsVALUE "' has invalid characters", val);
       return ST_STOP;
     }
     GRPC_RUBY_ASSERT(md_ary->count < md_ary->capacity);
-    md_ary->metadata[md_ary->count].key = key_slice;
+    md_ary->metadata[md_ary->count].key = grpc_slice_ref(key_slice);
     md_ary->metadata[md_ary->count].value = value_slice;
     md_ary->count += 1;
   } else {
+    grpc_slice_unref(key_slice);
     rb_raise(rb_eArgError, "Header values must be of type string or array");
     return ST_STOP;
   }
+  /* Release the local reference; each entry now owns its own ref. */
+  grpc_slice_unref(key_slice);
   return ST_CONTINUE;
 }
 

data/src/ruby/ext/grpc/rb_completion_queue.c

@@ -21,6 +21,7 @@
 #include "rb_completion_queue.h"
 
 #include <grpc/grpc.h>
+#include <grpc/support/atm.h>
 #include <grpc/support/log.h>
 #include <grpc/support/time.h>
 #include <ruby/thread.h>
@@ -35,7 +36,7 @@ typedef struct next_call_stack {
   grpc_event event;
   gpr_timespec timeout;
   void* tag;
-  volatile int interrupted;
+  gpr_atm interrupted;
 } next_call_stack;
 
 /* Calls grpc_completion_queue_pluck without holding the ruby GIL */
@@ -49,7 +50,7 @@ static void* grpc_rb_completion_queue_pluck_no_gil(void* param) {
         next_call->cq, next_call->tag, deadline, NULL);
     if (next_call->event.type != GRPC_QUEUE_TIMEOUT) break;
     if (gpr_time_cmp(deadline, next_call->timeout) > 0) break;
-    if (next_call->interrupted) break;
+    if (gpr_atm_acq_load(&next_call->interrupted)) break;
   }
   return NULL;
 }
@@ -66,7 +67,7 @@ void grpc_rb_completion_queue_destroy(grpc_completion_queue* cq) {
 
 static void unblock_func(void* param) {
   next_call_stack* const next_call = (next_call_stack*)param;
-  next_call->interrupted = 1;
+  gpr_atm_rel_store(&next_call->interrupted, 1);
 }
 
 /* Does the same thing as grpc_completion_queue_pluck, while properly releasing
@@ -85,12 +86,12 @@ grpc_event rb_completion_queue_pluck(grpc_completion_queue* queue, void* tag,
    * this is necessary. */
   grpc_absl_log_str(GPR_DEBUG, "CQ pluck loop begin: ", reason);
   do {
-    next_call.interrupted = 0;
+    gpr_atm_rel_store(&next_call.interrupted, 0);
     rb_thread_call_without_gvl(grpc_rb_completion_queue_pluck_no_gil,
                                (void*)&next_call, unblock_func,
                                (void*)&next_call);
     if (next_call.event.type != GRPC_QUEUE_TIMEOUT) break;
-  } while (next_call.interrupted);
+  } while (gpr_atm_acq_load(&next_call.interrupted));
   grpc_absl_log_str(GPR_DEBUG, "CQ pluck loop done: ", reason);
   return next_call.event;
 }

data/src/ruby/ext/grpc/rb_grpc_imports.generated.c

@@ -44,6 +44,7 @@ grpc_compression_options_disable_algorithm_type grpc_compression_options_disable
 grpc_compression_options_is_algorithm_enabled_type grpc_compression_options_is_algorithm_enabled_import;
 grpc_service_account_jwt_access_credentials_create_type grpc_service_account_jwt_access_credentials_create_import;
 grpc_external_account_credentials_create_type grpc_external_account_credentials_create_import;
+grpc_gdch_service_account_credentials_create_type grpc_gdch_service_account_credentials_create_import;
 grpc_google_refresh_token_credentials_create_type grpc_google_refresh_token_credentials_create_import;
 grpc_access_token_credentials_create_type grpc_access_token_credentials_create_import;
 grpc_google_iam_credentials_create_type grpc_google_iam_credentials_create_import;
@@ -333,6 +334,7 @@ void grpc_rb_load_imports(HMODULE library) {
   grpc_compression_options_is_algorithm_enabled_import = (grpc_compression_options_is_algorithm_enabled_type) GetProcAddress(library, "grpc_compression_options_is_algorithm_enabled");
   grpc_service_account_jwt_access_credentials_create_import = (grpc_service_account_jwt_access_credentials_create_type) GetProcAddress(library, "grpc_service_account_jwt_access_credentials_create");
   grpc_external_account_credentials_create_import = (grpc_external_account_credentials_create_type) GetProcAddress(library, "grpc_external_account_credentials_create");
+  grpc_gdch_service_account_credentials_create_import = (grpc_gdch_service_account_credentials_create_type) GetProcAddress(library, "grpc_gdch_service_account_credentials_create");
   grpc_google_refresh_token_credentials_create_import = (grpc_google_refresh_token_credentials_create_type) GetProcAddress(library, "grpc_google_refresh_token_credentials_create");
   grpc_access_token_credentials_create_import = (grpc_access_token_credentials_create_type) GetProcAddress(library, "grpc_access_token_credentials_create");
   grpc_google_iam_credentials_create_import = (grpc_google_iam_credentials_create_type) GetProcAddress(library, "grpc_google_iam_credentials_create");

data/src/ruby/ext/grpc/rb_grpc_imports.generated.h

@@ -108,6 +108,9 @@ extern grpc_service_account_jwt_access_credentials_create_type grpc_service_acco
 typedef grpc_call_credentials*(*grpc_external_account_credentials_create_type)(const char* json_string, const char* scopes_string);
 extern grpc_external_account_credentials_create_type grpc_external_account_credentials_create_import;
 #define grpc_external_account_credentials_create grpc_external_account_credentials_create_import
+typedef grpc_call_credentials*(*grpc_gdch_service_account_credentials_create_type)(const char* json_string, const char* audience_string);
+extern grpc_gdch_service_account_credentials_create_type grpc_gdch_service_account_credentials_create_import;
+#define grpc_gdch_service_account_credentials_create grpc_gdch_service_account_credentials_create_import
 typedef grpc_call_credentials*(*grpc_google_refresh_token_credentials_create_type)(const char* json_refresh_token, void* reserved);
 extern grpc_google_refresh_token_credentials_create_type grpc_google_refresh_token_credentials_create_import;
 #define grpc_google_refresh_token_credentials_create grpc_google_refresh_token_credentials_create_import

data/src/ruby/lib/grpc/version.rb

@@ -14,5 +14,5 @@
 
 # GRPC contains the General RPC module.
 module GRPC
-  VERSION = '1.83.1'
+  VERSION = '1.84.0.pre1'
 end

data/src/ruby/pb/test/client.rb

@@ -31,6 +31,7 @@ $LOAD_PATH.unshift(lib_dir) unless $LOAD_PATH.include?(lib_dir)
 $LOAD_PATH.unshift(pb_dir) unless $LOAD_PATH.include?(pb_dir)
 
 require 'optparse'
+require 'json'
 require 'logger'
 
 require_relative '../../lib/grpc'
@@ -319,7 +320,7 @@ class NamedTests
       return
     end
     json_key = File.read(ENV[AUTH_ENV])
-    wanted_email = MultiJson.load(json_key)['client_email']
+    wanted_email = JSON.parse(json_key)['client_email']
     resp = perform_large_unary(fill_username: true,
                                fill_oauth_scope: true)
     assert("#{__callee__}: bad username") { wanted_email == resp.username }
@@ -330,7 +331,7 @@ class NamedTests
 
   def jwt_token_creds
     json_key = File.read(ENV[AUTH_ENV])
-    wanted_email = MultiJson.load(json_key)['client_email']
+    wanted_email = JSON.parse(json_key)['client_email']
     resp = perform_large_unary(fill_username: true)
     assert("#{__callee__}: bad username") { wanted_email == resp.username }
   end
@@ -347,7 +348,7 @@ class NamedTests
     resp = perform_large_unary(fill_username: true,
                                fill_oauth_scope: true)
     json_key = File.read(ENV[AUTH_ENV])
-    wanted_email = MultiJson.load(json_key)['client_email']
+    wanted_email = JSON.parse(json_key)['client_email']
     assert("#{__callee__}: bad username") { wanted_email == resp.username }
     assert("#{__callee__}: bad oauth scope") do
       @args.oauth_scope.include?(resp.oauth_scope)
@@ -366,7 +367,7 @@ class NamedTests
                                fill_oauth_scope: true,
                                credentials: call_creds)
     json_key = File.read(ENV[AUTH_ENV])
-    wanted_email = MultiJson.load(json_key)['client_email']
+    wanted_email = JSON.parse(json_key)['client_email']
     assert("#{__callee__}: bad username") { wanted_email == resp.username }
     assert("#{__callee__}: bad oauth scope") do
       @args.oauth_scope.include?(resp.oauth_scope)

data/src/ruby/spec/call_spec.rb

@@ -181,6 +181,20 @@ describe GRPC::Core::Call do
     end
   end
 
+  describe '#run_batch with array-valued metadata' do
+    it 'does not crash with long key and array value' do
+      make_test_call do |call|
+        long_key = 'x-grpc-test-echo-initial' # 24 bytes (> 23)
+        metadata = { long_key => %w[value-a value-b value-c] }
+        ops = {
+          GRPC::Core::CallOps::SEND_INITIAL_METADATA => metadata,
+          GRPC::Core::CallOps::SEND_CLOSE_FROM_CLIENT => nil
+        }
+        expect { call.run_batch(ops) }.to raise_error(GRPC::Core::CallError)
+      end
+    end
+  end
+
   def make_test_call
     call = @ch.create_call(nil, nil, 'phony_method', nil, deadline)
     yield call

data/src/ruby/spec/generic/server_interceptors_spec.rb

@@ -205,12 +205,9 @@ describe 'Server Interceptors' do
     end
 
     it 'should be invoked in FIFO order', server: true do
-      expect(interceptor).to receive(:request_response).ordered
-        .once.and_call_original
-      expect(interceptor2).to receive(:request_response).ordered
-        .once.and_call_original
-      expect(interceptor3).to receive(:request_response).ordered
-        .once.and_call_original
+      expect(interceptor).to receive(:request_response).ordered.once.and_call_original
+      expect(interceptor2).to receive(:request_response).ordered.once.and_call_original
+      expect(interceptor3).to receive(:request_response).ordered.once.and_call_original
 
       run_services_on_server(@server, services: [service]) do
         stub = build_insecure_stub(EchoStub)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grpc
 version: !ruby/object:Gem::Version
-  version: 1.83.1
+  version: 1.84.0.pre1
 platform: x86_64-linux-gnu
 authors:
 - gRPC Authors
@@ -147,14 +147,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.11.1
+        version: 1.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.11.1
+        version: 1.12.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -375,7 +375,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 3.3.22
 requirements: []
-rubygems_version: 4.0.19
+rubygems_version: 4.0.20
 specification_version: 4
 summary: GRPC system in Ruby
 test_files: