From patchwork Fri Mar 3 16:24:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Michael J. Walsh" X-Patchwork-Id: 40574 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:d046:b0:cd:afd7:272c with SMTP id hv6csp884200pzb; Fri, 3 Mar 2023 08:24:18 -0800 (PST) X-Google-Smtp-Source: AK7set+aE0EflliHUAI8tU1V6x5IxBOrqsVEwVqBGVamUVxYKRPIeiTSANkdmjlU4ZN4c/Zsgtz3 X-Received: by 2002:a17:907:7fa7:b0:8d7:6699:3bae with SMTP id qk39-20020a1709077fa700b008d766993baemr2490201ejc.57.1677860658118; Fri, 03 Mar 2023 08:24:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677860658; cv=none; d=google.com; s=arc-20160816; b=k3exqBOWCUJ5MiopVPaXgPMvrzV1ZHOS58LWNbnNNtYEDa0v+toRfTh3QkzErxf3U2 4AoPw+YI+3/UdJCWMu2yTXpO4JJDJc4VNsz8uus7Wh6NMFiouoeQMWZd04qIJh+dYHaZ uQsT3+LIU8FIko30/Zu42aJ2NHLmsu4CKKhDqUwPnl6mEE6X2uidlhEKXtHe+RfyY0zy 95xNeBMVKAX2QMrQ2f/dVJ6UOK6/eMW0l4c/EvBKPkS5X9nh885mpaIc0fKymaw/uyQo YQ1sKmLzKQqtX0SvtAzoCLcoZJodiOu9UIZ1t1w39+YKgGmsMEEDpfIX5YndIF30dFWA jVKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:to:date:message-id:mime-version:from :dkim-signature:delivered-to; bh=kB3ZPL9O+hEpJ0Men5dEkpmVdMQa03dE+vUQJe8K5js=; b=OohzqKb5WX8NcWqVeonZEP9xYVmpL9rMC17u/mOJK4NnM7rjZ96gBYwEVQ/ccK69qm Ffa3G38phT6TcBIFoJb3i7qKsZtXoELWhYamK31+Fw4hSv8rwhWXELMJ54KYmP6y/2GW Yyk3EsHDgIDiRdDX6lJadNSQZjnIfaBVbU5nL1BAgnmA2yA3K1EMdtEuiIKakfScl8x5 HD14gtTMV3p/R5y4W9Kk+g02fnaN4DBJaqyaHGhmHgFmLHkt14Hom55mgcxrBIFcFDfF ilMAKxKeJY/DROvF1j8QfffqNQddj4lrL23Svs8QZpiNB6gwjiyp/CKOXh2JCni/gWTs CGcA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=aqGzWVp5; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id jz21-20020a170906bb1500b008cb6722b1f2si2979950ejb.991.2023.03.03.08.24.17; Fri, 03 Mar 2023 08:24:18 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=aqGzWVp5; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D16DF68B9FF; Fri, 3 Mar 2023 18:24:13 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3C8BA68AFAC for ; Fri, 3 Mar 2023 18:24:06 +0200 (EET) Received: by mail-wm1-f43.google.com with SMTP id p26so1943595wmc.4 for ; Fri, 03 Mar 2023 08:24:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1677860645; h=to:date:message-id:subject:mime-version:content-transfer-encoding :from:from:to:cc:subject:date:message-id:reply-to; bh=HNyuyzyOQenSRLPNPdxF+mYMD7Ji2G7qgb6h4lTMw9g=; b=aqGzWVp5go5Mn0Fe+PCtryN2BIL/w9eWzr1Pg7DzwClF0Kv95iel/Weyk4Nfcu/8HB W8F6Q8xlThGIeEh8BQA8bLOoYuT0bPyArwq31L1Nsve5LP99SrtNZDuIW6g7SHL2KomB qkJGih9nYx8jISf4iqKotlfrDG16oDLlnSVvVj65i8DsZBkWBcxgTHVUk6Vj8W1M2Uvc dmqaP0uWyfeCAJ8cfGXe8YKLckKyiBNfVhLZ7dkETKxYRkSX+6Dsi0d4W9d69wUYDEV1 aScX8Z+MhaX9+dWKsJa48ucKPK6QynFTM/l422NyNfJYOANNMIaEGoyY04c4bP4SkqOg 2JBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677860645; h=to:date:message-id:subject:mime-version:content-transfer-encoding :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=HNyuyzyOQenSRLPNPdxF+mYMD7Ji2G7qgb6h4lTMw9g=; b=bOycwbr5elIfgT45zB66U2y/Cgg9UTqkJUKOiVsK+2B0838AUorTWKEGQgUkwJXbLB 9tJGkm+1h1hxIV1MefHTXVxLDtKg4JlIOJ+rmLu3FL/k4uPQZjVvwBMg0g7S2XfKIHXB ncQYA09EZFZfA4yKsRGqWhgmJ0YCg038GYlkVRa7chguWo8ec5kOBGW8t1IcNN58QoT2 9q2nCYDYONQ1VR7RC17cbDfTiS3L3kw4fc0AakqZoY66y0mvSt9D/SXApIO0d3lCuCDc +UC+Bt7eOTysu7JzIWobKsoDNN031QiZpZLvf21N8pL9NcTivdJvKBi/67ogZ3B4pfnY sAug== X-Gm-Message-State: AO0yUKXIZPUpbtoXADMkoJ5qDAvHvEMmxgPmMVS3byno18iIeRiEzE95 q5ENtVxuh95In1VkCVg2GiO1p8CKg9Q= X-Received: by 2002:a05:600c:4447:b0:3ea:c110:55ba with SMTP id v7-20020a05600c444700b003eac11055bamr2145958wmn.18.1677860645400; Fri, 03 Mar 2023 08:24:05 -0800 (PST) Received: from ?IPv6:2a02:8084:2:b900:498c:2a75:7ba7:c725? ([2a02:8084:2:b900:498c:2a75:7ba7:c725]) by smtp.gmail.com with ESMTPSA id u8-20020a5d4688000000b002c5544b3a69sm2579275wrq.89.2023.03.03.08.24.04 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 03 Mar 2023 08:24:05 -0800 (PST) From: "Michael J. Walsh" Mime-Version: 1.0 (Mac OS X Mail 13.4 \(3608.120.23.2.7\)) Message-Id: <9F880AE4-B819-4FBB-B086-54DD9984D80D@gmail.com> Date: Fri, 3 Mar 2023 16:24:02 +0000 To: ffmpeg-devel@ffmpeg.org X-Mailer: Apple Mail (2.3608.120.23.2.7) Subject: [FFmpeg-devel] [PATCH] libavformat/http.c: cookie path attribute should be optional not compulsory X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 0XzMlLOwTamx The path attribute in the Set-Cookie header is optional but treated by ffmpeg as being compulsory. Signed-off-by: Michael J. Walsh —-- libavformat/http.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/http.c b/libavformat/http.c index 7bce821535..dde22a7e09 100644 --- a/libavformat/http.c +++ b/libavformat/http.c @@ -1293,9 +1293,9 @@ static int get_cookies(HTTPContext *s, char **cookies, const char *path, goto skip_cookie; } - // ensure this cookie matches the path + // if a cookie path is provided, ensure the request path is within that path e = av_dict_get(cookie_params, "path", NULL, 0); - if (!e || av_strncasecmp(path, e->value, strlen(e->value))) + if (e && av_strncasecmp(path, e->value, strlen(e->value))) goto skip_cookie; // cookie parameters match, so copy the value