http2 0.0.24 → 0.0.25

data/include/post_request.rb

@@ -0,0 +1,71 @@
+class Http2::PostRequest
+  VALID_ARGUMENTS_POST = [:post, :url, :default_headers, :headers, :json, :method, :cookies, :on_content, :content_type]
+
+  def initialize(http2, args)
+    args.each do |key, val|
+      raise "Invalid key: '#{key}'." unless VALID_ARGUMENTS_POST.include?(key)
+    end
+
+    @http2, @args, @debug, @nl = http2, http2.parse_args(args), http2.debug, http2.nl
+    @conn = @http2.connection
+  end
+
+  def execute
+    @data = raw_data
+
+    @http2.mutex.synchronize do
+      puts "Http2: Doing post." if @debug
+      puts "Http2: Header str: #{header_str}" if @debug
+
+      @conn.write(header_string)
+      return @http2.read_response(@args)
+    end
+  end
+
+private
+
+  def method
+    if @args[:method]
+      @args[:method].to_s.upcase
+    else
+      "POST"
+    end
+  end
+
+  def content_type
+    if @args[:content_type]
+      @args[:content_type]
+    elsif @args[:json]
+      content_type = "application/json"
+    else
+      "application/x-www-form-urlencoded"
+    end
+  end
+
+  def raw_data
+    if @args[:json]
+      require "json" unless ::Kernel.const_defined?(:JSON)
+      @args[:json].to_json
+    elsif @args[:post].is_a?(String)
+      @args[:post]
+    else
+      phash = @args[:post] ? @args[:post].clone : {}
+      @http2.autostate_set_on_post_hash(phash) if @http2.args[:autostate]
+      ::Http2::PostDataGenerator.new(phash).generate
+    end
+  end
+
+  def headers
+    headers_hash = {"Content-Length" => @data.bytesize, "Content-Type" => content_type}
+    headers_hash.merge! @http2.default_headers(@args)
+  end
+
+  def header_string
+    header_str = "#{method} /#{@args[:url]} HTTP/1.1#{@nl}"
+    header_str << @http2.header_str(headers, @args)
+    header_str << @nl
+    header_str << @data
+
+    header_str
+  end
+end

data/include/response.rb

@@ -2,22 +2,23 @@
 class Http2::Response
   #All the data the response contains. Headers, body, cookies, requested URL and more.
   attr_reader :args
-  
+  attr_accessor :body, :charset, :code, :content_type, :http_version
+
   #This method should not be called manually.
   def initialize(args = {})
     @args = args
     @args[:headers] = {} if !@args.key?(:headers)
-    @args[:body] = "" if !@args.key?(:body)
+    @body = args[:body] || ""
     @debug = @args[:debug]
   end
-  
+
   #Returns headers given from the host for the result.
   #===Examples
   # headers_hash = res.headers
   def headers
     return @args[:headers]
   end
-  
+
   #Returns a certain header by name or false if not found.
   #===Examples
   # val = res.header("content-type")
@@ -25,7 +26,7 @@ class Http2::Response
     return false if !@args[:headers].key?(key)
     return @args[:headers][key].first.to_s
   end
-  
+
   #Returns true if a header of the given string exists.
   #===Examples
   # print "No content-type was given." if !http.header?("content-type")
@@ -33,40 +34,11 @@ class Http2::Response
     return true if @args[:headers].key?(key) and @args[:headers][key].first.to_s.length > 0
     return false
   end
-  
-  #Returns the code of the result (200, 404, 500 etc).
-  #===Examples
-  # print "An internal error occurred." if res.code.to_i == 500
-  def code
-    return @args[:code]
-  end
-  
-  #Returns the HTTP-version of the result.
-  #===Examples
-  # print "We are using HTTP 1.1 and should support keep-alive." if res.http_version.to_s == "1.1"
-  def http_version
-    return @args[:http_version]
-  end
-  
-  #Returns the complete body of the result as a string.
-  #===Examples
-  # print "Looks like we caught the end of it as well?" if res.body.to_s.downcase.index("</html>") != nil
-  def body
-    return @args[:body]
-  end
-  
-  #Returns the charset of the result.
-  def charset
-    return @args[:charset]
-  end
-  
-  #Returns the content-type of the result as a string.
-  #===Examples
-  # print "This body can be printed - its just plain text!" if http.contenttype == "text/plain"
-  def contenttype
-    return @args[:contenttype]
+
+  def content_length
+    header("content-length").to_i if header?("content-length")
   end
-  
+
   #Returns the requested URL as a string.
   #===Examples
   # res.requested_url #=> "?show=status&action=getstatus"
@@ -74,28 +46,28 @@ class Http2::Response
     raise "URL could not be detected." if !@args[:request_args][:url]
     return @args[:request_args][:url]
   end
-  
+
   # Checks the data that has been sat on the object and raises various exceptions, if it does not validate somehow.
   def validate!
     puts "Http2: Validating response length." if @debug
     validate_body_versus_content_length!
   end
-  
+
   private
-  
+
   # Checks that the length of the body is the same as the given content-length if given.
   def validate_body_versus_content_length!
     unless self.header?("content-length")
       puts "Http2: No content length given - skipping length validation." if @debug
       return nil
     end
-    
+
     content_length = self.header("content-length").to_i
-    body_length = @args[:body].to_s.bytesize
-    
+    body_length = @body.bytesize
+
     puts "Http2: Body length: #{body_length}" if @debug
     puts "Http2: Content length: #{content_length}" if @debug
-    
+
     raise "Body does not match the given content-length: '#{body_length}', '#{content_length}'." if body_length != content_length
   end
 end

data/include/response_reader.rb

@@ -6,23 +6,23 @@ class Http2::ResponseReader
     @transfer_encoding = nil
     @response = Http2::Response.new(:request_args => args, :debug => @debug)
     @rec_count = 0
-    @args, @debug, @http2, @sock = args[:args], args[:debug], args[:http2], args[:sock]
+    @args, @debug, @http2, @sock = args[:args], args[:http2].debug, args[:http2], args[:sock]
     @nl = @http2.nl
+    @conn = @http2.connection
 
     read_headers
-    read_body
+    read_body if @length == nil || @length > 0
     finish
   end
 
   def read_headers
     loop do
-      line = @sock.gets
+      line = @conn.gets
       check_line_read(line)
 
       if line == "\n" || line == "\r\n" || line == @nl
         puts "Http2: Changing mode to body!" if @debug
         raise "No headers was given at all? Possibly corrupt state after last request?" if @response.headers.empty?
-        break if @length == 0
         @mode = "body"
         @http2.on_content_call(@args, @nl)
         break
@@ -34,71 +34,76 @@ class Http2::ResponseReader
 
   def read_body
     loop do
-      if @length && @length > 0
-        line = @sock.read(@length)
+      if @length
+        line = @conn.read(@length)
         raise "Expected to get #{@length} of bytes but got #{line.bytesize}" if @length != line.bytesize
       else
-        line = @sock.gets
+        line = @conn.gets
       end
 
       check_line_read(line)
       stat = parse_body(line)
-      break if stat == "break"
-      next if stat == "next"
+      break if stat == :break
+      next if stat == :next
     end
   end
 
   def finish
     #Check if we should reconnect based on keep-alive-max.
-    if @keepalive_max == 1 or @connection == "close"
-      @sock.close unless @sock.closed?
+    if @keepalive_max == 1 || @connection == "close"
+      @conn.close unless @conn.closed?
     end
 
     # Validate that the response is as it should be.
     puts "Http2: Validating response." if @debug
 
-    if !@response.args[:code]
-      raise "No status-code was received from the server. Headers: '#{@response.headers}' Body: '#{resp.args[:body]}'."
+    if !@response.code
+      raise "No status-code was received from the server. Headers: '#{@response.headers}' Body: '#{resp.body}'."
     end
 
     @response.validate!
     check_and_decode
-    check_and_follow_redirect
+    @http2.autostate_register(@response) if @http2.args[:autostate]
     handle_errors
 
-    @http2.autostate_register(@response) if @http2.args[:autostate]
+    if response = check_and_follow_redirect
+      @response = response
+    end
   end
 
 private
 
   def check_and_follow_redirect
-    if (@response.args[:code].to_s == "302" || @response.args[:code].to_s == "307") && @response.header?("location") && (!@http2.args.key?(:follow_redirects) || @http2.args[:follow_redirects])
-      uri = URI.parse(@response.header("location"))
-      url = uri.path
-      url << "?#{uri.query}" if uri.query.to_s.length > 0
-
-      args = {:host => uri.host}
-      args[:ssl] = true if uri.scheme == "https"
-      args[:port] = uri.port if uri.port
+    if (@response.code == "302" || @response.code == "307") && @response.header?("location") && @http2.args[:follow_redirects]
+      url, args = url_and_args_from_location
 
-      puts "Http2: Redirecting from location-header to '#{url}'." if @debug
-
-      if !args[:host] or args[:host] == @args[:host]
-        return self.get(url)
+      if !args[:host] || args[:host] == @args[:host]
+        return @http2.get(url)
       else
-        http = Http2.new(args)
-        return http.get(url)
+        ::Http2.new(args).get(url)
       end
     end
   end
 
+  def url_and_args_from_location
+    uri = URI.parse(@response.header("location"))
+    url = uri.path
+    url << "?#{uri.query}" if uri.query.to_s.length > 0
+
+    args = {host: uri.host}
+    args[:ssl] = true if uri.scheme == "https"
+    args[:port] = uri.port if uri.port
+
+    return [url, args]
+  end
+
   def check_and_decode
     # Check if the content is gzip-encoded - if so: decode it!
     if @encoding == "gzip"
       puts "Http2: Decoding GZip." if @debug
       require "zlib"
       require "stringio"
-      io = StringIO.new(@response.args[:body])
+      io = StringIO.new(@response.body)
       gz = Zlib::GzipReader.new(io)
       untrusted_str = gz.read
 
@@ -108,21 +113,21 @@ private
         valid_string = untrusted_str.force_encoding("UTF-8").encode("UTF-8", :invalid => :replace, :replace => "").encode("UTF-8")
       end
 
-      @response.args[:body] = valid_string
+      @response.body = valid_string
     end
   end
 
   def handle_errors
-    if @http2.raise_errors
-      if @response.args[:code].to_i == 500
-        err = Http2::Errors::Internalserver.new("A internal server error occurred")
-      elsif @response.args[:code].to_i == 403
-        err = Http2::Errors::Noaccess.new("No access")
-      elsif @response.args[:code].to_i == 400
-        err = Http2::Errors::Badrequest.new("Bad request")
-      elsif @response.args[:code].to_i == 404
-        err = Http2::Errors::Notfound.new("Not found")
-      end
+    return unless  @http2.raise_errors
+
+    if @response.code == "500"
+      err = Http2::Errors::Internalserver.new("A internal server error occurred")
+    elsif @response.code == "403"
+      err = Http2::Errors::Noaccess.new("No access")
+    elsif @response.code == "400"
+      err = Http2::Errors::Badrequest.new("Bad request")
+    elsif @response.code == "404"
+      err = Http2::Errors::Notfound.new("Not found")
     end
 
     if err
@@ -135,8 +140,7 @@ private
     if line
       @rec_count += line.length
     elsif !line && @rec_count <= 0
-      @sock = nil
-      raise Errno::ECONNABORTED, "Server closed the connection before being able to read anything (KeepAliveMax: '#{@keepalive_max}', Connection: '#{@connection}', PID: '#{Process.pid}')."
+      raise Errno::ECONNABORTED, "Server closed the connection before being able to read anything (KeepAliveMax: '#{@http2.keepalive_max}', Connection: '#{@connection}', PID: '#{Process.pid}')."
     end
   end
 
@@ -147,26 +151,25 @@ private
   end
 
   def parse_keep_alive(keep_alive_line)
-    if ka_max = keep_alive_line.match(/max=(\d+)/)
-      @keepalive_max = ka_max[1].to_i
-      print "Http2: Keepalive-max set to: '#{@keepalive_max}'.\n" if @debug
-    end
-
-    if ka_timeout = keep_alive_line.match(/timeout=(\d+)/)
-      @keepalive_timeout = ka_timeout[1].to_i
-      print "Http2: Keepalive-timeout set to: '#{@keepalive_timeout}'.\n" if @debug
+    keep_alive_line.scan(/([a-z]+)=(\d+)/) do |match|
+      if match[0] == "timeout"
+        puts "Http2: Keepalive-max set to: '#{@keepalive_max}'." if @debug
+        @http2.keepalive_timeout = match[1].to_i
+      elsif match[0] == "max"
+        puts "Http2: Keepalive-timeout set to: '#{@keepalive_timeout}'." if @debug
+        @http2.keepalive_max = match[1].to_i
+      end
     end
   end
 
   def parse_content_type(content_type_line)
     if match_charset = content_type_line.match(/\s*;\s*charset=(.+)/i)
       @charset = match_charset[1].downcase
-      @response.args[:charset] = @charset
+      @response.charset = @charset
       content_type_line.gsub!(match_charset[0], "")
     end
 
-    @ctype = content_type_line
-    @response.args[:contenttype] = @content_type_line
+    @response.content_type = @content_type_line
   end
 
   #Parse a header-line and saves it on the object.
@@ -174,56 +177,57 @@ private
   # http.parse_header("Content-Type: text/html\r\n")
   def parse_header(line)
     if match = line.match(/^(.+?):\s*(.+)#{@nl}$/)
-      key = match[1].to_s.downcase
-
-      parse_cookie(match[2]) if key == "set-cookie"
-      parse_keep_alive(match[2]) if key == "keep-alive"
-      parse_content_type(match[2]) if key == "content-type"
-
-      if key == "connection"
-        @connection = match[2].to_s.downcase
-      elsif key == "content-encoding"
-        @encoding = match[2].to_s.downcase
-        puts "Http2: Setting encoding to #{@encoding}" if @debug
-      elsif key == "content-length"
-        @length = match[2].to_i
-      elsif key == "transfer-encoding"
-        @transfer_encoding = match[2].to_s.downcase.strip
-      end
+      key = match[1].downcase
+      set_header_special_values(key, match[2])
+      parse_normal_header(line, key, match[1], match[2])
+    elsif match = line.match(/^HTTP\/([\d\.]+)\s+(\d+)\s+(.+)$/)
+      @response.code = match[2]
+      @response.http_version = match[1]
+      @http2.on_content_call(@args, line)
+    else
+      raise "Could not understand header string: '#{line}'."
+    end
+  end
 
-      puts "Http2: Parsed header: #{match[1]}: #{match[2]}" if @debug
-      @response.headers[key] = [] unless @response.headers.key?(key)
-      @response.headers[key] << match[2]
+  def set_header_special_values(key, value)
+    parse_cookie(value) if key == "set-cookie"
+    parse_keep_alive(value) if key == "keep-alive"
+    parse_content_type(value) if key == "content-type"
+
+    if key == "connection"
+      @connection = value.downcase
+    elsif key == "content-encoding"
+      @encoding = value.downcase
+      puts "Http2: Setting encoding to #{@encoding}" if @debug
+    elsif key == "content-length"
+      @length = value.to_i
+    elsif key == "transfer-encoding"
+      @transfer_encoding = value.downcase.strip
+    end
+  end
 
-      if key != "transfer-encoding" && key != "content-length" && key != "connection" && key != "keep-alive"
-        @http2.on_content_call(@args, line)
-      end
-    elsif match = line.match(/^HTTP\/([\d\.]+)\s+(\d+)\s+(.+)$/)
-      @response.args[:code] = match[2]
-      @response.args[:http_version] = match[1]
+  def parse_normal_header(line, key, orig_key, value)
+    puts "Http2: Parsed header: #{orig_key}: #{value}" if @debug
+    @response.headers[key] = [] unless @response.headers.key?(key)
+    @response.headers[key] << value
 
+    if key != "transfer-encoding" && key != "content-length" && key != "connection" && key != "keep-alive"
       @http2.on_content_call(@args, line)
-    else
-      raise "Could not understand header string: '#{line}'.\n\n#{@sock.read(409600)}"
     end
   end
 
   #Parses the body based on given headers and saves it to the result-object.
   # http.parse_body(str)
   def parse_body(line)
-    if @response.args[:http_version] = "1.1"
-      return "break" if @length == 0
+    return :break if @length == 0
 
-      if @transfer_encoding == "chunked"
-        parse_body_chunked(line)
-      else
-        puts "Http2: Adding #{line.to_s.bytesize} to the body." if @debug
-        @response.args[:body] << line.to_s
-        @http2.on_content_call(@args, line)
-        return "break" if @response.header?("content-length") && @response.args[:body].length >= @response.header("content-length").to_i
-      end
+    if @transfer_encoding == "chunked"
+      return parse_body_chunked(line)
     else
-      raise "Dont know how to read HTTP version: '#{@resp.args[:http_version]}'."
+      puts "Http2: Adding #{line.to_s.bytesize} to the body." if @debug
+      @response.body << line
+      @http2.on_content_call(@args, line)
+      return :break if @response.content_length && @response.body.length >= @response.content_length
     end
   end
 
@@ -231,16 +235,16 @@ private
     len = line.strip.hex
 
     if len > 0
-      read = @sock.read(len)
-      return "break" if read == "" or (read == "\n" || read == "\r\n")
-      @response.args[:body] << read
+      read = @conn.read(len)
+      return :break if read == "" || read == "\n" || read == "\r\n"
+      @response.body << read
       @http2.on_content_call(@args, read)
     end
 
-    nl = @sock.gets
+    nl = @conn.gets
     if len == 0
       if nl == "\n" || nl == "\r\n"
-        return "break"
+        return :break
       else
         raise "Dont know what to do :'-("
       end