tp2 0.11.1 → 0.11.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 73f9fa79516460ea4b1c6226f2969fe0af0b394df2beec87263d94c75d9879f0
-  data.tar.gz: bbb636a70ec52928b55841ba8476ae59bdf585c4e15ae5d469b2e936787933ce
+  metadata.gz: ecbdd5f3235d547f97643c111afbdb42c0b069f43d832ad6b3ee4f316104b2f7
+  data.tar.gz: 00eccb47e2b984880081e3b38bf1839cdfd0849bd8840e54efeaa04f264d5587
 SHA512:
-  metadata.gz: 06f10bbc8c78af9a5cb0ff9dae4058a865144499f825b4d0a5496dab772ee9987750f0afed2eed392104007739498ae8e00a81bd27719910531cb03a6e283acc
-  data.tar.gz: e9dfa954dc71eaea7a6953c9896eaf40ed0ebd1c69883f482fc007a29c650382297b359308bdf27b0ea881c117828bda13b3fc457ebb306e0e16489f7f52ab30
+  metadata.gz: f69b124309ee1582c3197c2fead077e01d7b5782985ca86caae097bbe70fb0d7ca7d6cb2d85f174a7676e1a048476092aac39292183a52fbeef10eea70b29a18
+  data.tar.gz: 7f3f7c6c883e04f884ecefee2b4e3d58bf90f56ae21419dff78f897f16b7f2cb019af513ef96680d8969276ee54c0e67f636d3f828ddb966456c361527cb1222

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+# Version 0.11.3 2025-06-16
+
+- Rename HTTP1Adapter to HTTP1Connection
+- Refactor HTTP error handling
+
+# Version 0.11.2 2025-06-15
+
+- Improve URI calculation for logging
+
 # Version 0.11.1 2025-06-15
 
 - Add more info to log

data/TODO.md

@@ -1,4 +1,7 @@
 - Add failing tests for request bombs (requests with lots of bytes)
+
+- add test for `ProtocolError` handling
+
 - Add limits for:
   - total request size (pre body)
   - line size

data/lib/tp2/{http1_adapter.rb → http1_connection.rb}

@@ -4,7 +4,7 @@ require 'qeweney'
 require 'stringio'
 
 module TP2
-  class HTTP1Adapter
+  class HTTP1Connection
     attr_reader :fd
 
     def initialize(machine, fd, opts, &app)
@@ -26,24 +26,16 @@ module TP2
         persist = serve_request
         break if !persist
       end
-    rescue Exception => e
-      case e
-      when UM::Terminate
-        # we're done
-      when SystemCallError
-        @opts[:log]&.log("Encountered #{e.class}, closing connection")
-      when ProtocolError
-        @opts[:log]&.log("Protocol error (#{e.message}), closing connection")
-      when StandardError
-        @opts[:log]&.log("Unhandled exception #{e.class}: #{e.message}, closing connection")
-        @opts[:log]&.log(e.backtrace.join("\n"))
-      else
-        raise
-      end
+    rescue UM::Terminate, SystemCallError
+      # we're done, we don't care about broken socket
+    rescue StandardError
+      @opts[:log]&.log("Unhandled exception #{e.class}: #{e.message}, closing connection")
+      @opts[:log]&.log(e.backtrace.join("\n"))
     ensure
       @machine.close_async(@fd)
     end
 
+    # Returns true if connection should persist
     def serve_request
       headers = parse_headers
       return false if !headers
@@ -51,6 +43,9 @@ module TP2
       request = Qeweney::Request.new(headers, self)
       @app.call(request)
       persist_connection?(headers)
+    rescue ProtocolError
+      # TODO: add hook for testing protocol errors
+      return false
     end
 
     def get_body(req)
@@ -208,17 +203,28 @@ module TP2
       return if !@opts[:log]
       
       request_headers = request.headers
+      uri = full_uri(request_headers)
+
       str = format(
         "%<client_ip>s %<method>s %<uri>s %<status>s %<tx>d",
         client_ip:  request.forwarded_for || '?',
         method:     request_headers[':method'].upcase,
-        uri:        request.full_uri,
+        uri:        uri,
         status:     @status,
         tx:         request_headers[':tx']
       )
       @opts[:log].log(str)
     end
 
+    def full_uri(headers)
+      format(
+        "%s://%s%s",
+        headers['x_forwarded_proto'] || 'http',
+        headers['host'],
+        headers[':path']
+      )
+    end
+
     RE_REQUEST_LINE = /^([a-z]+)\s+([^\s]+)\s+(http\/[0-9\.]{1,3})/i.freeze
     RE_HEADER_LINE = /^([a-z0-9\-]+)\:\s+(.+)/i.freeze
     MAX_REQUEST_LINE_LEN = 1 << 14 # 16KB
@@ -252,7 +258,6 @@ module TP2
         headers[m[1].downcase] = m[2]
       end
 
-      headers[':scheme'] = headers['x_forwarded_proto'] || 'http'
       headers
     end
 

data/lib/tp2/server.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'tp2/http1_adapter'
+require 'tp2/http1_connection'
 require 'tp2/request_extensions'
 require 'tp2/rack_adapter'
 
@@ -102,7 +102,7 @@ module TP2
 
     def accept_incoming(listen_fd)
       @machine.accept_each(listen_fd) do |fd|
-        conn = HTTP1Adapter.new(@machine, fd, @opts, &@app)
+        conn = HTTP1Connection.new(@machine, fd, @opts, &@app)
         f = @machine.spin(conn) do
           it.run
         ensure

data/lib/tp2/version.rb

@@ -1,3 +1,3 @@
 module TP2
-  VERSION = '0.11.1'
+  VERSION = '0.11.3'
 end

data/test/test_http1_adapter.rb

@@ -8,7 +8,7 @@ class String
   end
 end
 
-class HTTP1AdapterTest < Minitest::Test
+class HTTP1ConnectionTest < Minitest::Test
   def make_socket_pair
     port = 10000 + rand(30000)
     server_fd = @machine.socket(UM::AF_INET, UM::SOCK_STREAM, 0, 0)
@@ -31,7 +31,7 @@ class HTTP1AdapterTest < Minitest::Test
     @reqs = []
     @hook = nil
     @app = ->(req) { @hook&.call(req); @reqs << req }
-    @adapter = TP2::HTTP1Adapter.new(@machine, @s_fd, {}, &@app)
+    @adapter = TP2::HTTP1Connection.new(@machine, @s_fd, {}, &@app)
   end
 
   def teardown

data/test/test_server.rb

@@ -75,7 +75,7 @@ class ServerTest < Minitest::Test
       req.respond("method: #{req.method}")
     }
 
-    write_http_request "GET /foo HTTP/1.1\r\nServer: foo.com\r\n\r\nSCHMET /bar HTTP/1.1\r\n\r\n"
+    write_http_request "GET /foo HTTP/1.1\r\nServer: foo.com\r\n\r\nSCHmet /bar HTTP/1.1\r\n\r\n"
 
     response = read_client_side
     expected = "HTTP/1.1 200\r\nContent-Length: 11\r\n\r\nmethod: getHTTP/1.1 200\r\nContent-Length: 14\r\n\r\nmethod: schmet"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tp2
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.11.3
 platform: ruby
 authors:
 - Sharon Rosner
@@ -70,7 +70,7 @@ files:
 - examples/rack.ru
 - examples/simple.rb
 - lib/tp2.rb
-- lib/tp2/http1_adapter.rb
+- lib/tp2/http1_connection.rb
 - lib/tp2/logger.rb
 - lib/tp2/rack_adapter.rb
 - lib/tp2/request_extensions.rb