luci-app-opkg: add ipk upload feature

Signed-off-by: Richard Yu <yurichard3839@gmail.com>
[fix duplicate upload errors, remove temporary file, tweak style]
Signed-off-by: Jo-Philipp Wich <jo@mein.io>

applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js

@@ -745,6 +745,7 @@ function handleRemove(ev)
 
 function handleOpkg(ev)
 {
+	return new Promise(function(resolveFn, rejectFn) {
 		var cmd = ev.target.getAttribute('data-command'),
 		    pkg = ev.target.getAttribute('data-package'),
 		    rem = document.querySelector('input[name="autoremove"]'),
@@ -773,12 +774,52 @@ function handleOpkg(ev)
 			dlg.appendChild(E('div', { 'class': 'right' },
 				E('div', {
 					'class': 'btn',
-				'click': function() {
+					'click': L.bind(function(res) {
 						L.hideModal();
 						updateLists();
-				}
+
+						if (res.code !== 0)
+							rejectFn(new Error(res.stderr || 'opkg error %d'.format(res.code)));
+						else
+							resolveFn(res);
+					}, this, res)
 				}, _('Dismiss'))));
 		});
+	});
+}
+
+function handleUpload(ev)
+{
+	var path = '/tmp/upload.ipk';
+	return L.ui.uploadFile(path).then(L.bind(function(btn, res) {
+		L.showModal(_('Manually install package'), [
+			E('p', {}, _('Installing packages from untrusted sources is a potential security risk! Really attempt to install <em>%h</em>?').format(res.name)),
+			E('ul', {}, [
+				res.size ? E('li', {}, '%s: %1024.2mB'.format(_('Size'), res.size)) : '',
+				res.checksum ? E('li', {}, '%s: %s'.format(_('MD5'), res.checksum)) : '',
+				res.sha256sum ? E('li', {}, '%s: %s'.format(_('SHA256'), res.sha256sum)) : ''
+			]),
+			E('div', { 'class': 'right' }, [
+				E('div', {
+					'click': function(ev) {
+						L.hideModal();
+						L.fs.remove(path);
+					},
+					'class': 'btn cbi-button-neutral'
+				}, _('Cancel')), ' ',
+				E('div', {
+					'class': 'btn cbi-button-action',
+					'data-command': 'install',
+					'data-package': path,
+					'click': function(ev) {
+						handleOpkg(ev).finally(function() {
+							L.fs.remove(path)
+						});
+					}
+				}, _('Install'))
+			])
+		]);
+	}, this, ev.target));
 }
 
 function updateLists()

applications/luci-app-opkg/luasrc/view/opkg.htm

@@ -28,6 +28,11 @@
 		min-width: 250px;
 	}
 
+	.controls > *:nth-child(2),
+	.controls > *:nth-child(3) {
+		flex-basis: 20%;
+	}
+
 	.controls > * > .btn {
 		flex-basis: 20px;
 		text-align: center;
@@ -107,6 +112,8 @@
 		<label><%:Actions%>:</label>
 		<button class="btn cbi-button-positive" data-command="update" onclick="handleOpkg(event)"><%:Update lists…%></button>
 		&#160;
+		<button class="btn cbi-button-action" onclick="handleUpload(event)"><%:Upload Package…%></button>
+		&#160;
 		<button class="btn cbi-button-neutral" onclick="handleConfig(event)"><%:Configure opkg…%></button>
 	</div>
 </div>

modules/luci-base/root/usr/share/rpcd/acl.d/luci-base.json

@@ -69,7 +69,8 @@
 				"/bin/tar": [ "exec" ],
 				"/bin/umount": [ "exec" ],
 				"/tmp/backup.tar.gz": [ "write" ],
-				"/tmp/firmware.bin": [ "write" ]
+				"/tmp/firmware.bin": [ "write" ],
+				"/tmp/upload.ipk": [ "write" ]
 			},
 			"ubus": {
 				"file": [ "write", "remove", "exec" ],