Improved request validation and associated logging.

Author: ioquatix

lib/falcon/middleware/proxy.rb

@@ -152,6 +152,9 @@ def call(request)
 				def call(request)
 					attributes = {
 						"authority" => request.authority,
+						"method" => request.method,
+						"path" => request.path,
+						"version" => request.version,
 					}
 
 					Traces.trace("falcon.middleware.proxy.call", attributes: attributes) do

lib/falcon/middleware/redirect.rb

@@ -50,6 +50,8 @@ def call(request)
 						location = "#{@endpoint.scheme}://#{host.authority}:#{@endpoint.port}#{request.path}"
 					end
 
+					Console.info(self, "Redirecting incoming request...", request: request, location: location)
+					
 					return Protocol::HTTP::Response[301, [["location", location]], []]
 				else
 					super

lib/falcon/middleware/validate.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+# Released under the MIT License.
+# Copyright, 2025, by Samuel Williams.
+
+module Falcon
+	module Middleware
+		# A HTTP middleware for validating incoming requests.
+		class Validate < Protocol::HTTP::Middleware
+			# Initialize the validate middleware.
+			# @parameter app [Protocol::HTTP::Middleware] The middleware to wrap.
+			def initialize(app)
+				super(app)
+			end
+			
+			# Validate the incoming request.
+			def call(request)
+				unless request.path.start_with?("/")
+					return Protocol::HTTP::Response[400, {}, ["Invalid request path!"]]
+				end
+				
+				return super
+			end
+		end
+	end
+end

lib/falcon/middleware/verbose.rb

@@ -13,7 +13,7 @@ class Verbose < Protocol::HTTP::Middleware
 			# Initialize the verbose middleware.
 			# @parameter app [Protocol::HTTP::Middleware] The middleware to wrap.
 			# @parameter logger [Console::Logger] The logger to use.
-			def initialize(app, logger = Console.logger)
+			def initialize(app, logger = Console)
 				super(app)
 
 				@logger = logger
@@ -24,7 +24,7 @@ def annotate(request)
 				task = Async::Task.current
 				address = request.remote_address
 
-				@logger.info(request) {"Headers: #{request.headers.to_h} from #{address.inspect}"}
+				@logger.info(request, "-> #{request.method} #{request.path}", headers: request.headers.to_h, address: address.inspect)
 
 				task.annotate("#{request.method} #{request.path} from #{address.inspect}")
 			end
@@ -37,10 +37,8 @@ def call(request)
 
 				response = super
 
-				statistics.wrap(response) do |statistics, error|
-					@logger.info(request) {"Responding with: #{response.status} #{response.headers.to_h}; #{statistics.inspect}"}
-					
-					@logger.error(request) {"#{error.class}: #{error.message}"} if error
+				statistics.wrap(response) do |body, error|
+					@logger.info(request, "<- #{request.method} #{request.path}", headers: response.headers.to_h, status: response.status, body: body.inspect, error: error)
 				end
 
 				return response

lib/falcon/server.rb

@@ -9,30 +9,35 @@
 require "protocol/http/content_encoding"
 
 require "async/http/cache"
-
 require_relative "middleware/verbose"
+require_relative "middleware/validate"
 require "protocol/rack"
 
 module Falcon
 	# A server listening on a specific endpoint, hosting a specific middleware.
 	class Server < Async::HTTP::Server
 		# Wrap a rack application into a middleware suitable the server.
 		# @parameter rack_app [Proc | Object] A rack application/middleware.
-		# @parameter verbose [Boolean] Whether to add the {Verbose} middleware.
+		# @parameter validate [Boolean] Whether to add the {Middleware::Validate} middleware.
+		# @parameter verbose [Boolean] Whether to add the {Middleware::Verbose} middleware.
 		# @parameter cache [Boolean] Whether to add the {Async::HTTP::Cache} middleware.
-		def self.middleware(rack_app, verbose: false, cache: true)
+		def self.middleware(rack_app, verbose: false, validate: true, cache: true)
 			::Protocol::HTTP::Middleware.build do
 				if verbose
 					use Middleware::Verbose
 				end
 
+				if validate
+					use Middleware::Validate
+				end
+				
 				if cache
 					use Async::HTTP::Cache::General
 				end
 
 				use ::Protocol::HTTP::ContentEncoding
-				use ::Protocol::Rack::Adapter
 
+				use ::Protocol::Rack::Adapter
 				run rack_app
 			end
 		end