From patchwork Mon Aug 24 23:00:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baptiste Jonglez X-Patchwork-Id: 1350730 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=oJyJQ0hM; 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 4Bb71z5MFXz9sTR for ; Tue, 25 Aug 2020 09:02:47 +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=Sk8Gi9xmWD4S04upt8rh1P5/0a/4oyOxfJHJ8EosXJg=; b=oJyJQ0hMkOderkWY//tWJFvgS oJEVA2/G7HUwwRoBFz/FNX6mNwOC1B6BmwA5V7pDzD2Qvmf1ZzEtskrJCdZcBm/7BA0rRCrDYoXcU UZjpsCLR0pyrokJYtcQuVdUD3ZB5mZHxLU0tUmmi3WS8yk5QGAfxEabFl9bHja8rx7qlPHwfZiH03 CuWOMdU5HEqA3vNgtjsfI9WEpVX3HV4iw0sB2vHUDv5noKe0PlNg6xOptSbuKFFvX2Qney/KquKbv KmOgzq26VttL74sCaaYzhEk0DWCUo8vzO4skAiP/3TPok8Jf+tW+vSVjjAszM4dOwFNivP6qzoQTt geDtIfK1w==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kALSY-0008O0-Ba; Mon, 24 Aug 2020 23:01:02 +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-0008Id-Ng 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 1kALSG-000419-SE; Tue, 25 Aug 2020 01:00:44 +0200 From: Baptiste Jonglez To: openwrt-devel@lists.openwrt.org Subject: [PATCH opkg 2/5] libopkg: factor out checksum and size verification Date: Tue, 25 Aug 2020 01:00:29 +0200 Message-Id: <20200824230032.492951-3-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_111173_6866E563 X-CRM114-Status: GOOD ( 19.32 ) 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 This is a sizeable chunk of code that be can pretty well isolated in its own function. This refactoring will be necessary for an upcoming feature in which opkg_download_pkg() will need to verify the checksum of packages in the cache. This is the reason why the new function is located in `opkg_download.c`. Signed-off-by: Baptiste Jonglez --- libopkg/opkg_download.c | 78 +++++++++++++++++++++++++++++++++++++++++ libopkg/opkg_download.h | 1 + libopkg/opkg_install.c | 71 ++----------------------------------- 3 files changed, 81 insertions(+), 69 deletions(-) diff --git a/libopkg/opkg_download.c b/libopkg/opkg_download.c index 97df37f..f7c2f88 100644 --- a/libopkg/opkg_download.c +++ b/libopkg/opkg_download.c @@ -35,6 +35,84 @@ static int str_starts_with(const char *str, const char *prefix) return (strncmp(str, prefix, strlen(prefix)) == 0); } +int opkg_verify_integrity(pkg_t *pkg, const char *filename) +{ + int err = 0; + char *file_md5, *pkg_md5; + char *file_sha256, *pkg_sha256; + struct stat pkg_stat; + long long int pkg_expected_size; + + /* Check file size */ + err = lstat(filename, &pkg_stat); + + if (err) { + opkg_msg(ERROR, "Failed to stat %s: %s\n", + filename, strerror(errno)); + return err; + } + + 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); + } + } + + /* Check for md5 values */ + pkg_md5 = pkg_get_md5(pkg); + 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); + } + } + if (file_md5) + free(file_md5); + } + + /* Check for sha256 value */ + pkg_sha256 = pkg_get_sha256(pkg); + 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); + } + } + if (file_sha256) + free(file_sha256); + } + + return err; +} + int opkg_download(const char *src, const char *dest_file_name, const short hide_error) diff --git a/libopkg/opkg_download.h b/libopkg/opkg_download.h index fd260bc..863bcf2 100644 --- a/libopkg/opkg_download.h +++ b/libopkg/opkg_download.h @@ -20,6 +20,7 @@ #include "pkg.h" +int opkg_verify_integrity(pkg_t *pkg, const char *filename); int opkg_download(const char *src, const char *dest_file_name, const short hide_error); int opkg_download_pkg(pkg_t * pkg, const char *dir); diff --git a/libopkg/opkg_install.c b/libopkg/opkg_install.c index 27c9484..e8eccf8 100644 --- a/libopkg/opkg_install.c +++ b/libopkg/opkg_install.c @@ -1250,12 +1250,8 @@ int opkg_install_pkg(pkg_t * pkg, int from_upgrade) pkg_vec_t *replacees; abstract_pkg_t *ab_pkg = NULL; int old_state_flag; - char *file_md5, *pkg_md5; - char *file_sha256, *pkg_sha256; sigset_t newset, oldset; const char *local_filename; - long long int pkg_expected_size; - struct stat pkg_stat; time_t now; if (from_upgrade) @@ -1367,72 +1363,9 @@ int opkg_install_pkg(pkg_t * pkg, int from_upgrade) } #endif - /* Check file size */ - err = lstat(local_filename, &pkg_stat); - - if (err) { - opkg_msg(ERROR, "Failed to stat %s: %s\n", - local_filename, strerror(errno)); + err = opkg_verify_integrity(pkg, local_filename); + if (err) return -1; - } - - 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); - } - } - - /* Check for md5 values */ - pkg_md5 = pkg_get_md5(pkg); - if (pkg_md5) { - file_md5 = file_md5sum_alloc(local_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); - } - } - if (file_md5) - free(file_md5); - } - - /* Check for sha256 value */ - pkg_sha256 = pkg_get_sha256(pkg); - if (pkg_sha256) { - file_sha256 = file_sha256sum_alloc(local_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); - } - } - if (file_sha256) - free(file_sha256); - } if (conf->download_only) { if (conf->nodeps == 0) {