From patchwork Wed Sep 23 11:57:30 2020 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: 1369848 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=fail (p=none dis=none) header.from=gmail.com 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=Lt1wcii2; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=kU3ouEcm; 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 4BxGvJ1qGzz9sR4 for ; Wed, 23 Sep 2020 21:59:55 +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: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:In-Reply-To:References:List-Owner; bh=pFBVulfGKJs6+neLYrL4sZ3Wnw587DWWMXgMOQFucgw=; b=Lt1wcii2sTitkgunDpeMlmtIRD SIvC6Q/RRX9Ir8ut6srIDlIL74ZKP0d5DbBXoBKnCBV8G0Cat1KA85j13k5XeZP6L+NHWY8bUBjN4 TXC6Yl/OE09vyDQRTsF9rSw1g8Dd3Bqy+cvqlyMM8DOIP7UON6UA/dmgdmgf1P0hOS/YIFR26pHEP quiN8tvjavj+eX8inZVXVCNS8D35rMsqSc6AmiDqA8sJG5TgX+q4/GlGUAeTKuJcr2pDbVmgVFuBz xYZgE/OWVcKF4XQy5zdj/JFkb6Luh0fQF4wu187UFFkg9qSsREGVKEyNqP1yDfQXCWt43dZTv5bwr MqohCGZA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kL3PD-0008SC-VU; Wed, 23 Sep 2020 11:57:52 +0000 Received: from mail-lf1-x130.google.com ([2a00:1450:4864:20::130]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kL3PB-0008RU-Nf for openwrt-devel@lists.openwrt.org; Wed, 23 Sep 2020 11:57:50 +0000 Received: by mail-lf1-x130.google.com with SMTP id y11so21760923lfl.5 for ; Wed, 23 Sep 2020 04:57:48 -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=BwroCw2w+lNTKIFmFQGI3cknRQdTTNL3Godw8ZC5hk4=; b=kU3ouEcmOIjw8BS/Oq2+ydo0jh3qlpEpXh5EaIa88ecMcLhLkbL/ci4YcFxaLk9SP0 1PpDQY+w70uZ2vLqZ3mtrn/rO45aCB4Op1m8d0bW5dvTiIYOzTCvWORIOcoevbf3ZlWQ iznG9ltz9Kin3N1EKo5MULeGU6Eus47HdDgjUIL6I4YZ6wpovTm384Um30zNNg4j5U7W /x0vXbhTx7cyTSY93fWG7gskfU/nfg2jL5yv45c8srWk2cR02tDqg+qKY0pKXpfYJo3P c0hnbks4RSZMyCXzsxLJPNrTrnW4/jorirICxNOFWW6q8wBO1kjsel7q6ZNEcwQG2PRN DAXg== 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=BwroCw2w+lNTKIFmFQGI3cknRQdTTNL3Godw8ZC5hk4=; b=l2JSg9TX55MOImVmH5AyaGsanGZPtVn7EwSm1qOH9OqmS0oy+DbrWhjBDrHlGlOCbu Kx49irne5xoyPIhgTtpRhyAWxVuVfEGWTQj4rQMUXPId0zivjkgp6eAd0WwLRpa5U6cC aNsZAhK+ZOdjAlDRFXHC2kYd0mgMchCTjDHoxBgfrY6uPSXHg+KhNvB2qw/pwoYHG1T9 sbOEAeq1tH8i0Y8wOToO+HZhzyaS7TxVILrm+Kv4DPBvPjugzEvlHWxM2WNFldcgzsyo Gg3ktNrgXFqtGqoRoC8+gjYrUS+l3epzeox6QVBpOF/ccz/td5jhee9K7sA/37IkbR0K yGSQ== X-Gm-Message-State: AOAM531DF7KnUEis2h2mv9LTFbE7nSs3vud/Mks0qYaWBV7jXBLc2e0K s/q0pk5N0mAOpmJL0CLoLvgof/o+QQY= X-Google-Smtp-Source: ABdhPJylX4QwPK1BF7DiurLZxZNVJ2dsYC345+xSlRnYC4xrR5m2Ay0Wn1P5X9Q4ny26SWVfvQoDiQ== X-Received: by 2002:ac2:51aa:: with SMTP id f10mr3182972lfk.451.1600862266902; Wed, 23 Sep 2020 04:57:46 -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 t13sm5088257ljc.70.2020.09.23.04.57.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Sep 2020 04:57:46 -0700 (PDT) From: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= To: openwrt-devel@lists.openwrt.org Subject: [PATCH luci] luci-base: don't append object.method to the RPC url Date: Wed, 23 Sep 2020 13:57:30 +0200 Message-Id: <20200923115730.23743-1-zajec5@gmail.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200923_075749_789418_4EE0B35F X-CRM114-Status: GOOD ( 11.54 ) X-Spam-Score: 0.1 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.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:130 listed in] [list.dnswl.org] 0.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit [zajec5[at]gmail.com] -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.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_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 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: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= , Jo-Philipp Wich Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org From: Rafał Miłecki It was a cosmetic feature that doesn't work anymore with the latest uhttpd ubus API. Adding RESTful API resulted in treating URL part following the /ubus/ as the new API request. --- modules/luci-base/htdocs/luci-static/resources/rpc.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/modules/luci-base/htdocs/luci-static/resources/rpc.js b/modules/luci-base/htdocs/luci-static/resources/rpc.js index 7bfc91336..f37f7bb6a 100644 --- a/modules/luci-base/htdocs/luci-static/resources/rpc.js +++ b/modules/luci-base/htdocs/luci-static/resources/rpc.js @@ -33,9 +33,6 @@ return baseclass.extend(/** @lends LuCI.rpc.prototype */ { req[i].params[2] ); } - else if (req.params) { - q += '/%s.%s'.format(req.params[1], req.params[2]); - } return request.post(rpcBaseURL + q, req, { timeout: (L.env.rpctimeout || 20) * 1000,