From patchwork Wed Sep 11 09:21:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= X-Patchwork-Id: 1160850 X-Patchwork-Delegate: zajec5@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="PghjeXiu"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="oFPiIAkH"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (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 46SxJ70WT9z9s00 for ; Wed, 11 Sep 2019 19:22:31 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Subject:MIME-Version:Message-Id:Date:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=5iWDhNAWeldnFTUx3FmwgMB3hC++vcEGrlVX6DOOUWA=; b=PghjeXiuVt+9vr CEPMC8tED6OiMnWkq2yz8+PnSyHPj+6xHu7i/BrsfqRDWpMi8gy4mJnohJpljG7u12GOZdOg/EVBu XgTgakc/HL3hdbvd9+/c+attl/o6qBG4ZcdqKWWU4c0INcDECMawGzWMTm/5PVDGQtYtw0AtgiPt0 zsLu5g7U/ZvBJ4jtqAVp/7aBI2C2z93LcWCbr32cLtAutv6Gf+xfIhbch1C/s1ZM67sJgzQNFM7rw 6qlzjLj+JgdO5KYvLCqOPbfoJVuPUXqOTsmnMSrEe1j2xoE49PA3DQ01B/z/LDxVGeiy9gxPKmbAz s2kWO7lMbUW4MBRWD0DA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1i7ypT-00020c-05; Wed, 11 Sep 2019 09:22:23 +0000 Received: from mail-lj1-x241.google.com ([2a00:1450:4864:20::241]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1i7ypP-00020H-3a for openwrt-devel@lists.openwrt.org; Wed, 11 Sep 2019 09:22:20 +0000 Received: by mail-lj1-x241.google.com with SMTP id q22so14702145ljj.2 for ; Wed, 11 Sep 2019 02:22:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=T0bE743lTpmK+k+K+4JbE3jOU1YMuaLljxOHBaWLmGo=; b=oFPiIAkHUNPKxEDB1i06SOpMbabFFbB1/wf5hC4tS3wxLv105BTgK6Z2aO6BuSNqSR x86g3y/3+e3XGmeoKNYaTc+UvXHBobf3jLVr6Qf0L+SNPijF0SNhhH5VKRzAnLsERSni kkR8qDsha61qXl68dJv+WWfHZyv9+6dS1rwF7iO7DgQ4Xd6hZRe799998ODgVtnTnFsh dLZ1xjEVEBQiYzVaE1ht0gaGnxQ8dmFaFXMtOcx3eU8s5vmkmEl46imcNBeO1+aOz3nz mFpwJGTewiF986nx/IXL979zcVQysoYRru0TYws91wdtmF9SzwVL/IafsAOynMe4Hm7L uAnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=T0bE743lTpmK+k+K+4JbE3jOU1YMuaLljxOHBaWLmGo=; b=KSkFSjm4+VF5nzL436PeLCDyuOZNOGDyxYHau4CfLh7FPpHms7jLAL3Ukeds6A8B9k /z+FLfK8GdXapt4FF8vcV5X5s1QilwnoyrZ1CU3rzZwzltX7vd12fUk57xFyTZ1e0K9h 7bHbbk1WrkolbgBal91bKSqec4t/xpN+144jT88Ahph5NrjonHbYm2iPWpDLK//im8GK gJBicowLAZtSOCES+dBG3BMoHR1vTUgNqGuZGfzxsJ1cnwMU5s17gSuWCr7L4p/rW06+ WQIgJcdK0Rhtix49aGQqIt2Q4pO+z9sqlKGwJ2BPNtcH6Ijmv4UGcILMXXP4ZO1xJ7ag aTRQ== X-Gm-Message-State: APjAAAU0y8R61uUM23TxTHf3A2O8/wlmih4nE53X2aXg/keYh4g9F/C/ xyenYomF4jUWBjJzF2d0jbhRvTwS X-Google-Smtp-Source: APXvYqw1Naws99HbV6eb+NO6cwgYOEe0zyKQZJaAkAODOcFbDma5WQzuejJ6EeGYYIykbLNgTatZUw== X-Received: by 2002:a2e:5bdd:: with SMTP id m90mr22136224lje.193.1568193736696; Wed, 11 Sep 2019 02:22:16 -0700 (PDT) Received: from localhost.localdomain (ip-194-187-74-233.konfederacka.maverick.com.pl. [194.187.74.233]) by smtp.gmail.com with ESMTPSA id h7sm1713162ljc.39.2019.09.11.02.22.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 11 Sep 2019 02:22:16 -0700 (PDT) From: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= To: openwrt-devel@lists.openwrt.org Date: Wed, 11 Sep 2019 11:21:59 +0200 Message-Id: <20190911092159.29837-1-zajec5@gmail.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190911_022219_146804_CCB8D976 X-CRM114-Status: GOOD ( 10.52 ) X-Spam-Score: 0.1 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (0.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:241 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (zajec5[at]gmail.com) 0.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit (zajec5[at]gmail.com) 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain Subject: [OpenWrt-Devel] [PATCH procd] system: sysupgrade: send reply on error X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org From: Rafał Miłecki This provides some meaningful info on why sysupgrade has failed. Signed-off-by: Rafał Miłecki --- system.c | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/system.c b/system.c index 2a5d5bc..4068e64 100644 --- a/system.c +++ b/system.c @@ -508,6 +508,21 @@ static const struct blobmsg_policy sysupgrade_policy[__SYSUPGRADE_MAX] = { [SYSUPGRADE_OPTIONS] = { .name = "options", .type = BLOBMSG_TYPE_TABLE }, }; +static void sysupgrade_error(struct ubus_context *ctx, + struct ubus_request_data *req, + const char *message) +{ + void *c; + + blob_buf_init(&b, 0); + + c = blobmsg_open_table(&b, "error"); + blobmsg_add_string(&b, "message", message); + blobmsg_close_table(&b, c); + + ubus_send_reply(ctx, req, b.head); +} + static int sysupgrade(struct ubus_context *ctx, struct ubus_object *obj, struct ubus_request_data *req, const char *method, struct blob_attr *msg) @@ -534,8 +549,10 @@ static int sysupgrade(struct ubus_context *ctx, struct ubus_object *obj, if (!tb[SYSUPGRADE_PATH] || !tb[SYSUPGRADE_PREFIX]) return UBUS_STATUS_INVALID_ARGUMENT; - if (validate_firmware_image_call(blobmsg_get_string(tb[SYSUPGRADE_PATH]))) + if (validate_firmware_image_call(blobmsg_get_string(tb[SYSUPGRADE_PATH]))) { + sysupgrade_error(ctx, req, "Firmware image couldn't be validated"); return UBUS_STATUS_UNKNOWN_ERROR; + } blobmsg_parse(validation_policy, __VALIDATION_MAX, validation, blob_data(b.head), blob_len(b.head)); @@ -545,14 +562,14 @@ static int sysupgrade(struct ubus_context *ctx, struct ubus_object *obj, if (!valid) { if (!forceable) { - fprintf(stderr, "Firmware image is broken and cannot be installed\n"); + sysupgrade_error(ctx, req, "Firmware image is broken and cannot be installed"); return UBUS_STATUS_NOT_SUPPORTED; } else if (!tb[SYSUPGRADE_FORCE] || !blobmsg_get_bool(tb[SYSUPGRADE_FORCE])) { - fprintf(stderr, "Firmware image is invalid\n"); + sysupgrade_error(ctx, req, "Firmware image is invalid"); return UBUS_STATUS_NOT_SUPPORTED; } } else if (!allow_backup && tb[SYSUPGRADE_BACKUP]) { - fprintf(stderr, "Firmware image doesn't allow preserving a backup\n"); + sysupgrade_error(ctx, req, "Firmware image doesn't allow preserving a backup"); return UBUS_STATUS_NOT_SUPPORTED; }