Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1n9EIM-000391-IO for mharc-grub-devel@gnu.org; Sun, 16 Jan 2022 17:46:42 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57972) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n9EIK-00038s-UV for grub-devel@gnu.org; Sun, 16 Jan 2022 17:46:40 -0500 Received: from mail2.cableone.syn-alias.com ([69.168.106.66]:36747 helo=mail.cableone.net) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n9EII-0003Up-C1 for grub-devel@gnu.org; Sun, 16 Jan 2022 17:46:40 -0500 X-Authed-Username: c2JhbG91c2VrQGNhYmxlb25lLm5ldA== Authentication-Results: smtp03.lapis.bos.sync.lan smtp.user=sbalousek@cableone.net; auth=pass (LOGIN) Received: from [24.117.60.89] ([24.117.60.89:37722] helo=wickedloop.com) by mail.cableone.net (envelope-from ) (ecelerity 3.6.25.56547 r(Core:3.6.25.0)) with ESMTPSA (cipher=DHE-RSA-AES128-GCM-SHA256) id E5/D3-11178-340A4E16; Sun, 16 Jan 2022 17:46:28 -0500 From: Stephen Balousek To: grub-devel@gnu.org Cc: Daniel Kiper , Stephen Balousek Subject: [PATCH v3] http: Allow use of non-standard TCP/IP ports Date: Sun, 16 Jan 2022 15:46:08 -0700 Message-Id: <20220116224608.1225-1-sbalousek@wickedloop.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Vade-Verdict: clean X-Vade-Analysis-1: gggruggvucftvghtrhhoucdtuddrgedvvddruddtgddtfecutefuodetggdotefrodftvfcurfhrohhf X-Vade-Analysis-2: ihhlvgemucfujgfpteevqfftpdfurffmpdfgpfggqdfurffmpdfqfgfvnecuuegrihhlohhuthemucef X-Vade-Analysis-3: tddunecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenucfjughrpefhvffufffkggfgsedtkeer X-Vade-Analysis-4: tddttddtnecuhfhrohhmpefuthgvphhhvghnuceurghlohhushgvkhcuoehssggrlhhouhhsvghkseif X-Vade-Analysis-5: ihgtkhgvughlohhophdrtghomheqnecuggftrfgrthhtvghrnhepjeeujefgkedufeegtedvieeigfff X-Vade-Analysis-6: gedvjeeileejgfevueelheejleffgfdukeehnecuffhomhgrihhnpeifihgtkhgvughlohhophdrtgho X-Vade-Analysis-7: mhdpvgigrghmphhlvgdrtghomhenucfkphepvdegrdduudejrdeitddrkeelnecuvehluhhsthgvrhfu X-Vade-Analysis-8: ihiivgeptdenucfrrghrrghmpehinhgvthepvdegrdduudejrdeitddrkeelpdhhvghlohepfihitghk X-Vade-Analysis-9: vggulhhoohhprdgtohhmpdhmrghilhhfrhhomhepshgsrghlohhushgvkhesfihitghkvggulhhoohhp X-Vade-Analysis-10: rdgtohhmpdhrtghpthhtohepghhruhgsqdguvghvvghlsehgnhhurdhorhhgpdhrtghpthhtohepughk X-Vade-Analysis-11: ihhpvghrsehnvghtqdhsphgrtggvrdhplhdpmhhtrghhohhsthepshhmthhprdhlrghpihhsrdgsohhs X-Vade-Analysis-12: rdhshihntgdrlhgrnhdpnhgspghrtghpthhtohepvddprghuthhhpghushgvrhepshgsrghlohhushgv X-Vade-Analysis-13: khestggrsghlvghonhgvrdhnvght X-Vade-Client: LAPIS Received-SPF: none client-ip=69.168.106.66; envelope-from=sbalousek@wickedloop.com; helo=mail.cableone.net X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 16 Jan 2022 22:46:41 -0000 Allow the use of HTTP servers listening on ports other 80. This is done with an extension to the http notation: (http[,server[,port]]) - or - (http[,server[:port]]) Signed-off-by: Stephen Balousek --- Thanks for that, Daniel. Sorry to have so much trouble making sense of grub_strtoul()! The change you suggested works like a charm. I also fixed my example IPv6 address to be a proper "documentation" address. - Steve docs/grub.texi | 33 +++++++++++++++++++++++++++++++++ grub-core/net/http.c | 40 ++++++++++++++++++++++++++++++++++++++-- 2 files changed, 71 insertions(+), 2 deletions(-) diff --git a/docs/grub.texi b/docs/grub.texi index f8b4b3b21..2f43b73a1 100644 --- a/docs/grub.texi +++ b/docs/grub.texi @@ -3004,6 +3004,39 @@ environment variable @samp{net_default_server} is used. Before using the network drive, you must initialize the network. @xref{Network}, for more information. +For the @samp{http} network protocol, @code{@var{server}} may specify a +port number other than the default value of @samp{80}. The server name +and port number are separated by either @samp{,} or @samp{:}. +For IPv6 addresses, the server name and port number may only be separated +by @samp{,}. + +@itemize @bullet +@item +@code{(http,@var{server},@var{port})} + +@item +@code{(http,@var{server}:@var{port})} +@end itemize + +These examples all reference an @samp{http} server at address +@samp{192.168.0.100} listening on the non-standard port of @samp{3000}. +In these examples, the DNS name @samp{grub.example.com} is resolved +to @samp{192.168.0.100}. + +@example +(http,grub.example.com,3000) +(http,grub.example.com:3000) +(http,192.168.0.100,3000) +(http,192.168.0.100:3000) +@end example + +Referencing an @samp{http} server over IPv6 on the non-standard +port of @samp{3000} would look like this: + +@example +(http,2001:db8::1,3000) +@end example + If you boot GRUB from a CD-ROM, @samp{(cd)} is available. @xref{Making a GRUB bootable CD-ROM}, for details. diff --git a/grub-core/net/http.c b/grub-core/net/http.c index b616cf40b..4274b8208 100644 --- a/grub-core/net/http.c +++ b/grub-core/net/http.c @@ -312,6 +312,10 @@ http_establish (struct grub_file *file, grub_off_t offset, int initial) int i; struct grub_net_buff *nb; grub_err_t err; + char *server_name; + char *port_string; + const char *port_string_end; + unsigned long port_number; nb = grub_netbuff_alloc (GRUB_NET_TCP_RESERVE_SIZE + sizeof ("GET ") - 1 @@ -390,10 +394,42 @@ http_establish (struct grub_file *file, grub_off_t offset, int initial) grub_netbuff_put (nb, 2); grub_memcpy (ptr, "\r\n", 2); - data->sock = grub_net_tcp_open (file->device->net->server, - HTTP_PORT, http_receive, + port_string = grub_strrchr (file->device->net->server, ','); + if (port_string == NULL) + { + /* If ',port' is not found in the http server string, look for ':port' */ + port_string = grub_strrchr (file->device->net->server, ':'); + /* For IPv6 addresses, the ':port' syntax is not supported and ',port' must be used. */ + if (port_string != NULL && grub_strchr (file->device->net->server, ':') != port_string) + port_string = NULL; + } + if (port_string != NULL) + { + port_number = grub_strtoul (port_string + 1, &port_string_end, 10); + if (*(port_string + 1) == '\0' || *port_string_end != '\0') + return grub_error (GRUB_ERR_BAD_NUMBER, N_("non-numeric or invalid port number `%s'"), port_string + 1); + if (port_number == 0 || port_number > 65535) + return grub_error (GRUB_ERR_OUT_OF_RANGE, N_("port number `%s' not in the range of 1 to 65535"), port_string + 1); + + server_name = grub_strdup (file->device->net->server); + if (server_name == NULL) + return grub_errno; + server_name[port_string - file->device->net->server] = '\0'; + } + else + { + port_number = HTTP_PORT; + server_name = file->device->net->server; + } + + data->sock = grub_net_tcp_open (server_name, + port_number, http_receive, http_err, NULL, file); + + if (server_name != file->device->net->server) + grub_free (server_name); + if (!data->sock) { grub_netbuff_free (nb); -- 2.34.1