main/busybox: fix default http header not overwritten

The default http headers weren't overwritten when the user header had a
different casing than the default.

Closes https://gitlab.alpinelinux.org/alpine/aports/-/issues/16172
This commit is contained in:
Sertonix 2024-06-03 17:32:13 +02:00 committed by Sören Tempel
parent 38f5367caa
commit 936249c18d
2 changed files with 37 additions and 1 deletions

View File

@ -0,0 +1,34 @@
From d5ae404155bb5faa587108928299598d59241205 Mon Sep 17 00:00:00 2001
From: Sertonix <sertonix@posteo.net>
Date: Mon, 3 Jun 2024 16:55:57 +0200
Subject: [PATCH] wget: ignore header casing
HTTP headers are case insensitive and therefor the check if a default
header has been overwritten needs to be case insensitive.
function old new delta
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 0/0 up/down: 0/0) Total: 0 bytes
text data bss dec hex filename
1040876 16443 1840 1059159 102957 busybox_old
1040876 16443 1840 1059159 102957 busybox_unstripped
---
networking/wget.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/networking/wget.c b/networking/wget.c
index 199ddd4da..512bebfc2 100644
--- a/networking/wget.c
+++ b/networking/wget.c
@@ -1602,7 +1602,7 @@ IF_DESKTOP( "no-parent\0" No_argument "\xf0")
bit = 1;
words = wget_user_headers;
while (*words) {
- if (strstr(hdr, words) == hdr) {
+ if (strcasestr(hdr, words) == hdr) {
G.user_headers |= bit;
break;
}
--
2.45.2

View File

@ -5,7 +5,7 @@
# Maintainer: Sören Tempel <soeren+alpine@soeren-tempel.net>
pkgname=busybox
pkgver=1.36.1
pkgrel=30
pkgrel=31
pkgdesc="Size optimized toolbox of many common UNIX utilities"
url="https://busybox.net/"
arch="all"
@ -89,6 +89,7 @@ source="https://busybox.net/downloads/busybox-$pkgver.tar.bz2
0001-wget-add-header-Accept.patch
0001-awk-fix-use-after-free-CVE-2023-42363.patch
CVE-2023-42364-CVE-2023-42365.patch
0001-wget-ignore-header-casing.patch
acpid.logrotate
busyboxconfig
@ -410,6 +411,7 @@ bff815bf9c8cd0856dde87eb90e2fe56f105dccb426e4f5da9425e30d449d7ee7ccc3b3324aee513
bff27cf4a311bc7f5af857f431ba5cca9861e3875815e81384c90419fa817d5d00812acaf0045342ab8f5355003135e9c0340547c1045e0144f6b9d01465838e 0001-wget-add-header-Accept.patch
771b52eb5218ce21ecc1ea5f4d1384bfd02078b37f2a361faeb68c03c7f69854bfe29624060b43eb653a2692303b5fe8ea7c0d2f07df0a022996cffe54697115 0001-awk-fix-use-after-free-CVE-2023-42363.patch
0388efe8392cba1f7c1b62d1fafeb2226cec01b3e9a36f3aa0a0f3571dc4919b6962b09a168e156693b92a03997bd886da77c86b3ae563ebfd6b9ccb5127ab8e CVE-2023-42364-CVE-2023-42365.patch
da8a7470db3fc6c5bae298cfde043d31fc1fdbb54d2134d37bfd56c2be2d6bc124e46b2750713c3f91bd331d5bef87dc1bceae6487d838059360e0a0ed159343 0001-wget-ignore-header-casing.patch
aa93095e20de88730f526c6f463cef711b290b9582cdbd8c1ba2bd290019150cbeaa7007c2e15f0362d5b9315dd63f60511878f0ea05e893f4fdfb4a54af3fb1 acpid.logrotate
076f13b9d85ebf23aff8c0a2f313d3ca05f4d1c0d3ed06b0bc274d41deda3bd4808a8381f7c0411e8188b67315cc7ac8dced1b4473cda3c247773dbce2b71f55 busyboxconfig
cfd96023125ca27c6eddb13af490a36e5e7d2fcfd0847363e48f1fa5ce237e93e6a9fe4577feeb35291d79d6240ae5e6a518b9258966e0fac27e30a43172b792 busyboxconfig-extras