http-2 0.8.2 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 90034b82f924807e4b3cb874fceae2d8fde0c74d
-  data.tar.gz: afe0a06580910045bd50d8920f1aaf2e7f5a9a01
+  metadata.gz: b7732a1022ca5c6c097c2b575ef214e7118d2646
+  data.tar.gz: 6d9def6bbeb440c2070edb5bd3cc38313cd360fe
 SHA512:
-  metadata.gz: 5a272a1d3f656e7a94888d027b81cd42a462b05d3d2c94525d39d91f6d327a13a79dbfdd63f275237ca7fbf46d95694f682305e279e2803b9616922f1dbe7bcf
-  data.tar.gz: de83deb546e98b3819904aae7b9d66024ee49f72c363c071829461ced9e3c4641529404bb17e5631c6274f90f7fdb89574315d6153e45dc17298c060bd0b6674
+  metadata.gz: c166616d45fdf27d87514770287e409dcdc97a5f0e821fe4da970fd99b3487cbbe7b2679d99e055d3b04474eb92bf27cd8655509d5facc55315a351b1a1d2246
+  data.tar.gz: a6888d5a873081b38bd2245f7c6c1be6cf456b5a39b7adc595b8b693fcac31fc50f3bd876c6293f93c76ec37cdb924aa846562eff71215d5e4af60bf282e452f

data/.gitignore

@@ -3,11 +3,14 @@
 .bundle
 .config
 .yardoc
+.DS_Store
+.idea
 Gemfile.lock
 InstalledFiles
 _yardoc
 coverage
 doc/
+vendor/
 lib/bundler/man
 pkg
 rdoc

data/.rubocop.yml

@@ -1,9 +1,15 @@
 inherit_from: .rubocop_todo.yml
 
 AllCops:
+  TargetRubyVersion: 2.1
   DisplayCopNames: true
   Exclude:
-    - 'bin/*'
+    - 'bin/**'
+    - 'vendor/**/*'
+    - '**/huffman_statemachine.rb'
+
+Metrics/LineLength:
+  Max: 120
 
 Lint/EndAlignment:
   AlignWith: variable
@@ -14,5 +20,38 @@ Style/CaseIndentation:
 Style/IndentHash:
   EnforcedStyle: consistent
 
-Style/TrailingComma:
+Style/TrailingCommaInLiteral:
   EnforcedStyleForMultiline: comma
+
+Style/SpaceAroundOperators:
+  Enabled: false
+
+Style/ExtraSpacing:
+  Enabled: false
+
+Style/SignalException:
+  Enabled: false
+
+Style/FrozenStringLiteralComment:
+  Enabled: false
+
+Style/ParallelAssignment:
+  Enabled: false
+
+Style/ParenthesesAroundCondition:
+  Enabled: false
+
+Style/IfInsideElse:
+  Enabled: false
+
+Style/TrailingCommaInArguments:
+  Enabled: false
+
+Style/TrailingUnderscoreVariable:
+  Enabled: false
+
+Performance/TimesMap:
+  Enabled: false
+
+Performance/RedundantBlockCall:
+  Enabled: false

data/.rubocop_todo.yml

@@ -1,33 +1,35 @@
-# This configuration was generated by `rubocop --auto-gen-config`
-# on 2015-04-06 10:04:21 -0700 using RuboCop version 0.30.0.
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2016-06-09 10:57:54 -0400 using RuboCop version 0.40.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 23
+# Offense count: 24
 Metrics/AbcSize:
-  Max: 186
+  Max: 185
 
 # Offense count: 16
 Metrics/BlockNesting:
   Max: 5
 
-# Offense count: 7
+# Offense count: 5
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
-  Max: 331
+  Max: 325
 
 # Offense count: 12
 Metrics/CyclomaticComplexity:
   Max: 60
 
-# Offense count: 349
-# Configuration parameters: AllowURI, URISchemes.
+# Offense count: 9
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes.
+# URISchemes: http, https
 Metrics/LineLength:
-  Max: 231
+  Max: 108
 
-# Offense count: 27
+# Offense count: 29
 # Configuration parameters: CountComments.
 Metrics/MethodLength:
   Max: 134
@@ -41,6 +43,77 @@ Metrics/ParameterLists:
 Metrics/PerceivedComplexity:
   Max: 46
 
-# Offense count: 7
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: MaxKeyValuePairs.
+Performance/RedundantMerge:
+  Exclude:
+    - 'lib/http/2/server.rb'
+
+# Offense count: 4
 Style/Documentation:
-  Enabled: false
+  Exclude:
+    - 'spec/**/*'
+    - 'test/**/*'
+    - 'example/helper.rb'
+    - 'example/upgrade_server.rb'
+    - 'lib/tasks/generate_huffman_table.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/EmptyCaseCondition:
+  Exclude:
+    - 'example/upgrade_server.rb'
+
+# Offense count: 1
+# Configuration parameters: MinBodyLength.
+Style/GuardClause:
+  Exclude:
+    - 'lib/http/2/connection.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: SupportedStyles, IndentationWidth.
+# SupportedStyles: special_inside_parentheses, consistent, align_brackets
+Style/IndentArray:
+  EnforcedStyle: consistent
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: symmetrical, new_line, same_line
+Style/MultilineArrayBraceLayout:
+  Exclude:
+    - 'spec/compressor_spec.rb'
+
+# Offense count: 16
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: symmetrical, new_line, same_line
+Style/MultilineHashBraceLayout:
+  Exclude:
+    - 'spec/compressor_spec.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/MutableConstant:
+  Exclude:
+    - 'example/upgrade_server.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/RedundantSelf:
+  Exclude:
+    - 'lib/http/2/connection.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/UnneededInterpolation:
+  Exclude:
+    - 'spec/compressor_spec.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/ZeroLengthPredicate:
+  Exclude:
+    - 'lib/http/2/framer.rb'

data/Gemfile

@@ -4,14 +4,13 @@ gem 'rake'
 gem 'yard'
 
 group :test do
-  gem 'activesupport'
   gem 'autotest-standalone'
   gem 'coveralls', require: false
   gem 'pry'
   gem 'pry-byebug', platform: :mri
   gem 'rspec', '~> 3.4.0'
   gem 'rspec-autotest'
-  gem 'rubocop', '~> 0.30.0'
+  gem 'rubocop', '0.43.0'
 end
 
 gemspec

data/Guardfile

@@ -0,0 +1,19 @@
+
+guard :process, name: 'HTTP/2 Server', command: 'ruby example/server.rb', stop_signal: 'TERM' do
+  watch(%r{^example/(.+)\.rb$})
+  watch(%r{^lib/http/2/(.+)\.rb$})
+
+  watch('Gemfile.lock')
+end
+
+def h2spec
+  puts 'Starting H2 Spec'
+  sleep 0.7
+  system '~/go-workspace/bin/h2spec -p 8080 -o 1 -s 4.2'
+  puts "\n"
+end
+
+guard :shell, name: 'H2 Spec' do
+  watch(%r{^example/(.+)\.rb$})    { h2spec }
+  watch(%r{^lib/http/2/(.+)\.rb$}) { h2spec }
+end

data/Guardfile.h2spec

@@ -0,0 +1,12 @@
+def h2spec
+  puts "Starting H2 Spec"
+  sleep 0.7
+  system '~/go-workspace/bin/h2spec -p 8080 -o 1 -s 5.1'
+  puts "\n"
+end
+
+guard :shell, name:'H2 Spec' do
+  watch(%r{^example/(.+)\.rb$})    { h2spec }
+  watch(%r{^lib/http/2/(.+)\.rb$}) { h2spec }
+end
+

data/README.md

@@ -239,16 +239,16 @@ conn.on(:stream) do |stream|
 
   # fires when client terminates its request (i.e. request finished)
   stream.on(:half_close) do
-    head = {
-     ":status" => 200,
-     ":path"   => "/other_resource",
-     "content-type" => "text/plain"
-    }
+    promise_header = { ':method' => 'GET',
+                       ':authority' => 'localhost',
+                       ':scheme' => 'https',
+                       ':path' => "/other_resource" }
 
     # initiate server push stream
-    stream.promise(head) do |push|
-      push.headers({ ... })
-      push.data(...)
+    push_stream = nil
+    stream.promise(promise_header) do |push|
+      push.headers({...})
+      push_stream = push
     end
 
     # send response
@@ -259,8 +259,10 @@ conn.on(:stream) do |stream|
 
     # split response between multiple DATA frames
     stream.data(response_chunk, end_stream: false)
-    promise.data(payload)
     stream.data(last_chunk)
+    
+    # now send the previously promised data
+    push_stream.data(push_data)
   end
 end
 ```
@@ -279,6 +281,13 @@ The client can cancel any given push stream (via `.close`), or disable server pu
 ```ruby
 client.settings(streams: 0) # setting max limit to 0 disables server push
 ```
+### Specs
+
+To run specs:
+
+```ruby
+rake
+```
 
 ### License
 

data/Rakefile

@@ -2,10 +2,48 @@ require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 require 'rubocop/rake_task'
 require 'yard'
+require 'open3'
 require_relative 'lib/tasks/generate_huffman_table'
 
-RSpec::Core::RakeTask.new
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.exclude_pattern = './spec/hpack_test_spec.rb'
+end
+
+RSpec::Core::RakeTask.new(:hpack) do |t|
+  t.pattern = './spec/hpack_test_spec.rb'
+end
+
+task :h2spec do
+  if /darwin/ !~ RUBY_PLATFORM
+    abort "h2spec rake task currently only works on OSX.
+           Download other binaries from https://github.com/summerwind/h2spec/releases"
+  end
+
+  system 'ruby example/server.rb -p 9000 &', out: File::NULL
+  sleep 1
+
+  output = ''
+  Open3.popen2e('spec/h2spec/h2spec.darwin -p 9000 -o 1') do |_i, oe, _t|
+    oe.each do |l|
+      l.gsub!(/\e\[(\d+)(;\d+)*m/, '')
+
+      output << l
+      if l =~ /passed.*failed/
+        puts "\n#{l}"
+        break # suppress post-summary failure output
+      else
+        print '.'
+      end
+    end
+  end
+
+  File.write 'spec/h2spec/output/non_secure.txt', output
+
+  system 'kill `pgrep -f example/server.rb`'
+end
+
 RuboCop::RakeTask.new
 YARD::Rake::YardocTask.new
 
 task default: [:spec, :rubocop]
+task all: [:default, :hpack]

data/example/Gemfile

@@ -0,0 +1,3 @@
+source 'https://rubygems.org'
+
+gem 'http_parser.rb'

data/example/README.md

@@ -8,6 +8,10 @@ $> ruby server.rb
 $> ruby client.rb http://localhost:8080/                 # GET
 $> ruby client.rb http://localhost:8080/ -d 'some data'  # POST
 
+# Server push
+$> ruby server.rb --push
+$> ruby client.rb http://localhost:8080/                 # GET
+
 # TLS + NPN negotiation
 $> ruby server.rb --secure
 $> ruby client.rb https://localhost:8080/                # GET

data/example/client.rb

@@ -17,9 +17,11 @@ if uri.scheme == 'https'
   ctx = OpenSSL::SSL::SSLContext.new
   ctx.verify_mode = OpenSSL::SSL::VERIFY_NONE
 
-  ctx.npn_protocols = [DRAFT]
-  ctx.npn_select_cb = lambda do |protocols|
-    puts "NPN protocols supported by server: #{protocols}"
+  # For ALPN support, Ruby >= 2.3 and OpenSSL >= 1.0.2 are required
+
+  ctx.alpn_protocols = [DRAFT]
+  ctx.alpn_select_cb = lambda do |protocols|
+    puts "ALPN protocols supported by server: #{protocols}"
     DRAFT if protocols.include? DRAFT
   end
 
@@ -28,8 +30,8 @@ if uri.scheme == 'https'
   sock.hostname = uri.hostname
   sock.connect
 
-  if sock.npn_protocol != DRAFT
-    puts "Failed to negotiate #{DRAFT} via NPN"
+  if sock.alpn_protocol != DRAFT
+    puts "Failed to negotiate #{DRAFT} via ALPN"
     exit
   end
 else
@@ -37,6 +39,9 @@ else
 end
 
 conn = HTTP2::Client.new
+stream = conn.new_stream
+log = Logger.new(stream.id)
+
 conn.on(:frame) do |bytes|
   # puts "Sending bytes: #{bytes.unpack("H*").first}"
   sock.print bytes
@@ -49,9 +54,6 @@ conn.on(:frame_received) do |frame|
   puts "Received frame: #{frame.inspect}"
 end
 
-stream = conn.new_stream
-log = Logger.new(stream.id)
-
 conn.on(:promise) do |promise|
   promise.on(:headers) do |h|
     log.info "promise headers: #{h}"
@@ -68,7 +70,6 @@ end
 
 stream.on(:close) do
   log.info 'stream closed'
-  sock.close
 end
 
 stream.on(:half_close) do

data/example/helper.rb

@@ -6,7 +6,7 @@ require 'openssl'
 require 'http/2'
 require 'uri'
 
-DRAFT = 'h2'
+DRAFT = 'h2'.freeze
 
 class Logger
   def initialize(id)

data/example/keys/server.crt

@@ -0,0 +1,20 @@
+-----BEGIN CERTIFICATE-----
+MIIDLjCCAhYCCQDIZ/9hq/2pXjANBgkqhkiG9w0BAQUFADBZMQswCQYDVQQGEwJB
+VTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50ZXJuZXQgV2lkZ2l0
+cyBQdHkgTHRkMRIwEAYDVQQDEwlsb2NhbGhvc3QwHhcNMTYwNjA2MTk0MzI1WhcN
+MTcwNjA2MTk0MzI1WjBZMQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0
+ZTEhMB8GA1UEChMYSW50ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMRIwEAYDVQQDEwls
+b2NhbGhvc3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCjFXrWqtRZ
+EMOO/o6AxGbgDYMgg/7uxCFQJM5Z6C4II6D8V94FDyCd+J0LOK2hB+QUdFqpA1S9
+6RW2MvIwdvRt03RJMgbfcUF0+w4ZItv2xrW9waCfCmLSRDZgcSATacEF6u9p2Vs+
+o4J/cHacirSwjy4+m94CgkxtUFGtGcJaFqAZ6Cdj5WvQdJSiAI3x3gNC/UGA+5dL
+sp8+vwWx+/TMc6nDBmoRW3GHeG/NApQSh01w3wDv0FmUaFQlA5WPya/Js+CyuYh1
+miXbQJEjDnGGaJjnoyRAQpPrk72Jj+bnfOu9kxpzkuLJOsbaofRFkM+/Ar5U+bQz
+uU0ErQ8Ih8MPAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBACL8HkKjW8kWLlW4TE5K
+EcfsBad2Ah5ugTocJ/pLnr/YEo8uD91gECDtsuFTXul9n2M7U5jJmzbHZ63cjyC3
+lb1BxJxUL7aIyaL61IMMcIJMWhC9VGnFUshMDNVBhuRkKs/QvaMD5KefKN1E9I2M
+mZ72Yww0VihYwNOu3MTn8gUuy9eU6k/gTYPY7PJVh18QmR+Fs2MaaPp+bDwxiqML
+0o2I6+0ZsqM3vFtcUjxjRASV5s+JkM34pTWFwUOl7TZv1YsxCKSz4f0BXDImZEvU
+rwqFdlELp5WOG9LJsrszDRbf1wbFUsG1XXZpIBiWo3d6pOiIyRKrak1vKViNfYvI
+W30=
+-----END CERTIFICATE-----