h2 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c5e8c20010d6ac2131cb0b47f4ba1634c435729
-  data.tar.gz: 0a0e54c4cab667253cdeb6e099d26d4505fe3484
+  metadata.gz: dfd3251c0bd00b269688a2e87b54e009be339aff
+  data.tar.gz: ec1799dd72604f8e089bd7be923f1f5083ec8c2d
 SHA512:
-  metadata.gz: f2b0df60085bc8193e8f9e2504c5bf25bb65cfbcc9926ada856df1641ac43d08b101c9f6badbc57afe331a6d255e308929269cc35a6e32113b7a470e4edd074b
-  data.tar.gz: 6c74fdda38d4bd78014cde927acbf11e7273fe309fd054110ee501acc08e068aa757841cf4a5c3119ee1af9ee988fc673c26c74b8d75e923cbd583eeefa64653
+  metadata.gz: e99a4e6d24b280b3ca9b60189e067c4382f585723a8aae28185e5e85423d0f2ad11cb5d8758082bc323f51a9fcffbdbaa522c12552d1777d27c37c93994ddb62
+  data.tar.gz: cb8952f4b441870ee7b8fc3d1dd839c74fd653ce8a7b41eaf1d0c4b0a84fb4eab687c995f2505b1fe3ccaa5fb6134f8739ba8fbad8fbd419f838ef9e0c0ca16b

data/.travis.yml

@@ -6,3 +6,4 @@ rvm:
   - 2.3.2
   - 2.3.3
   - 2.4.0
+  - 2.4.1

data/CHANGELOG.md

@@ -1,6 +1,11 @@
 h2 changelog
 ============
 
+### 0.3.1 13 may 2017
+
+* `servername` should not be set on client socket when IP address (#1)
+* add ALPN/NPN checks for minimum version of underlying OpenSSL library
+
 ### 0.3.0 10 may 2017
 
 * update http-2 gem version >= 0.8.4 for window update state fix

data/lib/h2/client.rb

@@ -1,4 +1,5 @@
 require 'openssl'
+require 'resolv'
 require 'h2/client/tcp_socket'
 
 module H2
@@ -13,8 +14,10 @@ module H2
       :promise
     ]
 
-    ALPN_PROTOCOLS = ['h2']
-    DEFAULT_MAXLEN = 4096
+    ALPN_OPENSSL_MIN_VERSION = 0x10002001
+    ALPN_PROTOCOLS           = ['h2']
+    DEFAULT_MAXLEN           = 4096
+    RE_IP_ADDR               = Regexp.union Resolv::IPv4::Regex, Resolv::IPv6::Regex
 
     attr_accessor :last_stream
     attr_reader :client, :reader, :scheme, :socket, :streams
@@ -221,7 +224,7 @@ module H2
     def tls_socket socket
       socket = OpenSSL::SSL::SSLSocket.new socket, create_ssl_context
       socket.sync_close = true
-      socket.hostname = @addr
+      socket.hostname = @addr unless RE_IP_ADDR.match(@addr)
       socket.connect
       socket
     end
@@ -230,7 +233,6 @@ module H2
     #
     def create_ssl_context
       ctx                = OpenSSL::SSL::SSLContext.new
-      ctx.alpn_protocols = ALPN_PROTOCOLS
       ctx.ca_file        = @tls[:ca_file] if @tls[:ca_file]
       ctx.ca_path        = @tls[:ca_path] if @tls[:ca_path]
       ctx.ciphers        = @tls[:ciphers] || OpenSSL::SSL::SSLContext::DEFAULT_PARAMS[:ciphers]
@@ -238,8 +240,19 @@ module H2
       ctx.ssl_version    = :TLSv1_2
       ctx.verify_mode    = @tls[:verify_mode] || ( OpenSSL::SSL::VERIFY_PEER |
                                                    OpenSSL::SSL::VERIFY_FAIL_IF_NO_PEER_CERT )
+      set_ssl_context_protocols ctx
       ctx
     end
 
+    if OpenSSL::OPENSSL_VERSION_NUMBER >= ALPN_OPENSSL_MIN_VERSION
+      def set_ssl_context_protocols ctx
+        ctx.alpn_protocols = ALPN_PROTOCOLS
+      end
+    else
+      def set_ssl_context_protocols ctx
+        ctx.npn_protocols = ALPN_PROTOCOLS
+      end
+    end
+
   end
 end

data/lib/h2/version.rb

@@ -1,3 +1,3 @@
 module H2
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: h2
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Kenichi Nakamura
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-10 00:00:00.000000000 Z
+date: 2017-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http-2
@@ -132,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: an http/2 client based on http-2 and modern ruby