wip peeraddr raises error

puma · Oct 6, 2019 · 1817773 · 1817773
1 parent 0bbb495
commit 1817773
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/lib/puma/reactor.rb b/lib/puma/reactor.rb
@@ -237,7 +237,7 @@ def run_internal
                 ssl_socket = c.io
                 begin
                   addr = ssl_socket.peeraddr.last
-                rescue IOError
+                rescue IOError, Errno::EINVAL
                   addr = "<unknown>"
                 end
 

diff --git a/test/test_puma_server_ssl.rb b/test/test_puma_server_ssl.rb
@@ -199,6 +199,18 @@ def test_tls_v1_1_rejection
       assert_match(msg, @events.error.message) if @events.error
     end
   end
+
+  def test_peeraddr_raises
+    port = UniquePort.call
+
+    s = TCPServer.new("127.0.0.1", port)
+
+    def s.peeraddr
+      raise Errno::EINVAL
+    end
+
+    assert_raises { s.peeraddr }
+  end
 end unless DISABLE_SSL
 
 # client-side TLS authentication tests