From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.ciao.gmane.io!not-for-mail From: Derek Upham Newsgroups: gmane.lisp.guile.devel Subject: [Patch] Support HTTP/2 in HTTP client Date: Tue, 31 Mar 2020 16:42:29 +0200 (CEST) Message-ID: <87v9mkoab3.fsf@priss.frightenedpiglet.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: ciao.gmane.io; posting-host="ciao.gmane.io:159.69.161.202"; logging-data="93958"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: mu4e 1.3.2; emacs 28.0.50 To: guile-devel@gnu.org Original-X-From: guile-devel-bounces+guile-devel=m.gmane-mx.org@gnu.org Tue Mar 31 16:49:33 2020 Return-path: Envelope-to: guile-devel@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1jJICq-000OLR-Ta for guile-devel@m.gmane-mx.org; Tue, 31 Mar 2020 16:49:33 +0200 Original-Received: from localhost ([::1]:39314 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jJICp-00033J-RQ for guile-devel@m.gmane-mx.org; Tue, 31 Mar 2020 10:49:31 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:53043) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jJI6C-0005Fr-NE for guile-devel@gnu.org; Tue, 31 Mar 2020 10:42:42 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jJI6A-0003Zc-Qm for guile-devel@gnu.org; Tue, 31 Mar 2020 10:42:40 -0400 Original-Received: from mailout-l3b-97.contactoffice.com ([212.3.242.97]:58380) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jJI69-0003VU-10 for guile-devel@gnu.org; Tue, 31 Mar 2020 10:42:37 -0400 Original-Received: from smtpauth2.co-bxl (smtpauth2.co-bxl [10.2.0.24]) by mailout-l3b-97.contactoffice.com (Postfix) with ESMTP id 292395AE for ; Tue, 31 Mar 2020 16:42:33 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailfence.com; s=20160819-nLV10XS2; t=1585665753; bh=GjfNRygnOJWnvT6VS2FipD2ROQuXPRTP/hq8nb9L8Ko=; h=From:To:Subject:Date:From; b=ecO+/NjI4BQtrzauJ2LzNQw+yaLESXqu3A0jf894GKA5y5IdKBcy7yunIvh3XrTAp UNlyRDiW/x0+dpzC5j+lJm9c0ZHMBevvuqfCsT2IpZLQtMgZPEgXQ7QTYw18OAATPM Z1TNggvRc5+hLwznGanP4SdTVkzUdh9O22JZkYIISO0iqHVcdXdLiMFZbnaLBD0daF 8tkzsEAM6ah4Y5J5EuVHHWSJ7tCIjep8WM+kA1jMuCrJ6EWi00rercrUQJ4QIYJDNn atPA0KTF76elZDsyxWCIgSRHPT0xrGtm1L05itaX3L+O/FI1TT5RFBCT7SvHJ5oyqo 4O5q8vX3qo1Rg== Original-Received: by smtp.mailfence.com with ESMTPSA for ; Tue, 31 Mar 2020 16:42:27 +0200 (CEST) Original-Received: from localhost ([::1] helo=priss.frightenedpiglet.com) by priss.frightenedpiglet.com with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.93) (envelope-from ) id 1jJI5w-00FFYN-J4; Tue, 31 Mar 2020 07:42:24 -0700 X-ContactOffice-Account: com:175140567 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.3.242.97 X-Mailman-Approved-At: Tue, 31 Mar 2020 10:48:51 -0400 X-BeenThere: guile-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "Developers list for Guile, the GNU extensibility library" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guile-devel-bounces+guile-devel=m.gmane-mx.org@gnu.org Original-Sender: "guile-devel" Xref: news.gmane.io gmane.lisp.guile.devel:20476 Archived-At: --=-=-= Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable Companies like Google now respond to HTTP requests with HTTP 2.=20 For example: curl --silent --head https://www.google.com returns the first line HTTP/2 200 The Guile HTTP client code expects a =E2=80=9CHTTP/x.y=E2=80=9D structure, = and=20 treats this as an error. This patch recognizes and handles=20 =E2=80=9CHTTP/2=E2=80=9D on input and output. HTTP version numbers don=E2= =80=99t=20 proliferate quickly, so the code uses a brute force approach for=20 now. --=-=-= Content-Type: text/x-diff; charset=utf-8 Content-Disposition: attachment; filename=0001-Support-HTTP-2-headers-from-web-servers.patch Content-Transfer-Encoding: quoted-printable Content-Description: 0001-Support-HTTP-2-headers-from-web-servers.patch >From 97d82f131afb40527340fb7126efaf50f7fe59eb Mon Sep 17 00:00:00 2001 From: Derek Upham Date: Tue, 4 Jul 2017 08:54:06 -0700 Subject: [PATCH 1/2] Support HTTP/2 headers from web servers. For example, curl --silent --head https://www.google.com returns the first line HTTP/2 200 which does not match the MAJOR.MINOR format expected by the old code. --- module/web/http.scm | 41 +++++++++++++++++++++------------- test-suite/tests/web-http.test | 16 +++++++++++-- 2 files changed, 40 insertions(+), 17 deletions(-) diff --git a/module/web/http.scm b/module/web/http.scm index de61c9495..c5e559bea 100644 --- a/module/web/http.scm +++ b/module/web/http.scm @@ -1059,7 +1059,11 @@ as an ordered alist." (define* (parse-http-version str #:optional (start 0) (end (string-length = str))) "Parse an HTTP version from STR, returning it as a major=E2=80=93minor pair. For example, =E2=80=98HTTP/1.1=E2=80=99 parses as the pair of intege= rs, -=E2=80=98(1 . 1)=E2=80=99." +=E2=80=98(1 . 1)=E2=80=99. + +The HTTP/2 working group has explicitly dropped the =E2=80=98.0=E2=80=99 m= inor +version. For internal consistency, track the the missing minor +version as zero." (let lp ((known *known-versions*)) (match known (((version-str . version-val) . known) @@ -1067,28 +1071,35 @@ pair. For example, =E2=80=98HTTP/1.1=E2=80=99 parse= s as the pair of integers, version-val (lp known))) (() - (let ((dot-idx (string-index str #\. start end))) - (unless (and (string-prefix? "HTTP/" str 0 5 start end) - dot-idx - (=3D dot-idx (string-rindex str #\. start end))) -=20=20=20=20=20=20=20=20=20=20=20 - (bad-header-component 'http-version (substring str start end))) - (cons (parse-non-negative-integer str (+ start 5) dot-idx) - (parse-non-negative-integer str (1+ dot-idx) end))))))) + (if (string=3D? "HTTP/2" (substring str start end)) + '(2 . 0) + (let ((dot-idx (string-index str #\. start end))) + (unless (and (string-prefix? "HTTP/" str 0 5 start end) + dot-idx + (=3D dot-idx (string-rindex str #\. start end))) + (bad-header-component 'http-version (substring str start en= d))) + (cons (parse-non-negative-integer str (+ start 5) dot-idx) + (parse-non-negative-integer str (1+ dot-idx) end)))))))) =20 (define (write-http-version val port) - "Write the given major-minor version pair to PORT." - (put-string port "HTTP/") - (put-non-negative-integer port (car val)) - (put-char port #\.) - (put-non-negative-integer port (cdr val))) + "Write the given major-minor version pair to PORT. + +For consistency with HTTP/2 standards, print version =E2=80=98(2 . 0)=E2= =80=99 as +=E2=80=9CHTTP/2=E2=80=9D." + (if (equal? val '(2 . 0)) + (put-string port "HTTP/2") + (begin + (put-string port "HTTP/") + (put-non-negative-integer port (car val)) + (put-char port #\.) + (put-non-negative-integer port (cdr val))))) =20 (for-each (lambda (v) (set! *known-versions* (acons v (parse-http-version v 0 (string-length v)) *known-versions*))) - '("HTTP/1.0" "HTTP/1.1")) + '("HTTP/1.0" "HTTP/1.1" "HTTP/2")) =20 =20 ;; Request-URI =3D "*" | absoluteURI | abs_path | authority diff --git a/test-suite/tests/web-http.test b/test-suite/tests/web-http.test index 63377349c..843936bb5 100644 --- a/test-suite/tests/web-http.test +++ b/test-suite/tests/web-http.test @@ -170,7 +170,13 @@ (build-uri-reference #:path "/etc/hosts" #:query "foo=3Dbar") - (1 . 1))) + (1 . 1)) + (pass-if-read-request-line "HEAD /etc/hosts?foo=3Dbar HTTP/2" + HEAD + (build-uri-reference + #:path "/etc/hosts" + #:query "foo=3Dbar") + (2 . 0))) =20 (with-test-prefix "write-request-line" (pass-if-write-request-line "GET / HTTP/1.1" @@ -201,7 +207,13 @@ (build-uri-reference #:path "/etc/hosts" #:query "foo=3Dbar") - (1 . 1))) + (1 . 1)) + (pass-if-write-request-line "HEAD /etc/hosts?foo=3Dbar HTTP/2" + HEAD + (build-uri-reference + #:path "/etc/hosts" + #:query "foo=3Dbar") + (2 . 0))) =20 (with-test-prefix "read-response-line" (pass-if-exception "missing CR/LF" --=20 2.25.1 --=-=-= Content-Type: text/plain; format=flowed Derek -- Derek Upham derek_upham@mailfence.com --=-=-=--