Expand wrap-validation schema to allow string values for :request-method

Author: danielcompton

CHANGES.md

@@ -1,3 +1,7 @@
+### Unreleased
+
+* Loosen `wrap-validation` validation to support strings in :request-method. (See release in 0.6.2 for more information). 
+
 ### 0.8.3
 
 * Bump Netty to 4.1.118.Final (CVE-2025-24970 and bug-fixes)
@@ -46,7 +50,7 @@ Manifold contributions by Jacob Maine and Ferdinand Beyer
 * Bump Manifold to 0.4.2 to fix Promesa print-method hierarchy bug
 * Bump Dirigiste to 1.0.4
 * Log SSL handshake completion at debug level instead of info level
-  
+
 Contributions by Matthew Davidson and Eric Dvorsak
 
 ### 0.7.0
@@ -77,11 +81,14 @@ Contributions by Matthew Davidson and Stefan van den Oord.
 
 * Fix backwards-compatibility for transport options
 * Bump Netty to 4.1.89.Final, and io_uring to 0.0.18.Final
-* Add `wrap-validation` middleware to validate Ring maps 
 * Bump deps and example deps
 * Upgrade CircleCI instance size
 * Switch to pedantic deps for CircleCI
 
+### Breaking changes
+
+* Add `wrap-validation` middleware to validate Ring maps [#679](https://github.com/clj-commons/aleph/pull/679). While the Ring spec has always [required](https://github.com/ring-clojure/ring/blob/master/SPEC.md#request-method) a keyword value for `:request-method` (e.g. `:get`), previously, Aleph would also accept string methods (e.g. `"GET"`). This means that `wrap-validation` may cause HTTP requests to fail on previously valid input. This will be fixed in the release after 0.8.3.
+
 Contributions by Arnaud Geiser, Ertuğrul Çetin, Jeroen van Dijk, David Ongaro, 
 Matthew Davidson, and Moritz Heidkamp.
 

src/aleph/http/schema.clj

@@ -7,7 +7,7 @@
 (def uri [:maybe :string])
 (def query-string [:maybe :string])
 (def scheme [:enum :http :https])
-(def request-method :keyword)
+(def request-method [:or :string :keyword])
 (def content-type [:maybe [:or :string :keyword]])
 (def content-length [:maybe :int])
 (def character-encoding [:maybe :string])

test/aleph/http/client_middleware_test.clj

@@ -2,7 +2,7 @@
   (:require
    [aleph.http.client-middleware :as middleware]
    [aleph.http.schema :as schema]
-   [clojure.test :as t :refer [deftest is]]
+   [clojure.test :as t :refer [deftest is testing]]
    [malli.core :as m]
    [malli.generator :as mg])
   (:import
@@ -183,6 +183,12 @@
   (doseq [req (mg/sample schema/ring-request)]
     (is (middleware/wrap-validation req)))
 
+  (testing "Request methods can be strings"
+    (is (middleware/wrap-validation {:remote-addr    "localhost"
+                                     :server-name    "computer"
+                                     :scheme         :http
+                                     :request-method "GET"})))
+
   (is (thrown-with-msg?
         IllegalArgumentException
         #"Invalid spec.*:in \[:request-method\].*:type :malli.core/missing-key"