http-2-next 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8cac338f26bfa2ca51f886570bbc356633d54723f64f0d1ba34907b0e91f3ce5
-  data.tar.gz: dd327e341f813616855c6900106c994e23a3c689c9d6079856be7be25bc39bbb
+  metadata.gz: 875825ebea128127df77ca3dda0f1a541b1a04329fd210c1e833e188b61fb6fd
+  data.tar.gz: 257aa0e0296ecb15eeb819aa828d0b80f09e88890c7888f886741bf84da58c81
 SHA512:
-  metadata.gz: 7681ff7d121ad5e916f925eadf8d804913db66268bf1a97ded833ffe6b312ef7f2d731c08ed7ecf5e600c196fc331ba2f0643ae0f5e12cf9ff0591f9ab78d338
-  data.tar.gz: eec8fa81a714882f23192b463f47ec2dfea4c4ea85400d9c59d3b14849a66d00ab22a8d405c4ec656e6e77f6ebae6b36707a87be04b66c1b65a0a31bb1a3cef0
+  metadata.gz: 56d023be9199b34436061f3f24c47a2a79914d86dbcf45535ae46983a905c6cf84160263a5576ad79e59319ba2470d1c0e6e5e55eb4e8f90a7a46b0d2530a2fb
+  data.tar.gz: db01e4e809a622908eacdb55f4c9b739f34afa8cb825aa63be9ef3b2aadb4c1e8d02ee2a5459d5492abc27df82108be5fd60e66ba77402a836aa12a7be64c7e7

data/lib/http/2/next/client.rb

@@ -47,10 +47,13 @@ module HTTP2Next
 
     # sends the preface and initializes the first stream in half-closed state
     def upgrade
+      @h2c_upgrade = :start
       raise ProtocolError unless @stream_id == 1
 
       send_connection_preface
-      new_stream(state: :half_closed_local)
+      stream = new_stream(state: :half_closed_local)
+      @h2c_upgrade = :finished
+      stream
     end
 
     # Emit the connection preface if not yet

data/lib/http/2/next/connection.rb

@@ -478,6 +478,12 @@ module HTTP2Next
           # An ALTSVC frame on stream 0 with empty (length 0) "Origin"
           # information is invalid and MUST be ignored.
           emit(frame[:type], frame) if frame[:origin] && !frame[:origin].empty?
+        when :origin
+          return if @h2c_upgrade || !frame[:flags].empty?
+
+          frame[:payload].each do |origin|
+            emit(frame[:type], origin)
+          end
         when :blocked
           emit(frame[:type], frame)
         else

data/lib/http/2/next/framer.rb

@@ -30,7 +30,8 @@ module HTTP2Next
       goaway: 0x7,
       window_update: 0x8,
       continuation: 0x9,
-      altsvc: 0xa
+      altsvc: 0xa,
+      origin: 0xc
     }.freeze
 
     FRAME_TYPES_WITH_PADDING = %i[data headers push_promise].freeze
@@ -59,7 +60,13 @@ module HTTP2Next
       goaway: {},
       window_update: {},
       continuation: { end_headers: 2 },
-      altsvc: {}
+      altsvc: {},
+      origin: {
+        reserved: 1,
+        reserved2: 2,
+        reserved3: 4,
+        reserved4: 8
+      }
     }.each_value(&:freeze).freeze
 
     # Default settings as defined by the spec
@@ -285,6 +292,14 @@ module HTTP2Next
           bytes << frame[:origin]
           length += frame[:origin].bytesize
         end
+
+      when :origin
+        frame[:payload].each do |origin|
+          bytes << [origin.bytesize].pack(UINT16)
+          bytes << origin
+          length += 2 + origin.bytesize
+        end
+
       end
 
       # Process padding.
@@ -419,6 +434,16 @@ module HTTP2Next
         frame[:host] = payload.read(len) if len > 0
 
         frame[:origin] = payload.read(payload.size) unless payload.empty?
+
+      when :origin
+        origins = []
+
+        until payload.empty?
+          len = payload.read(2).unpack(UINT16).first
+          origins << payload.read(len)
+        end
+
+        frame[:payload] = origins
         # else # Unknown frame type is explicitly allowed
       end
 

data/lib/http/2/next/server.rb

@@ -22,6 +22,8 @@ module HTTP2Next
   #     end
   #
   class Server < Connection
+    attr_reader :origin_set
+
     # Initialize new HTTP 2.0 server object.
     def initialize(**settings)
       @stream_id    = 2
@@ -30,6 +32,9 @@ module HTTP2Next
       @local_role   = :server
       @remote_role  = :client
 
+      @origin_set = []
+      @origins_sent = true
+
       super
     end
 
@@ -112,8 +117,20 @@ module HTTP2Next
       @state = :waiting_magic
     end
 
+    def origin_set=(origins)
+      @origin_set = Array(origins).map(&:to_s)
+      @origins_sent = @origin_set.empty?
+    end
+
     private
 
+    def connection_settings(frame)
+      super
+      return unless frame[:flags].include?(:ack) && !@origins_sent
+
+      send(type: :origin, stream: 0, payload: @origin_set)
+    end
+
     def verify_pseudo_headers(frame, mandatory_headers = REQUEST_MANDATORY_HEADERS)
       super(frame, mandatory_headers)
     end

data/lib/http/2/next/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module HTTP2Next
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: http-2-next
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Tiago Cardoso
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-22 00:00:00.000000000 Z
+date: 2019-12-14 00:00:00.000000000 Z
 dependencies: []
 description: Pure-ruby HTTP 2.0 protocol implementation
 email: