Revert "Remove read-request-body workaround"

I was mistaken, Guile doesn't handle chunked request bodies.

This reverts commit 07e42953f257b846d44376d998cc7d654214ca17.

1 files changed, 25 insertions, 0 deletions

diff --git a/guix-build-coordinator/agent-messaging/http/server.scm b/guix-build-coordinator/agent-messaging/http/server.scm
index 736c1db..4c88428 100644
--- a/guix-build-coordinator/agent-messaging/http/server.scm
+++ b/guix-build-coordinator/agent-messaging/http/server.scm
@@ -49,6 +49,31 @@
   #:use-module (guix-build-coordinator coordinator)
   #:export (http-agent-messaging-start-server))
 
+(define (bad-request message . args)
+  (throw 'bad-request message args))
+
+(define (fixed/read-request-body r)
+  "Reads the request body from R, as a bytevector.  Return ‘#f’
+if there was no request body."
+  (cond
+   ;; TODO Change Guile to handle chunked request bodies
+   ((member '(chunked) (request-transfer-encoding r))
+    (make-chunked-input-port (request-port r)
+                             ;; closing the port is handled elsewhere
+                             #:keep-alive? #t))
+   (else
+    (let ((nbytes (request-content-length r)))
+      (and nbytes
+           (let ((bv (get-bytevector-n (request-port r) nbytes)))
+             (if (= (bytevector-length bv) nbytes)
+                 bv
+                 (bad-request "EOF while reading request body: ~a bytes of ~a"
+                              (bytevector-length bv) nbytes))))))))
+
+(module-set! (resolve-module '(web request))
+             'read-request-body
+             fixed/read-request-body)
+
 (define (http-agent-messaging-start-server port host secret-key-base
                                            build-coordinator
                                            chunked-request-channel)