From patchwork Mon Aug 24 23:00:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baptiste Jonglez X-Patchwork-Id: 1350734 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.openwrt.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=bitsofnetworks.org Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=kx4s3IzU; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Bb7231jJ8z9sSP for ; Tue, 25 Aug 2020 09:02:50 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=tQzDiF5p0nKRc4UzSmZrkP2W1nHdaVmZMlUCGbujyUs=; b=kx4s3IzUoyO5zFUm0l89N3tyy GV7OUx1DVv3OIImwlyDjz94YBkke17ETAZpShd62lRKV4W/NRS7ld2+HUt47FI9Wbq/4IGM15PYqn jTLJLq55tjfoVD5M8xZidCeiAIBl8M9Zxi8SHkaaMI7pKz/u4Q5sEacqvlEBQ9AOdX4zOLhd9y9kn AD4zN7MH4zAsluatWwCDndPFvFut/++DgJ5RflDMS13T2IcpYxIY9p/5OUUeFs+ggOMIdJTz44OY+ 2nhnotknp9TmjupogU/86H2C6KV4y0vp+zz7DPa9KJSgPnHt4NqkDDPY91/itAqfSQkAI4pL+c1d3 i55AEWl1A==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kALSR-0008Lw-DC; Mon, 24 Aug 2020 23:00:55 +0000 Received: from mails.bitsofnetworks.org ([2001:912:1800:ff::131]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kALSK-0008If-Nh for openwrt-devel@lists.openwrt.org; Mon, 24 Aug 2020 23:00:51 +0000 Received: from [2001:912:1800::5c8] (helo=localhost.localdomain) by mails.bitsofnetworks.org with esmtp (Exim 4.89) (envelope-from ) id 1kALSH-000419-0N; Tue, 25 Aug 2020 01:00:45 +0200 From: Baptiste Jonglez To: openwrt-devel@lists.openwrt.org Subject: [PATCH opkg 5/5] opkg_verify_integrity: better logging and error conditions Date: Tue, 25 Aug 2020 01:00:32 +0200 Message-Id: <20200824230032.492951-6-baptiste@bitsofnetworks.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200824230032.492951-1-baptiste@bitsofnetworks.org> References: <20200824230032.492951-1-baptiste@bitsofnetworks.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200824_190049_227188_414A8F75 X-CRM114-Status: GOOD ( 16.25 ) X-Spam-Score: 0.0 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Baptiste Jonglez Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org From: Baptiste Jonglez The function now always returns an error if size/checksum don't match: we let the caller decide what to do with the result. In addition, most of the logging is also moved to the caller. We just keep logging for unexpected errors and a bit of debug at loglevel INFO. Signed-off-by: Baptiste Jonglez --- libopkg/opkg_download.c | 49 ++++++++++++++--------------------------- libopkg/opkg_install.c | 11 ++++++++- 2 files changed, 26 insertions(+), 34 deletions(-) diff --git a/libopkg/opkg_download.c b/libopkg/opkg_download.c index 3b79856..a9ebd58 100644 --- a/libopkg/opkg_download.c +++ b/libopkg/opkg_download.c @@ -55,16 +55,11 @@ int opkg_verify_integrity(pkg_t *pkg, const char *filename) pkg_expected_size = pkg_get_int(pkg, PKG_SIZE); if (pkg_expected_size > 0 && pkg_stat.st_size != pkg_expected_size) { - if (!conf->force_checksum) { - opkg_msg(ERROR, - "Package size mismatch: %s is %lld bytes, expecting %lld bytes\n", - pkg->name, (long long int)pkg_stat.st_size, pkg_expected_size); - return -1; - } else { - opkg_msg(NOTICE, - "Ignored %s size mismatch.\n", - pkg->name); - } + opkg_msg(INFO, + "Package size mismatch: %s is %lld bytes, expecting %lld bytes\n", + pkg->name, (long long int)pkg_stat.st_size, pkg_expected_size); + err = -1; + goto out; } /* Check for md5 values */ @@ -72,17 +67,11 @@ int opkg_verify_integrity(pkg_t *pkg, const char *filename) if (pkg_md5) { file_md5 = file_md5sum_alloc(filename); if (file_md5 && strcmp(file_md5, pkg_md5)) { - if (!conf->force_checksum) { - opkg_msg(ERROR, "Package %s md5sum mismatch. " - "Either the opkg or the package index are corrupt. " - "Try 'opkg update'.\n", pkg->name); - free(file_md5); - return -1; - } else { - opkg_msg(NOTICE, - "Ignored %s md5sum mismatch.\n", - pkg->name); - } + opkg_msg(INFO, "Package %s md5sum mismatch.\n", + pkg->name); + err = -1; + free(file_md5); + goto out; } if (file_md5) free(file_md5); @@ -93,23 +82,17 @@ int opkg_verify_integrity(pkg_t *pkg, const char *filename) if (pkg_sha256) { file_sha256 = file_sha256sum_alloc(filename); if (file_sha256 && strcmp(file_sha256, pkg_sha256)) { - if (!conf->force_checksum) { - opkg_msg(ERROR, - "Package %s sha256sum mismatch. " - "Either the opkg or the package index are corrupt. " - "Try 'opkg update'.\n", pkg->name); - free(file_sha256); - return -1; - } else { - opkg_msg(NOTICE, - "Ignored %s sha256sum mismatch.\n", - pkg->name); - } + opkg_msg(INFO, "Package %s sha256sum mismatch.\n", + pkg->name); + err = -1; + free(file_sha256); + goto out; } if (file_sha256) free(file_sha256); } +out: return err; } diff --git a/libopkg/opkg_install.c b/libopkg/opkg_install.c index e8eccf8..da55b48 100644 --- a/libopkg/opkg_install.c +++ b/libopkg/opkg_install.c @@ -1363,9 +1363,18 @@ int opkg_install_pkg(pkg_t * pkg, int from_upgrade) } #endif + /* Check integrity (size, checksums) */ err = opkg_verify_integrity(pkg, local_filename); - if (err) + if (err && !conf->force_checksum) { + opkg_msg(ERROR, "Checksum or size mismatch for package %s. " + "Either the opkg or the package index are corrupt. " + "Try 'opkg update'.\n", pkg->name); return -1; + } + if (err && conf->force_checksum) { + opkg_msg(NOTICE, "Ignored %s checksum or size mismatch.\n", + pkg->name); + } if (conf->download_only) { if (conf->nodeps == 0) {