Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

luci-base: ui.js: warn about connectivity loss on changing iface settings

Browse source 
If specific settings such as the protocol, IP address or netmask of an
interface the user is connected to are changed, the apply/rollback
mechanism might interfere. Display an additional warning dialog in this
case, instructing the user to manually reconnect and offering to continue
with a less safe unchecked apply mechanism.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 733ee9a7b6)
This commit is contained in:
Jo-Philipp Wich 2022-05-06 13:39:36 +02:00
parent ea5f85f3f0
commit ef99568d88
1 changed files with 76 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
modules/luci-base/htdocs/luci-static/resources/ui.js
View file

@ -4460,6 +4460,26 @@ var UI = baseclass.extend(/** @lends LuCI.ui.prototype */ {
}
},
/** @private */
checkConnectivityAffected: function() {
return L.resolveDefault(fs.exec_direct('/usr/libexec/luci-peeraddr', null, 'json')).then(L.bind(function(info) {
if (L.isObject(info) && Array.isArray(info.inbound_interfaces)) {
for (var i = 0; i < info.inbound_interfaces.length; i++) {
var iif = info.inbound_interfaces[i];
for (var j = 0; this.changes && this.changes.network && j < this.changes.network.length; j++) {
var chg = this.changes.network[j];
if (chg[0] == 'set' && chg[1] == iif && (chg[2] == 'proto' || chg[2] == 'ipaddr' || chg[2] == 'netmask'))
return iif;
}
}
}
return null;
}, this));
},
/** @private */
rollback: function(checked) {
if (checked) {
@ -4597,6 +4617,35 @@ var UI = baseclass.extend(/** @lends LuCI.ui.prototype */ {
this.displayStatus('notice spinning',
E('p', _('Starting configuration apply…')));
(new Promise(function(resolveFn, rejectFn) {
if (!checked)
return resolveFn(false);
UI.prototype.changes.checkConnectivityAffected().then(function(affected) {
if (!affected)
return resolveFn(true);
UI.prototype.changes.displayStatus('warning', [
E('h4', _('Connectivity change')),
E('p', _('The network access to this device could be interrupted by changing settings of the "%h" interface.').format(affected)),
E('p', _('If the IP address used to access LuCI changes, a <strong>manual reconnect to the new IP</strong> is required within %d seconds to confirm the settings, otherwise modifications will be reverted.').format(L.env.apply_rollback)),
E('div', { 'class': 'right' }, [
E('button', {
'class': 'btn',
'click': rejectFn,
}, [ _('Cancel') ]), ' ',
E('button', {
'class': 'btn cbi-button-action important',
'click': resolveFn.bind(null, true)
}, [ _('Apply and revert on connectivity loss') ]), ' ',
E('button', {
'class': 'btn cbi-button-negative important',
'click': resolveFn.bind(null, false)
}, [ _('Apply and keep settings') ])
])
]);
});
})).then(function(checked) {
request.request(L.url('admin/uci', checked ? 'apply_rollback' : 'apply_unchecked'), {
method: 'post',
query: { sid: L.env.sessionid, token: L.env.token }
@ -4626,6 +4675,7 @@ var UI = baseclass.extend(/** @lends LuCI.ui.prototype */ {
}, L.env.apply_display * 1000);
}
});
}, this.displayStatus.bind(this, false));
},
/**