http2 0.0.28 → 0.0.33

data/lib/http2/base_request.rb

@@ -0,0 +1,22 @@
+class Http2::BaseRequest
+  attr_reader :http2, :args, :debug
+
+  VALID_ARGUMENTS_POST = [:post, :url, :default_headers, :headers, :json, :method, :cookies, :on_content, :content_type].freeze
+
+  def initialize(http2, args)
+    @http2 = http2
+    @args = http2.parse_args(args)
+    @debug = http2.debug
+    @nl = http2.nl
+
+    @args.each_key do |key|
+      raise "Invalid key: '#{key}'." unless VALID_ARGUMENTS_POST.include?(key)
+    end
+
+    @conn = @http2.connection
+  end
+
+  def path
+    @args.fetch(:url)
+  end
+end

data/{include → lib/http2}/connection.rb

@@ -1,17 +1,20 @@
 class Http2::Connection
   def initialize(http2)
-    @http2, @debug, @args = http2, http2.debug, http2.args
+    @http2 = http2
+    @debug = http2.debug
+    @args = http2.args
+    @nl = http2.nl
     reconnect
   end
 
   def destroy
-    @sock.close if @sock and !@sock.closed?
+    @sock.close if @sock && !@sock.closed?
     @sock = nil
 
-    @sock_plain.close if @sock_plain and !@sock_plain.closed?
+    @sock_plain.close if @sock_plain && !@sock_plain.closed?
     @sock_plain = nil
 
-    @sock_ssl.close if @sock_ssl and !@sock_ssl.closed?
+    @sock_ssl.close if @sock_ssl && !@sock_ssl.closed?
     @sock_ssl = nil
   end
 
@@ -23,10 +26,6 @@ class Http2::Connection
     @sock.read(length)
   end
 
-  def close
-    @sock.close
-  end
-
   def closed?
     @sock.closed?
   end
@@ -34,6 +33,7 @@ class Http2::Connection
   def sock_write(str)
     str = str.to_s
     return if str.empty?
+
     count = @sock.write(str)
     raise "Couldnt write to socket: '#{count}', '#{str}'." if count <= 0
   end
@@ -46,10 +46,13 @@ class Http2::Connection
   def write(str)
     reconnect unless socket_working?
 
+    puts "Http2: Writing: #{str}" if @debug
+
     begin
       raise Errno::EPIPE, "The socket is closed." if !@sock || @sock.closed?
+
       sock_write(str)
-    rescue Errno::EPIPE #this can also be thrown by puts.
+    rescue Errno::EPIPE # this can also be thrown by puts.
       reconnect
       sock_write(str)
     end
@@ -61,14 +64,16 @@ class Http2::Connection
   def reconnect
     puts "Http2: Reconnect." if @debug
 
-    #Open connection.
-    if @args[:proxy] && @args[:ssl]
-      connect_proxy_ssl
-    elsif @args[:proxy]
-      connect_proxy
+    # Open connection.
+    if @args[:proxy]
+      if @args[:proxy][:connect]
+        connect_proxy_connect
+      else
+        connect_proxy
+      end
     else
-      print "Http2: Opening socket connection to '#{@args[:host]}:#{@args[:port]}'.\n" if @debug
-      @sock_plain = TCPSocket.new(@args[:host], @args[:port].to_i)
+      puts "Http2: Opening socket connection to '#{@http2.host}:#{@http2.port}'." if @debug
+      @sock_plain = TCPSocket.new(@http2.host, @http2.port)
     end
 
     if @args[:ssl]
@@ -82,7 +87,7 @@ class Http2::Connection
   #===Examples
   # puts "Socket is working." if http.socket_working?
   def socket_working?
-    return false if !@sock or @sock.closed?
+    return false if !@sock || @sock.closed?
 
     if @keepalive_timeout && @request_last
       between = Time.now.to_i - @request_last.to_i
@@ -92,7 +97,7 @@ class Http2::Connection
       end
     end
 
-    return true
+    true
   end
 
   # Closes the current connection if any.
@@ -102,23 +107,40 @@ class Http2::Connection
     @sock_plain.close if @sock_plain && !@sock_plain.closed?
   end
 
-  def connect_proxy_ssl
-    puts "Http2: Initializing proxy stuff." if @debug
+  def connect_proxy_connect
+    puts "Http2: Initializing proxy connect to '#{@args[:host]}:#{@args[:port]}' through proxy '#{@args[:proxy][:host]}:#{@args[:proxy][:port]}'." if @debug
     @sock_plain = TCPSocket.new(@args[:proxy][:host], @args[:proxy][:port])
 
-    @sock_plain.write("CONNECT #{@args[:host]}:#{@args[:port]} HTTP/1.0#{@nl}")
-    @sock_plain.write("User-Agent: #{@uagent}#{@nl}")
+    connect = "CONNECT #{@args[:host]}:#{@args[:port]} HTTP/1.1#{@nl}"
+    puts "Http2: Sending connect: #{connect}" if @debug
+    @sock_plain.write(connect)
+
+    headers = {
+      "Host" => "#{@args[:host]}:#{@args[:port]}"
+    }
 
     if @args[:proxy][:user] && @args[:proxy][:passwd]
-      credential = ["#{@args[:proxy][:user]}:#{@args[:proxy][:passwd]}"].pack("m")
-      credential.delete!("\r\n")
-      @sock_plain.write("Proxy-Authorization: Basic #{credential}#{@nl}")
+      headers["Proxy-Authorization"] = "Basic #{["#{@args[:proxy][:user]}:#{@args[:proxy][:passwd]}"].pack("m").chomp}"
+    end
+
+    headers.each do |key, value|
+      header = "#{key}: #{value}"
+      puts "Http2: Sending header to proxy: #{header}" if @debug
+      @sock_plain.write("#{header}#{@nl}")
     end
 
     @sock_plain.write(@nl)
 
-    res = @sock_plain.gets
-    raise res if res.to_s.downcase != "http/1.0 200 connection established#{@nl}"
+    res = @sock_plain.gets.to_s
+    raise "Couldn't connect through proxy: #{res}" unless res.match(/^http\/1\.(0|1)\s+200/i)
+
+    @sock_plain.gets
+
+    @proxy_connect = true
+  end
+
+  def proxy_connect?
+    @proxy_connect
   end
 
   def connect_proxy
@@ -131,9 +153,15 @@ class Http2::Connection
     require "openssl" unless ::Kernel.const_defined?(:OpenSSL)
 
     ssl_context = OpenSSL::SSL::SSLContext.new
-    #ssl_context.verify_mode = OpenSSL::SSL::VERIFY_PEER
+
+    if @args[:ssl_skip_verify]
+      ssl_context.verify_mode = OpenSSL::SSL::VERIFY_NONE
+    else
+      ssl_context.verify_mode = OpenSSL::SSL::VERIFY_PEER
+    end
 
     @sock_ssl = OpenSSL::SSL::SSLSocket.new(@sock_plain, ssl_context)
+    @sock_ssl.hostname = @http2.host
     @sock_ssl.sync_close = true
     @sock_ssl.connect
 

data/lib/http2/cookie.rb

@@ -0,0 +1,22 @@
+class Http2::Cookie
+  attr_reader :name, :value, :path, :expires_raw
+
+  def initialize(args)
+    @name = args[:name]
+    @value = args[:value]
+    @path = args[:path]
+    @expires_raw = args[:expires]
+  end
+
+  def inspect
+    "#<Http2::Cookie name=#{@name} value=#{@value} path=#{@path}>"
+  end
+
+  def to_s
+    inspect
+  end
+
+  def expires
+    @expires ||= Time.parse(@expires_raw) if @expires_raw
+  end
+end

data/lib/http2/errors.rb

@@ -0,0 +1,18 @@
+# This class holds various classes for error-handeling.
+class Http2::Errors
+  class BaseError < RuntimeError
+    attr_accessor :response
+  end
+
+  class Noaccess < BaseError; end
+
+  class Internalserver < BaseError; end
+
+  class Notfound < BaseError; end
+
+  class Badrequest < BaseError; end
+
+  class Unauthorized < BaseError; end
+
+  class UnsupportedMediaType < BaseError; end
+end

data/lib/http2/get_request.rb

@@ -0,0 +1,33 @@
+class Http2::GetRequest < Http2::BaseRequest
+  def execute
+    @http2.mutex.synchronize do
+      @http2.connection.write(headers_string)
+
+      puts "Http2: Reading response." if @debug
+      resp = @http2.read_response(self, @args)
+
+      puts "Http2: Done with get request." if @debug
+      return resp
+    end
+  end
+
+  def headers_string
+    unless @header_str
+      @header_str = "#{method} /#{@args[:url]} HTTP/1.1#{@nl}"
+      @header_str << @http2.header_str(@http2.default_headers(@args))
+      @header_str << @nl
+    end
+
+    @header_str
+  end
+
+private
+
+  def method
+    if @args[:method]
+      @args[:method].to_s.upcase
+    else
+      "GET"
+    end
+  end
+end

data/{include → lib/http2}/post_data_generator.rb

@@ -1,6 +1,7 @@
 class Http2::PostDataGenerator
   def initialize(pdata, args = {})
-    @pdata, @args = pdata, args
+    @pdata = pdata
+    @args = args
   end
 
   def generate
@@ -14,7 +15,7 @@ class Http2::PostDataGenerator
       return @pdata.to_s
     end
 
-    return praw
+    praw
   end
 
 private
@@ -22,7 +23,7 @@ private
   def generate_for_hash(hash)
     praw = ""
 
-    @pdata.each do |key, val|
+    hash.each do |key, val|
       praw << "&" if praw != ""
       key = "#{@args[:orig_key]}[#{key}]" if @args[:orig_key]
       praw << generate_key_value(key, val)
@@ -35,7 +36,7 @@ private
     praw = ""
 
     count = 0
-    @pdata.each do |val|
+    array.each do |val|
       praw << "&" if praw != ""
 
       if @args[:orig_key]
@@ -53,10 +54,10 @@ private
 
   def generate_key_value(key, value)
     if value.is_a?(Hash) || value.is_a?(Array)
-      return ::Http2::PostDataGenerator.new(value, :orig_key => key).generate
+      ::Http2::PostDataGenerator.new(value, orig_key: key).generate
     else
       data = ::Http2::PostDataGenerator.new(value).generate
-      return "#{Http2::Utils.urlenc(key)}=#{Http2::Utils.urlenc(data)}"
+      "#{Http2::Utils.urlenc(key)}=#{Http2::Utils.urlenc(data)}"
     end
   end
 end

data/{include → lib/http2}/post_multipart_request.rb

@@ -1,42 +1,44 @@
 require "tempfile"
 
-class Http2::PostMultipartRequest
+class Http2::PostMultipartRequest < Http2::BaseRequest
+  attr_reader :headers_string
+
   def initialize(http2, *args)
-    @http2, @nl, @args = http2, http2.nl, http2.parse_args(*args)
+    super
+
     @phash = @args[:post].clone
     @http2.autostate_set_on_post_hash(phash) if @http2.autostate
     @boundary = rand(36**50).to_s(36)
-    @conn = @http2.connection
   end
 
   def execute
-    generate_raw(@phash) do |helper, praw|
-      puts "Http2: Header string: #{header_string}" if @debug
-
+    generate_raw(@phash) do |_helper, praw|
       @http2.mutex.synchronize do
-        @conn.write(header_string(praw))
+        @conn.write(header_string_with_raw_post(praw))
 
         praw.rewind
         praw.each_line do |data|
           @conn.sock_write(data)
         end
 
-        return @http2.read_response(@args)
+        return @http2.read_response(self, @args)
       end
     end
   end
 
 private
 
-  def header_string(praw)
-    header_str = "POST /#{@args[:url]} HTTP/1.1#{@nl}"
-    header_str << @http2.header_str(@http2.default_headers(@args).merge(
+  def header_string_with_raw_post(praw)
+    @headers_string = "POST /#{@args[:url]} HTTP/1.1#{@nl}"
+
+    headers = @http2.default_headers(@args).merge(
       "Content-Type" => "multipart/form-data; boundary=#{@boundary}",
       "Content-Length" => praw.size
-    ), @args)
-    header_str << @nl
+    )
 
-    return header_str
+    @headers_string << @http2.header_str(headers)
+    @headers_string << @nl
+    @headers_string
   end
 
   def generate_raw(phash)
@@ -54,13 +56,11 @@ private
 
   def read_file(path, praw)
     File.open(path, "r") do |fp|
-      begin
-        while data = fp.sysread(4096)
-          praw << data
-        end
-      rescue EOFError
-        # Happens when done.
+      while (data = fp.sysread(4096))
+        praw << data
       end
+    rescue EOFError
+      # Happens when done.
     end
   end
 

data/{include → lib/http2}/post_request.rb

@@ -1,13 +1,13 @@
-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)
+class Http2::PostRequest < Http2::BaseRequest
+  def headers_string
+    unless @headers_string
+      @headers_string = "#{method} /#{@args[:url]} HTTP/1.1#{@nl}"
+      @headers_string << @http2.header_str(headers)
+      @headers_string << @nl
+      @headers_string << @data
     end
 
-    @http2, @args, @debug, @nl = http2, http2.parse_args(args), http2.debug, http2.nl
-    @conn = @http2.connection
+    @headers_string
   end
 
   def execute
@@ -15,10 +15,9 @@ class Http2::PostRequest
 
     @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)
+      @conn.write(headers_string)
+      return @http2.read_response(self, @args)
     end
   end
 
@@ -36,7 +35,7 @@ private
     if @args[:content_type]
       @args[:content_type]
     elsif @args[:json]
-      content_type = "application/json"
+      "application/json"
     else
       "application/x-www-form-urlencoded"
     end
@@ -56,16 +55,12 @@ private
   end
 
   def headers
-    headers_hash = {"Content-Length" => @data.bytesize, "Content-Type" => content_type}
+    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
+    headers_hash["Accept"] = "application/json" if @args[:json] && !headers_hash["Accept"]
+    headers_hash
   end
 end