From patchwork Wed Aug 10 22:27:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Derek Buitenhuis X-Patchwork-Id: 37231 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3d0d:b0:8d:a68e:8a0e with SMTP id y13csp670pzi; Wed, 10 Aug 2022 15:27:57 -0700 (PDT) X-Google-Smtp-Source: AA6agR7Uk6ldAyDaaXZmNlDRU+MmFr+zpuL7K4rHZ4FoybUXZ2npi3JHUHhgyjkkYWVGzFhZ8zg3 X-Received: by 2002:a05:6402:438d:b0:43d:b383:660f with SMTP id o13-20020a056402438d00b0043db383660fmr28519836edc.283.1660170477284; Wed, 10 Aug 2022 15:27:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1660170477; cv=none; d=google.com; s=arc-20160816; b=zqSSbxwIbSyGt69KIh82fnS04iENbKrZtvU0Mxh/EJ831nUkiUkuLQXB7OLEXLJ+m1 wLicqir8jwAXMyAtXT4cPY2xgvXHS/YePdiBcdr7byf3UrhwKgPisnsee1UjjybJSf4i 2yvzI9TCOGgZdncPI5dWFaPFSZ0OOLCfJEorD+rZ4BaTgmL+PGZ43Bqq2JS3hzYzHdCa RvjEI5fPFiLI9LWlgbrF0zeLookLTZhajB8OwMZieqYyjs6rLZLPnMGTJcBmzliOMZJr rM5kqMugBKCLLPovV+CknT8AMKY2PVnhv5L+OFkAwMPnMbrB5aZbnu4BzpGc01zM2ie4 EjYg== 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:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=EWtvEqiv/dCcQYAhhciqvWOAU5C/syT0hipIMb/9mog=; b=Yt36ezKw/+WwwXI96hc5c/uwiNpv2PcXZbImSkB4SPSa+Nr+MH16Xoo67mhJAhc962 GBbSnE5xTyul+ljFLKG3d7wy99RzRD5ZXS2Y8L82KM0gemZP6F8BzJio2SIz+leCTqki a93tsu/pRuaYVEUYDjR+3gjv40f3acnfaEV2gsio7Zr5IPm23L2vaqmMhqW9jfMEUyas gA/34ib8M0sllBAA4hG8szN10kndiZqhUEqOdkmw0MljFyb0jAgltt+AY95Xng/OElFG Za5G1l16VikMWA9Izr30uIP6Ck752r7+N4Rm+t3Aes8osbxe03365crumO3BI9dVsSCH fnNQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=KGofuExE; 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 w23-20020aa7cb57000000b0043bb9745c2esi9842093edt.172.2022.08.10.15.27.33; Wed, 10 Aug 2022 15:27:57 -0700 (PDT) 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=KGofuExE; 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 7039E68B8D7; Thu, 11 Aug 2022 01:27:30 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 068BD689CDD for ; Thu, 11 Aug 2022 01:27:24 +0300 (EEST) Received: by mail-wr1-f66.google.com with SMTP id l4so19303167wrm.13 for ; Wed, 10 Aug 2022 15:27:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc; bh=aIdJIQs9s0qBCtDzS5c6Y7uQe2DA5UHpXT9XeVt9bdc=; b=KGofuExEhatq0NQdIIZ5Iy4gybwS60LtnDRz7PwR3DhXRBYnx3UnxNRwyZiuLgwwnZ 5G1/rV3ES0L/5W1h6MM65F3XLw7WLzS/Mfy9W3WTJ3VM05eu8M+qGbmco4tPbQ3YNirD /eaF2x3QD2ntB6mXqjxGe5qGvhUgiIAiNw4NXaj68lEejjpA7zyz6BGs0WJW1bHvUoqv Tlk8h86YWIug9Mhqeh4OTuOpNcvGzrMzIHLtvlu/Z8aFGOABGBb8jD36KwSfLUJ/81/v cbpkoZ7DIC92EMwGHUdHv59fvQbp0aHMdm+TuJ0YNlI8KijsOjX4mG9z8UEyjfaOtbUN 0lHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc; bh=aIdJIQs9s0qBCtDzS5c6Y7uQe2DA5UHpXT9XeVt9bdc=; b=yW3uU8DI4oDd4knW2/GUZnELzN1AjL8U75omb/R9BRmvKkY2xciga4Wb1OxnTRSzy1 eLRuBcNR0MkQ8CTPL0whb7iHTdKHBe0ak+cs7IIS11QSShhuPqnmTgFugSMkl5oOZ6+d q9gwDfD9/C07Pw9kh8VAKeybhrDjA2U7sCpqZQe+OvvQhxT/P4kiKStVBd1y9UpTSXDI 5arfzohdjbCW1c4CNP/VJR3gbiuzGu4ZS5OLTSPzOsrokoe2cx9wXOYErPKbK2Ctr+bp RKc6b3mFpjU/BYyyVEitQ5CdMX0uJOIbpGy1plil8sTb2WKXbq1OskCw3F1dRXfsSTH9 42pQ== X-Gm-Message-State: ACgBeo0Q4mN50lQn/GTenPP1KaLwakYBvpSR8wZnU3LeYztskpDRaT2n /tKLynno6lecyce6Tj5cy7ldXUFpgcM= X-Received: by 2002:adf:a41e:0:b0:220:7a43:dd76 with SMTP id d30-20020adfa41e000000b002207a43dd76mr18944777wra.334.1660170443337; Wed, 10 Aug 2022 15:27:23 -0700 (PDT) Received: from localhost.localdomain ([149.12.10.163]) by smtp.gmail.com with ESMTPSA id m8-20020a5d56c8000000b00222d4dfcdffsm7566001wrw.87.2022.08.10.15.27.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Aug 2022 15:27:22 -0700 (PDT) From: Derek Buitenhuis To: ffmpeg-devel@ffmpeg.org Date: Wed, 10 Aug 2022 23:27:08 +0100 Message-Id: <20220810222708.186270-1-derek.buitenhuis@gmail.com> X-Mailer: git-send-email 2.36.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] ipfsgateway: Remove default gateway 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: B/9xf21owkSK A gateway can see everything, and we should not be shipping a hardcoded default from a third party company; it's a security risk. Signed-off-by: Derek Buitenhuis --- libavformat/ipfsgateway.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/libavformat/ipfsgateway.c b/libavformat/ipfsgateway.c index 5a5178c563..907b61b017 100644 --- a/libavformat/ipfsgateway.c +++ b/libavformat/ipfsgateway.c @@ -240,13 +240,8 @@ static int translate_ipfs_to_http(URLContext *h, const char *uri, int flags, AVD ret = populate_ipfs_gateway(h); if (ret < 1) { - // We fallback on dweb.link (managed by Protocol Labs). - snprintf(c->gateway_buffer, sizeof(c->gateway_buffer), "https://dweb.link"); - - av_log(h, AV_LOG_WARNING, - "IPFS does not appear to be running. " - "You’re now using the public gateway at dweb.link.\n"); - av_log(h, AV_LOG_INFO, + av_log(h, AV_LOG_ERROR, + "IPFS does not appear to be running.\n\n" "Installing IPFS locally is recommended to " "improve performance and reliability, " "and not share all your activity with a single IPFS gateway.\n" @@ -259,6 +254,8 @@ static int translate_ipfs_to_http(URLContext *h, const char *uri, int flags, AVD "3. Define an $IPFS_PATH environment variable " "and point it to the IPFS data path " "- this is typically ~/.ipfs\n"); + ret = AVERROR(EINVAL); + goto err; } }