use url-safe (RFC 4648) base64 decode

igrigorik · Dec 27, 2015 · 9579e7d · 9579e7d
1 parent a5a081c
commit 9579e7d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/example/upgrade_server.rb b/example/upgrade_server.rb
@@ -1,7 +1,6 @@
 require_relative 'helper'
 require 'http_parser'
 require 'base64'
-require 'pry'
 
 options = { port: 8080 }
 OptionParser.new do |opts|
@@ -51,7 +50,7 @@ def <<(data)
 
       @sock.write UPGRADE_RESPONSE
 
-      settings = headers['HTTP2-Settings']
+      settings = headers['http2-settings']
       request = {
         ':scheme'    => 'http',
         ':method'    => @parser.http_method,

diff --git a/lib/http/2/framer.rb b/lib/http/2/framer.rb
@@ -370,10 +370,9 @@ def parse(buf)
         # NOTE: frame[:length] might not match the number of frame[:payload]
         # because unknown extensions are ignored.
         frame[:payload] = []
-        # TODO: is this a valid check? It fails on HTTP2-Upgrade data
-        # unless frame[:length] % 6 == 0
-        #   fail ProtocolError, 'Invalid settings payload length'
-        # end
+        unless frame[:length] % 6 == 0
+          fail ProtocolError, 'Invalid settings payload length'
+        end
 
         if frame[:stream] != 0
           fail ProtocolError, "Invalid stream ID (#{frame[:stream]})"

diff --git a/lib/http/2/server.rb b/lib/http/2/server.rb
@@ -71,9 +71,9 @@ def upgrade(settings, headers, body)
       receive(CONNECTION_PREFACE_MAGIC)
 
       # Process received HTTP2-Settings payload
-      buf = HTTP2::Buffer.new Base64.decode64(settings)
+      buf = HTTP2::Buffer.new Base64.urlsafe_decode64(settings)
       buf.prepend(@framer.common_header(
-        length: buf.length,
+        length: buf.bytesize,
         type: :settings,
         stream: 0,
         flags: []