From f85f885191915ca8458f76a3295a66c0fa0363d8 Mon Sep 17 00:00:00 2001 From: Helge Rausch Date: Fri, 29 Jan 2016 11:43:38 +0100 Subject: [PATCH] Don't force explicit configuration of CA cert location In order to allow openssl to figure out the location of CA certificates on its own, don't apply the `ssl_ca_cert` configuration parameter if it is not explicitly set. --- .../src/main/resources/ruby/api_client.mustache | 3 ++- samples/client/petstore/ruby/lib/petstore/api_client.rb | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/swagger-codegen/src/main/resources/ruby/api_client.mustache b/modules/swagger-codegen/src/main/resources/ruby/api_client.mustache index e3f54f10994..2ad1491ee1a 100644 --- a/modules/swagger-codegen/src/main/resources/ruby/api_client.mustache +++ b/modules/swagger-codegen/src/main/resources/ruby/api_client.mustache @@ -75,10 +75,11 @@ module {{moduleName}} :ssl_verifypeer => @config.verify_ssl, :sslcert => @config.cert_file, :sslkey => @config.key_file, - :cainfo => @config.ssl_ca_cert, :verbose => @config.debugging } + req_opts[:cainfo] = @config.ssl_ca_cert if @config.ssl_ca_cert + if [:post, :patch, :put, :delete].include?(http_method) req_body = build_request_body(header_params, form_params, opts[:body]) req_opts.update :body => req_body diff --git a/samples/client/petstore/ruby/lib/petstore/api_client.rb b/samples/client/petstore/ruby/lib/petstore/api_client.rb index e00be7176b0..09d5777f5e8 100644 --- a/samples/client/petstore/ruby/lib/petstore/api_client.rb +++ b/samples/client/petstore/ruby/lib/petstore/api_client.rb @@ -75,10 +75,11 @@ module Petstore :ssl_verifypeer => @config.verify_ssl, :sslcert => @config.cert_file, :sslkey => @config.key_file, - :cainfo => @config.ssl_ca_cert, :verbose => @config.debugging } + req_opts[:cainfo] = @config.ssl_ca_cert if @config.ssl_ca_cert + if [:post, :patch, :put, :delete].include?(http_method) req_body = build_request_body(header_params, form_params, opts[:body]) req_opts.update :body => req_body