remote_syslog_sender 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f790e1aed9473d0578f52ec35947fd78d1ab614670513efe787ec79ac4cf42b
-  data.tar.gz: f65e0ced0294ecbe1533fe04a4b2054e9f976230e74fd813ca30733dd2fbea9e
+  metadata.gz: 67116c7c062c29695d8dbb49e4e64e18d11e09cc2264f98df7068a5bd58526c4
+  data.tar.gz: fbc035c2bbec6efa7a996f1a7346a8ecb85681633cebdadae024dd0d91e54e97
 SHA512:
-  metadata.gz: ef23aa24b79470f4c0e5fb51be9b90e1801c1513b85494d7d63facd4abc47fc109f4e5a34366b96eaf45c729895a904f8767da718e53676a734e723c1ebd8720
-  data.tar.gz: 4128b921473bf397d423a08f99895a3e2d77a7c1dc158b9e9c8b3b2f85fe85b34bc983a18fbaaf1b492d0ecb8946d24853974659b90cc8af7569f114bbba69c1
+  metadata.gz: 8f421c3fe765bd079eb597c62917364405b3903db9a9b644bdcdcd2e7a862ef83e87ad38c9a4a1aa9a67a03a140dbf2807f3110d72dbfaf505c01fe205b13ce6
+  data.tar.gz: 85affc08e19f6126954f5b5bc2fc694360bb069019c3db77b0e6807d013351bedb0f5ecf901fd5450d84763b3a138308350a5da91b3dad1a340818b485e8d62f

data/lib/remote_syslog_sender/tcp_sender.rb

@@ -1,3 +1,4 @@
+require 'ipaddr'
 require 'socket'
 require 'syslog_protocol'
 require 'remote_syslog_sender/sender'
@@ -20,6 +21,8 @@ module RemoteSyslogSender
       @timeout_exception   = !!options[:timeout_exception]
       @exponential_backoff = !!options[:exponential_backoff]
 
+      @remote_hostname_is_ipaddr = IPAddr.new(remote_hostname) rescue false
+
       @mutex = Mutex.new
       @tcp_socket = nil
 
@@ -68,6 +71,7 @@ module RemoteSyslogSender
             context.verify_mode = @verify_mode if @verify_mode
 
             @socket = OpenSSL::SSL::SSLSocket.new(@tcp_socket, context)
+            @socket.hostname = @remote_hostname unless @remote_hostname_is_ipaddr
             @socket.connect
             if @verify_mode != OpenSSL::SSL::VERIFY_NONE
               @socket.post_connection_check(@remote_hostname)

data/remote_syslog_sender.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name              = 'remote_syslog_sender'
-  s.version           = '1.2.2'
+  s.version           = '1.2.3'
   s.summary     = "Message sender that sends directly to a remote syslog endpoint"
   s.description = "Message sender that sends directly to a remote syslog endpoint (Support UDP, TCP, TCP+TLS)"
 
@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency 'syslog_protocol'
 
-  s.add_development_dependency "bundler", ">= 1.6", "< 3.0"
+  s.add_development_dependency "bundler", ">= 1.6"
   s.add_development_dependency "rake"
   s.add_development_dependency "test-unit"
 end

data/test/helper.rb

@@ -10,3 +10,4 @@ end
 require 'remote_syslog_sender'
 
 require 'test/unit'
+require 'openssl'

data/test/test_remote_syslog_logger.rb

@@ -64,3 +64,73 @@ class TestRemoteSyslogSender < Test::Unit::TestCase
     assert_match(/This is the second line/, message)
   end
 end
+
+class TestRemoteSyslogTLSSender < Test::Unit::TestCase
+  def setup
+    @key = OpenSSL::PKey::RSA.new(2048)
+    @cert = OpenSSL::X509::Certificate.new
+    @cert.version = 2
+    @cert.serial = 1
+    @cert.subject = OpenSSL::X509::Name.parse("/CN=localhost")
+    @cert.issuer = @cert.subject
+    @cert.public_key = @key.public_key
+    @cert.not_before = Time.now
+    @cert.not_after = Time.now + 3600
+    @cert.sign(@key, OpenSSL::Digest::SHA256.new)
+
+    tcp_server = TCPServer.open('127.0.0.1', 0)
+    @tcp_server_port = tcp_server.addr[1]
+
+    ctx = OpenSSL::SSL::SSLContext.new
+    ctx.cert = @cert
+    ctx.key = @key
+
+    @ssl_server = OpenSSL::SSL::SSLServer.new(tcp_server, ctx)
+
+    @tcp_server_wait_thread = Thread.start do
+      @ssl_server.accept
+    end
+  end
+
+  def teardown
+    @ssl_server.close
+  end
+
+  def test_sender_tls_no_sni
+    @sender = RemoteSyslogSender::TcpSender.new(
+      '127.0.0.1',
+      @tcp_server_port,
+      tls: true,
+      verify_mode: OpenSSL::SSL::VERIFY_NONE
+    )
+
+    @sender.write "This is a test"
+    sock = @tcp_server_wait_thread.value
+
+    message, _ = *sock.read_nonblock(256)
+    assert_match(/This is a test/, message)
+
+    # When remote hostname is an IP address, SNI hostname is not set.
+    socket = @sender.instance_variable_get(:@socket)
+    assert_nil(socket.hostname)
+  end
+
+  def test_sender_tls_sni
+    @sender = RemoteSyslogSender::TcpSender.new(
+      'localhost',
+      @tcp_server_port,
+      tls: true,
+      verify_mode: OpenSSL::SSL::VERIFY_NONE
+    )
+
+    @sender.write "This is a test"
+    sock = @tcp_server_wait_thread.value
+
+    message, _ = *sock.read_nonblock(256)
+    assert_match(/This is a test/, message)
+
+    # When remote hostname is a hostname, SNI hostname is not set.
+    socket = @sender.instance_variable_get(:@socket)
+    assert_equal('localhost', socket.hostname)
+  end
+end

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: remote_syslog_sender
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Tomohiro Hashidate
 - Eric Lindvall
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-07 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: syslog_protocol
@@ -32,9 +31,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.6'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,9 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.6'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -95,7 +88,6 @@ files:
 homepage: https://github.com/reproio/remote_syslog_logger
 licenses: []
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -110,8 +102,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
-signing_key:
+rubygems_version: 4.0.3
 specification_version: 4
 summary: Message sender that sends directly to a remote syslog endpoint
 test_files: