ronin-listener-http 0.1.0.rc1 → 0.1.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5adf81fa9ced6ab4fd65074de117b81415c1404928f92454232c2062ff758548
-  data.tar.gz: 07e253fe463c655429521a42e2e79aeafe8a69389d58c606ea01d11a230271d7
+  metadata.gz: 5a7b158cba029bddb265109da882afaad58f783eb84970ca34645bce11ace7d2
+  data.tar.gz: a10a9400d9770333391173cf362f791beb985cc2827790382db1ace979be8464
 SHA512:
-  metadata.gz: e1fdba946028f0696559f874f2264b3116c073398bd3dbc704b19d67a26cc73e02524177f2280c9fcb9ad42d51082b99ca809fd9da73258c794cafc26a9ab592
-  data.tar.gz: 950be8ff0f2f62488e39d32d4d4d70d775ba72f926e0470ba4907e60168646e148b357f98472ccb120a66eaa1e37d3106e6259377d1af8519bf9478bc4857aac
+  metadata.gz: 593a95c60b3c449a445702a7583cd79777504cbf0238ab0190a73f66b8920b45ca6926c0fbd5adeeccfc0c5a09ae1edd968a2dfa1752bc158a75cf608491ac50
+  data.tar.gz: 77fe8072868e85dc4de55b2418704b6f2dbbb42744e111a522f7385ba539166868cb5f7a09cecf72ad92ecea199e8dc79cc23538e0d87cbf3c10b03fb966ed38

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]
@@ -57,6 +62,9 @@ module Ronin
         #
         # Initializes the request.
         #
+        # @param [Addrinfo] remote_addr
+        #   The remote address that sent the request.
+        #
         # @param [String] method
         #   The HTTP request method.
         #
@@ -72,12 +80,36 @@ 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: ,
+                       version: ,
+                       headers:,
+                       body: nil)
+          @remote_addr = remote_addr
+          @method      = method
+          @path        = path
+          @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 +123,13 @@ 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 &&
+            @version    == other.version &&
+            @headers    == other.headers &&
+            @body       == other.body
         end
 
         #
@@ -122,11 +156,13 @@ 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,
+            version:     @version,
+            headers:     @headers,
+            body:        @body
           }
         end
 
@@ -139,6 +175,8 @@ module Ronin
         def to_csv
           CSV.generate_line(
             [
+              remote_ip,
+              remote_port,
               @method,
               @path,
               @version,

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

@@ -131,11 +131,12 @@ module Ronin
             if request.path == @root || request.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:        request.path,
+                  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.rc2'
     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.rc2
 platform: ruby
 authors:
 - Postmodern
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-23 00:00:00.000000000 Z
+date: 2024-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-http