ronin-listener-http 0.1.0.rc1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5adf81fa9ced6ab4fd65074de117b81415c1404928f92454232c2062ff758548
-  data.tar.gz: 07e253fe463c655429521a42e2e79aeafe8a69389d58c606ea01d11a230271d7
+  metadata.gz: c30560b1a128571b6624cc2d466dc1508395df6f2630cdc09b6012cee5e79fa4
+  data.tar.gz: fec1870e02c243c885c72a7eea34207ee9478a96931838a01d22811533993de1
 SHA512:
-  metadata.gz: e1fdba946028f0696559f874f2264b3116c073398bd3dbc704b19d67a26cc73e02524177f2280c9fcb9ad42d51082b99ca809fd9da73258c794cafc26a9ab592
-  data.tar.gz: 950be8ff0f2f62488e39d32d4d4d70d775ba72f926e0470ba4907e60168646e148b357f98472ccb120a66eaa1e37d3106e6259377d1af8519bf9478bc4857aac
+  metadata.gz: '09095fbcd472e192d14b1828db9b7c5e66a4a2a9f13ea0d55303eda62219dba71105094fcc16dba99c7cee7930b3584ecb558f354376a40333dd1bd4b6bb0bbc'
+  data.tar.gz: 3713e12f0a6b5ed8e2a50b927f7ae2e01b89275e5c1439e0e5c1cff83c9441fb8cb8ccc3e4d34040181f74dfc7d738c10897e89b749385a32a1f57e5ca6c1774

data/.ruby-version

@@ -1 +1 @@
-ruby-3.1
+ruby-3.3

data/ChangeLog.md

@@ -1,4 +1,4 @@
-### 0.1.0 / 2024-XX-XX
+### 0.1.0 / 2024-07-22
 
 * Initial release:
   * Supports receiving HTTP requests.

data/lib/ronin/listener/http/request.rb

@@ -29,6 +29,11 @@ module Ronin
       #
       class Request
 
+        # The remote address that sent the request.
+        #
+        # @return [Addrinfo]
+        attr_reader :remote_addr
+
         # The HTTP request method.
         #
         # @return [String]
@@ -39,6 +44,11 @@ module Ronin
         # @return [String]
         attr_reader :path
 
+        # The request query string.
+        #
+        # @return [String, nil]
+        attr_reader :query
+
         # The HTTP version.
         #
         # @return [String]
@@ -57,12 +67,18 @@ module Ronin
         #
         # Initializes the request.
         #
+        # @param [Addrinfo] remote_addr
+        #   The remote address that sent the request.
+        #
         # @param [String] method
         #   The HTTP request method.
         #
         # @param [String] path
         #   The request path.
         #
+        # @param [String, nil] query
+        #   The request query string.
+        #
         # @param [String] version
         #   The HTTP version.
         #
@@ -72,12 +88,38 @@ module Ronin
         # @param [String, nil] body
         #   The optional body sent with the request.
         #
-        def initialize(method: , path: , version: , headers:, body: nil)
-          @method  = method
-          @path    = path
-          @version = version
-          @headers = headers
-          @body    = body
+        def initialize(remote_addr: ,
+                       method: ,
+                       path: ,
+                       query: nil,
+                       version: ,
+                       headers:,
+                       body: nil)
+          @remote_addr = remote_addr
+          @method      = method
+          @path        = path
+          @query       = query
+          @version     = version
+          @headers     = headers
+          @body        = body
+        end
+
+        #
+        # The remote IP address that sent the request.
+        #
+        # @return [String]
+        #
+        def remote_ip
+          @remote_addr.ip_address
+        end
+
+        #
+        # The remote port that sent the request.
+        #
+        # @return [String]
+        #
+        def remote_port
+          @remote_addr.ip_port
         end
 
         #
@@ -91,11 +133,14 @@ module Ronin
         #
         def ==(other)
           self.class == other.class &&
-            @method  == other.method &&
-            @path    == other.path &&
-            @version == other.version &&
-            @headers == other.headers &&
-            @body    == other.body
+            remote_ip   == other.remote_ip &&
+            remote_port == other.remote_port &&
+            @method     == other.method &&
+            @path       == other.path &&
+            @query      == other.query &&
+            @version    == other.version &&
+            @headers    == other.headers &&
+            @body       == other.body
         end
 
         #
@@ -105,7 +150,11 @@ module Ronin
         #   The raw HTTP request.
         #
         def to_s
-          string = "#{@method} #{@path} HTTP/#{@version}\r\n"
+          request_uri = if @query then "#{@path}?#{@query}"
+                        else           @path
+                        end
+
+          string = "#{@method} #{request_uri} HTTP/#{@version}\r\n"
 
           @headers.each do |name,value|
             string << "#{name}: #{value}\r\n"
@@ -122,11 +171,14 @@ module Ronin
         #
         def to_h
           {
-            method:  @method,
-            path:    @path,
-            version: @version,
-            headers: @headers,
-            body:    @body
+            remote_ip:   remote_ip,
+            remote_port: remote_port,
+            method:      @method,
+            path:        @path,
+            query:       @query,
+            version:     @version,
+            headers:     @headers,
+            body:        @body
           }
         end
 
@@ -139,8 +191,11 @@ module Ronin
         def to_csv
           CSV.generate_line(
             [
+              remote_ip,
+              remote_port,
               @method,
               @path,
+              @query,
               @version,
               CSV.generate { |csv|
                 @headers.each_pair do |name_value|

data/lib/ronin/listener/http/server.rb

@@ -24,6 +24,7 @@ require 'async'
 require 'async/http/server'
 require 'async/http/endpoint'
 require 'async/http/protocol/response'
+require 'protocol/http/reference'
 
 module Ronin
   module Listener
@@ -128,14 +129,19 @@ module Ronin
         #
         def process(request)
           if (@vhost.nil? || @vhost === request.authority)
-            if request.path == @root || request.path.start_with?(@root)
+            reference = Protocol::HTTP::Reference.parse(request.path)
+            path      = reference.path
+
+            if path == @root || path.start_with?(@root)
               @callback.call(
                 Request.new(
-                  method:  request.method,
-                  path:    request.path,
-                  version: request.version,
-                  headers: request.headers,
-                  body:    request.body
+                  remote_addr: request.remote_address,
+                  method:      request.method,
+                  path:        path,
+                  query:       reference.query,
+                  version:     request.version,
+                  headers:     request.headers,
+                  body:        request.body
                 )
               )
             end

data/lib/ronin/listener/http/version.rb

@@ -22,7 +22,7 @@ module Ronin
   module Listener
     module HTTP
       # ronin-listener-http version
-      VERSION = '0.1.0.rc1'
+      VERSION = '0.1.0'
     end
   end
 end

data/lib/ronin/listener/http.rb

@@ -47,8 +47,7 @@ module Ronin
       # @yield [request]
       #   The given block will be passed each received HTTP request.
       #
-      # @yieldparam [Async::HTTP::Protocol::HTTP1::Request,
-      #              Async::HTTP::Protocol::HTTP2::Request] request
+      # @yieldparam [Request] request
       #   The received HTTP request object.
       #
       # @raise [ArgumentError]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ronin-listener-http
 version: !ruby/object:Gem::Version
-  version: 0.1.0.rc1
+  version: 0.1.0
 platform: ruby
 authors:
 - Postmodern
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-23 00:00:00.000000000 Z
+date: 2024-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-http
@@ -93,7 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.27
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: A HTTP server for receiving exfiled data.