Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1mN2vs-0006F5-Vn for mharc-grub-devel@gnu.org; Sun, 05 Sep 2021 20:56:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58820) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mN15B-00051S-OE for grub-devel@gnu.org; Sun, 05 Sep 2021 18:57:50 -0400 Received: from mail2.cableone.syn-alias.com ([69.168.106.66]:29656 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 1mN15A-0004WX-Bu for grub-devel@gnu.org; Sun, 05 Sep 2021 18:57:49 -0400 X-Authed-Username: c2JhbG91c2VrQGNhYmxlb25lLm5ldA== Authentication-Results: smtp03.lapis.bos.sync.lan smtp.user=sbalousek@cableone.net; auth=pass (LOGIN) Received: from [67.61.93.239] ([67.61.93.239:48030] 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 31/B1-12375-96B45316; Sun, 05 Sep 2021 18:57:45 -0400 From: Stephen Balousek To: grub-devel@gnu.org Cc: Stephen Balousek Subject: [PATCH] net: Allow use of non-standard TCP/IP ports for HTTP protocol. Date: Sun, 5 Sep 2021 15:57:42 -0700 Message-Id: <20210905225742.15458-1-sbalousek@wickedloop.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Vade-Verdict: clean X-Vade-Analysis-1: gggruggvucftvghtrhhoucdtuddrgedvtddrudefvddgtdeiucetufdoteggodetrfdotffvucfrrhho X-Vade-Analysis-2: fhhilhgvmecuufgjpfetvefqtfdpuffrmfdpqfgfvfenuceurghilhhouhhtmecufedtudenucenucfj X-Vade-Analysis-3: ughrpefhvffufffkggfgsedtkeertddttddtnecuhfhrohhmpefuthgvphhhvghnuceurghlohhushgv X-Vade-Analysis-4: khcuoehssggrlhhouhhsvghkseifihgtkhgvughlohhophdrtghomheqnecuggftrfgrthhtvghrnhep X-Vade-Analysis-5: hfeffedvfeejgeeffeekffekgedujeevjeffueejteduudffkedvueffkeelvedunecuffhomhgrihhn X-Vade-Analysis-6: peifihgtkhgvughlohhophdrtghomhenucfkphepieejrdeiuddrleefrddvfeelnecuvehluhhsthgv X-Vade-Analysis-7: rhfuihiivgeptdenucfrrghrrghmpehinhgvthepieejrdeiuddrleefrddvfeelpdhhvghlohepfihi X-Vade-Analysis-8: tghkvggulhhoohhprdgtohhmpdhmrghilhhfrhhomhepshgsrghlohhushgvkhesfihitghkvggulhho X-Vade-Analysis-9: ohhprdgtohhmpdhrtghpthhtohepghhruhgsqdguvghvvghlsehgnhhurdhorhhgpdhhohhsthepshhm X-Vade-Analysis-10: thhprdhlrghpihhsrdgsohhsrdhshihntgdrlhgrnhdpshhpfhepnhgvuhhtrhgrlhdpughkihhmpedp X-Vade-Analysis-11: nhgspghrtghpthhtohepuddptehuthhhqdgfshgvrhepshgsrghlohhushgvkhestggrsghlvghonhgv X-Vade-Analysis-12: rdhnvght 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, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Sun, 05 Sep 2021 20:56:20 -0400 X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Sep 2021 22:57:50 -0000 Allow the use of HTTP servers listening on ports other 80. This is done with an extension to the http notation of either: (http[,server[,port]]) - or - (http[,server[:port]]) Signed-off-by: Stephen Balousek --- grub-core/net/http.c | 43 +++++++++++++++++++++++++++++++++++++++---- 1 file changed, 39 insertions(+), 4 deletions(-) diff --git a/grub-core/net/http.c b/grub-core/net/http.c index b616cf40b..87e496e7f 100644 --- a/grub-core/net/http.c +++ b/grub-core/net/http.c @@ -312,6 +312,9 @@ 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; + long port_number; nb = grub_netbuff_alloc (GRUB_NET_TCP_RESERVE_SIZE + sizeof ("GET ") - 1 @@ -390,10 +393,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, - http_err, NULL, - file); + port_string = grub_strrchr(file->device->net->server, ','); + if (!port_string) + { + port_string = grub_strrchr(file->device->net->server, ':'); + if (grub_strchr(port_string + 1, ']')) + { + port_string = 0; + } + } + if (port_string) + { + port_number = grub_strtol(port_string + 1, 0, 10); + if (port_number <= 0 || port_number > 65535) + { + return grub_error (GRUB_ERR_FILE_NOT_FOUND, N_("invalid port number `%s'"), port_string + 1); + } + + server_name = grub_strdup(file->device->net->server); + 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.33.0