grpc 1.30.0 → 1.31.1

data/src/ruby/spec/pb/codegen/grpc/testing/same_ruby_package_service_name.proto

@@ -0,0 +1,29 @@
+// Copyright 2020 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.
+
+syntax = "proto3";
+
+package other_name;
+
+option ruby_package = "SameName2";
+
+service SameName2 {
+  rpc Health(Request) returns (Status);
+}
+
+message Status {
+  string msg = 1;
+}
+
+message Request {}

data/src/ruby/spec/pb/codegen/package_option_spec.rb

@@ -27,7 +27,9 @@ describe 'Code Generation Options' do
   end
 
   it 'should generate and respect Ruby style package options' do
-    with_protos(%w[grpc/testing/package_options_ruby_style.proto grpc/testing/package_options_import.proto]) do
+    with_protos(['grpc/testing/package_options_ruby_style.proto',
+                 'grpc/testing/package_options_import.proto',
+                 'grpc/testing/package_options_import2.proto']) do
       expect { RPC::Test::New::Package::Options::AnotherTestService::Service }.to raise_error(NameError)
       expect(require('grpc/testing/package_options_ruby_style_services_pb')).to be_truthy
       expect { RPC::Test::New::Package::Options::AnotherTestService::Service }.to_not raise_error
@@ -38,12 +40,34 @@ describe 'Code Generation Options' do
       expect(services[:GetTest].output).to eq(RPC::Test::New::Package::Options::AnotherTestResponse)
       expect(services[:OtherTest].input).to eq(A::Other::Thing)
       expect(services[:OtherTest].output).to eq(A::Other::Thing)
+      expect(services[:PackageTest].input).to eq(A::Other::Thing)
+      expect(services[:PackageTest].output).to eq(B::Other::Foo::Bar)
       expect(services[:FooTest].input).to eq(RPC::Test::New::Package::Options::Foo)
       expect(services[:FooTest].output).to eq(RPC::Test::New::Package::Options::Foo)
       expect(services[:NestedMessageTest].input).to eq(RPC::Test::New::Package::Options::Foo)
       expect(services[:NestedMessageTest].output).to eq(RPC::Test::New::Package::Options::Bar::Baz)
     end
   end
+
+  it 'should generate when package and service has same name' do
+    with_protos(['grpc/testing/same_package_service_name.proto']) do
+      expect { SameName::SameName::Service }.to raise_error(NameError)
+      expect(require('grpc/testing/same_package_service_name_services_pb')).to be_truthy
+      expect { SameName::SameName::Service }.to_not raise_error
+      expect { SameName::Request }.to_not raise_error
+      expect { SameName::Status }.to_not raise_error
+    end
+  end
+
+  it 'should generate when ruby_package and service has same name' do
+    with_protos(['grpc/testing/same_ruby_package_service_name.proto']) do
+      expect { SameName2::SameName2::Service }.to raise_error(NameError)
+      expect(require('grpc/testing/same_ruby_package_service_name_services_pb')).to be_truthy
+      expect { SameName2::SameName2::Service }.to_not raise_error
+      expect { SameName2::Request }.to_not raise_error
+      expect { SameName2::Status }.to_not raise_error
+    end
+  end
 end
 
 def with_protos(file_paths)

data/src/ruby/spec/support/services.rb

@@ -17,12 +17,18 @@ require 'spec_helper'
 
 # A test message
 class EchoMsg
-  def self.marshal(_o)
-    ''
+  attr_reader :msg
+
+  def initialize(msg: '')
+    @msg = msg
   end
 
-  def self.unmarshal(_o)
-    EchoMsg.new
+  def self.marshal(o)
+    o.msg
+  end
+
+  def self.unmarshal(msg)
+    EchoMsg.new(msg: msg)
   end
 end
 

data/src/ruby/spec/user_agent_spec.rb

@@ -0,0 +1,74 @@
+# Copyright 2020 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.
+
+require 'spec_helper'
+
+# a test service that checks the cert of its peer
+class UserAgentEchoService
+  include GRPC::GenericService
+  rpc :an_rpc, EchoMsg, EchoMsg
+
+  def an_rpc(_req, call)
+    EchoMsg.new(msg: call.metadata['user-agent'])
+  end
+end
+
+UserAgentEchoServiceStub = UserAgentEchoService.rpc_stub_class
+
+describe 'user agent' do
+  RpcServer = GRPC::RpcServer
+
+  before(:all) do
+    server_opts = {
+      poll_period: 1
+    }
+    @srv = new_rpc_server_for_testing(**server_opts)
+    @port = @srv.add_http2_port('0.0.0.0:0', :this_port_is_insecure)
+    @srv.handle(UserAgentEchoService)
+    @srv_thd = Thread.new { @srv.run }
+    @srv.wait_till_running
+  end
+
+  after(:all) do
+    expect(@srv.stopped?).to be(false)
+    @srv.stop
+    @srv_thd.join
+  end
+
+  it 'client sends expected user agent' do
+    stub = UserAgentEchoServiceStub.new("localhost:#{@port}",
+                                        :this_channel_is_insecure,
+                                        {})
+    response = stub.an_rpc(EchoMsg.new)
+    expected_user_agent_prefix = "grpc-ruby/#{GRPC::VERSION}"
+    expect(response.msg.start_with?(expected_user_agent_prefix)).to be true
+    # check that the expected user agent prefix occurs in the real user agent exactly once
+    expect(response.msg.split(expected_user_agent_prefix).size).to eq 2
+  end
+
+  it 'user agent header does not grow when the same channel args hash is used across multiple stubs' do
+    shared_channel_args_hash = {}
+    10.times do
+      stub = UserAgentEchoServiceStub.new("localhost:#{@port}",
+                                          :this_channel_is_insecure,
+                                          channel_args: shared_channel_args_hash)
+      response = stub.an_rpc(EchoMsg.new)
+      puts "got echo response: #{response.msg}"
+      expected_user_agent_prefix = "grpc-ruby/#{GRPC::VERSION}"
+      expect(response.msg.start_with?(expected_user_agent_prefix)).to be true
+      # check that the expected user agent prefix occurs in the real user agent exactly once
+      expect(response.msg.split(expected_user_agent_prefix).size).to eq 2
+    end
+  end
+end

data/third_party/boringssl-with-bazel/err_data.c

@@ -199,36 +199,39 @@ const uint32_t kOpenSSLReasonValues[] = {
     0x2c34b058,
     0x2c353073,
     0x2c35b085,
-    0x2c363098,
+    0x2c3630b5,
     0x2c36832d,
-    0x2c3730a5,
-    0x2c37b0b7,
-    0x2c3830dc,
-    0x2c38b0f3,
-    0x2c393101,
-    0x2c39b111,
-    0x2c3a3123,
-    0x2c3ab137,
-    0x2c3b3148,
-    0x2c3bb167,
+    0x2c3730c2,
+    0x2c37b0ee,
+    0x2c383113,
+    0x2c38b12a,
+    0x2c393148,
+    0x2c39b158,
+    0x2c3a316a,
+    0x2c3ab17e,
+    0x2c3b318f,
+    0x2c3bb1ae,
     0x2c3c12fa,
     0x2c3c9310,
-    0x2c3d317b,
+    0x2c3d31c2,
     0x2c3d9329,
-    0x2c3e3198,
-    0x2c3eb1a6,
-    0x2c3f31be,
-    0x2c3fb1d6,
-    0x2c403200,
+    0x2c3e31df,
+    0x2c3eb1ed,
+    0x2c3f3205,
+    0x2c3fb21d,
+    0x2c403247,
     0x2c4091fb,
-    0x2c413211,
-    0x2c41b224,
+    0x2c413258,
+    0x2c41b26b,
     0x2c4211c1,
-    0x2c42b235,
+    0x2c42b27c,
     0x2c430722,
-    0x2c43b159,
-    0x2c4430ca,
-    0x2c44b1e3,
+    0x2c43b1a0,
+    0x2c443101,
+    0x2c44b22a,
+    0x2c453098,
+    0x2c45b0d4,
+    0x2c463138,
     0x30320000,
     0x30328015,
     0x3033001f,
@@ -654,69 +657,69 @@ const uint32_t kOpenSSLReasonValues[] = {
     0x4c411557,
     0x4c4193da,
     0x4c421543,
-    0x50323247,
-    0x5032b256,
-    0x50333261,
-    0x5033b271,
-    0x5034328a,
-    0x5034b2a4,
-    0x503532b2,
-    0x5035b2c8,
-    0x503632da,
-    0x5036b2f0,
-    0x50373309,
-    0x5037b31c,
-    0x50383334,
-    0x5038b345,
-    0x5039335a,
-    0x5039b36e,
-    0x503a338e,
-    0x503ab3a4,
-    0x503b33bc,
-    0x503bb3ce,
-    0x503c33ea,
-    0x503cb401,
-    0x503d341a,
-    0x503db430,
-    0x503e343d,
-    0x503eb453,
-    0x503f3465,
+    0x5032328e,
+    0x5032b29d,
+    0x503332a8,
+    0x5033b2b8,
+    0x503432d1,
+    0x5034b2eb,
+    0x503532f9,
+    0x5035b30f,
+    0x50363321,
+    0x5036b337,
+    0x50373350,
+    0x5037b363,
+    0x5038337b,
+    0x5038b38c,
+    0x503933a1,
+    0x5039b3b5,
+    0x503a33d5,
+    0x503ab3eb,
+    0x503b3403,
+    0x503bb415,
+    0x503c3431,
+    0x503cb448,
+    0x503d3461,
+    0x503db477,
+    0x503e3484,
+    0x503eb49a,
+    0x503f34ac,
     0x503f837b,
-    0x50403478,
-    0x5040b488,
-    0x504134a2,
-    0x5041b4b1,
-    0x504234cb,
-    0x5042b4e8,
-    0x504334f8,
-    0x5043b508,
-    0x50443517,
+    0x504034bf,
+    0x5040b4cf,
+    0x504134e9,
+    0x5041b4f8,
+    0x50423512,
+    0x5042b52f,
+    0x5043353f,
+    0x5043b54f,
+    0x5044355e,
     0x50448431,
-    0x5045352b,
-    0x5045b549,
-    0x5046355c,
-    0x5046b572,
-    0x50473584,
-    0x5047b599,
-    0x504835bf,
-    0x5048b5cd,
-    0x504935e0,
-    0x5049b5f5,
-    0x504a360b,
-    0x504ab61b,
-    0x504b363b,
-    0x504bb64e,
-    0x504c3671,
-    0x504cb69f,
-    0x504d36b1,
-    0x504db6ce,
-    0x504e36e9,
-    0x504eb705,
-    0x504f3717,
-    0x504fb72e,
-    0x5050373d,
+    0x50453572,
+    0x5045b590,
+    0x504635a3,
+    0x5046b5b9,
+    0x504735cb,
+    0x5047b5e0,
+    0x50483606,
+    0x5048b614,
+    0x50493627,
+    0x5049b63c,
+    0x504a3652,
+    0x504ab662,
+    0x504b3682,
+    0x504bb695,
+    0x504c36b8,
+    0x504cb6e6,
+    0x504d36f8,
+    0x504db715,
+    0x504e3730,
+    0x504eb74c,
+    0x504f375e,
+    0x504fb775,
+    0x50503784,
     0x505086f1,
-    0x50513750,
+    0x50513797,
     0x58320f65,
     0x68320f27,
     0x68328c7f,
@@ -1352,12 +1355,15 @@ const char kOpenSSLReasonStringData[] =
     "CERT_ALREADY_IN_HASH_TABLE\0"
     "CRL_ALREADY_DELTA\0"
     "CRL_VERIFY_FAILURE\0"
+    "DELTA_CRL_WITHOUT_CRL_NUMBER\0"
     "IDP_MISMATCH\0"
     "INVALID_DIRECTORY\0"
+    "INVALID_FIELD_FOR_VERSION\0"
     "INVALID_FIELD_NAME\0"
     "INVALID_PARAMETER\0"
     "INVALID_PSS_PARAMETERS\0"
     "INVALID_TRUST\0"
+    "INVALID_VERSION\0"
     "ISSUER_MISMATCH\0"
     "KEY_TYPE_MISMATCH\0"
     "KEY_VALUES_MISMATCH\0"

data/third_party/boringssl-with-bazel/src/crypto/asn1/a_bitstr.c

@@ -70,7 +70,7 @@ int ASN1_BIT_STRING_set(ASN1_BIT_STRING *x, unsigned char *d, int len)
     return M_ASN1_BIT_STRING_set(x, d, len);
 }
 
-int i2c_ASN1_BIT_STRING(ASN1_BIT_STRING *a, unsigned char **pp)
+int i2c_ASN1_BIT_STRING(const ASN1_BIT_STRING *a, unsigned char **pp)
 {
     int ret, j, bits, len;
     unsigned char *p, *d;
@@ -233,7 +233,7 @@ int ASN1_BIT_STRING_set_bit(ASN1_BIT_STRING *a, int n, int value)
     return (1);
 }
 
-int ASN1_BIT_STRING_get_bit(ASN1_BIT_STRING *a, int n)
+int ASN1_BIT_STRING_get_bit(const ASN1_BIT_STRING *a, int n)
 {
     int w, v;
 
@@ -250,7 +250,7 @@ int ASN1_BIT_STRING_get_bit(ASN1_BIT_STRING *a, int n)
  * which is not specified in 'flags', 1 otherwise.
  * 'len' is the length of 'flags'.
  */
-int ASN1_BIT_STRING_check(ASN1_BIT_STRING *a,
+int ASN1_BIT_STRING_check(const ASN1_BIT_STRING *a,
                           unsigned char *flags, int flags_len)
 {
     int i, ok;

data/third_party/boringssl-with-bazel/src/crypto/asn1/a_enum.c

@@ -108,7 +108,7 @@ int ASN1_ENUMERATED_set(ASN1_ENUMERATED *a, long v)
     return (1);
 }
 
-long ASN1_ENUMERATED_get(ASN1_ENUMERATED *a)
+long ASN1_ENUMERATED_get(const ASN1_ENUMERATED *a)
 {
     int neg = 0, i;
 
@@ -147,7 +147,7 @@ long ASN1_ENUMERATED_get(ASN1_ENUMERATED *a)
     return r;
 }
 
-ASN1_ENUMERATED *BN_to_ASN1_ENUMERATED(BIGNUM *bn, ASN1_ENUMERATED *ai)
+ASN1_ENUMERATED *BN_to_ASN1_ENUMERATED(const BIGNUM *bn, ASN1_ENUMERATED *ai)
 {
     ASN1_ENUMERATED *ret;
     int len, j;
@@ -183,7 +183,7 @@ ASN1_ENUMERATED *BN_to_ASN1_ENUMERATED(BIGNUM *bn, ASN1_ENUMERATED *ai)
     return (NULL);
 }
 
-BIGNUM *ASN1_ENUMERATED_to_BN(ASN1_ENUMERATED *ai, BIGNUM *bn)
+BIGNUM *ASN1_ENUMERATED_to_BN(const ASN1_ENUMERATED *ai, BIGNUM *bn)
 {
     BIGNUM *ret;
 

data/third_party/boringssl-with-bazel/src/crypto/asn1/a_int.c

@@ -115,7 +115,7 @@ int ASN1_INTEGER_cmp(const ASN1_INTEGER *x, const ASN1_INTEGER *y)
  * followed by optional zeros isn't padded.
  */
 
-int i2c_ASN1_INTEGER(ASN1_INTEGER *a, unsigned char **pp)
+int i2c_ASN1_INTEGER(const ASN1_INTEGER *a, unsigned char **pp)
 {
     int pad = 0, ret, i, neg;
     unsigned char *p, *n, pb = 0;

data/third_party/boringssl-with-bazel/src/crypto/asn1/a_object.c

@@ -66,7 +66,7 @@
 #include "../internal.h"
 
 
-int i2d_ASN1_OBJECT(ASN1_OBJECT *a, unsigned char **pp)
+int i2d_ASN1_OBJECT(const ASN1_OBJECT *a, unsigned char **pp)
 {
     unsigned char *p, *allocated = NULL;
     int objsize;
@@ -98,12 +98,12 @@ int i2d_ASN1_OBJECT(ASN1_OBJECT *a, unsigned char **pp)
     return objsize;
 }
 
-int i2t_ASN1_OBJECT(char *buf, int buf_len, ASN1_OBJECT *a)
+int i2t_ASN1_OBJECT(char *buf, int buf_len, const ASN1_OBJECT *a)
 {
     return OBJ_obj2txt(buf, buf_len, a, 0);
 }
 
-int i2a_ASN1_OBJECT(BIO *bp, ASN1_OBJECT *a)
+int i2a_ASN1_OBJECT(BIO *bp, const ASN1_OBJECT *a)
 {
     char buf[80], *p = buf;
     int i;