Proxmox/pve-manager
5
0
Fork 0
Code Pull Requests Releases Activity

ui: firewall: refactor privilege checks and prevent double click

Browse Source 
factor out the relevant privilege checks in a variable and reuse that,
also add the check in the run_editor (or wrap it with a check) so that
the edit windows don't open with a double click without those privileges

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
This commit is contained in:
Dominik Csapak 2023-06-07 09:18:48 +02:00
parent 2e37e77902
commit 1056e10c4b
5 changed files with 28 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
www/manager6/dc/SecurityGroups.js
View File

@ -101,6 +101,7 @@ Ext.define('PVE.SecurityGroupList', {
let sm = Ext.create('Ext.selection.RowModel', {}); let sm = Ext.create('Ext.selection.RowModel', {});
let caps = Ext.state.Manager.get('GuiCap'); let caps = Ext.state.Manager.get('GuiCap');
let canEdit = !!caps.dc['Sys.Modify'];
let reload = function() { let reload = function() {
let oldrec = sm.getSelection()[0]; let oldrec = sm.getSelection()[0];
@ -116,7 +117,7 @@ Ext.define('PVE.SecurityGroupList', {
let run_editor = function() { let run_editor = function() {
let rec = sm.getSelection()[0]; let rec = sm.getSelection()[0];
if (!rec) { if (!rec || !canEdit) {
return; return;
} }
Ext.create('PVE.SecurityGroupEdit', { Ext.create('PVE.SecurityGroupEdit', {
@ -132,14 +133,14 @@ Ext.define('PVE.SecurityGroupList', {
me.editBtn = new Proxmox.button.Button({ me.editBtn = new Proxmox.button.Button({
text: gettext('Edit'), text: gettext('Edit'),
enableFn: rec => !!caps.dc['Sys.Modify'], enableFn: rec => canEdit,
disabled: true, disabled: true,
selModel: sm, selModel: sm,
handler: run_editor, handler: run_editor,
}); });
me.addBtn = new Proxmox.button.Button({ me.addBtn = new Proxmox.button.Button({
text: gettext('Create'), text: gettext('Create'),
disabled: !caps.dc['Sys.Modify'], disabled: !canEdit,
handler: function() { handler: function() {
sm.deselectAll(); sm.deselectAll();
var win = Ext.create('PVE.SecurityGroupEdit', {}); var win = Ext.create('PVE.SecurityGroupEdit', {});
@ -151,12 +152,7 @@ Ext.define('PVE.SecurityGroupList', {
me.removeBtn = Ext.create('Proxmox.button.StdRemoveButton', { me.removeBtn = Ext.create('Proxmox.button.StdRemoveButton', {
selModel: sm, selModel: sm,
baseurl: me.base_url + '/', baseurl: me.base_url + '/',
enableFn: function(rec) { enableFn: (rec) => canEdit && rec && me.base_url,
if (!caps.dc['Sys.Modify']) {
return false;
}
return rec && me.base_url;
},
callback: () => reload(), callback: () => reload(),
}); });

5
www/manager6/grid/FirewallAliases.js
View File

@ -105,6 +105,7 @@ Ext.define('PVE.FirewallAliases', {
let sm = Ext.create('Ext.selection.RowModel', {}); let sm = Ext.create('Ext.selection.RowModel', {});
let caps = Ext.state.Manager.get('GuiCap'); let caps = Ext.state.Manager.get('GuiCap');
let canEdit = !!caps.vms['VM.Config.Network'] || !!caps.dc['Sys.Modify'] || !!caps.nodes['Sys.Modify'];
let reload = function() { let reload = function() {
let oldrec = sm.getSelection()[0]; let oldrec = sm.getSelection()[0];
@ -120,7 +121,7 @@ Ext.define('PVE.FirewallAliases', {
let run_editor = function() { let run_editor = function() {
let rec = me.getSelectionModel().getSelection()[0]; let rec = me.getSelectionModel().getSelection()[0];
if (!rec) { if (!rec || !canEdit) {
return; return;
} }
let win = Ext.create('PVE.FirewallAliasEdit', { let win = Ext.create('PVE.FirewallAliasEdit', {
@ -135,7 +136,7 @@ Ext.define('PVE.FirewallAliases', {
text: gettext('Edit'), text: gettext('Edit'),
disabled: true, disabled: true,
selModel: sm, selModel: sm,
enableFn: rec => !!caps.vms['VM.Config.Network'] || !!caps.dc['Sys.Modify'] || !!caps.nodes['Sys.Modify'], enableFn: rec => canEdit,
handler: run_editor, handler: run_editor,
}); });

5
www/manager6/grid/FirewallOptions.js
View File

@ -22,6 +22,7 @@ Ext.define('PVE.FirewallOptions', {
} }
let caps = Ext.state.Manager.get('GuiCap'); let caps = Ext.state.Manager.get('GuiCap');
let canEdit = caps.vms['VM.Config.Network'] || caps.dc['Sys.Modify'] || caps.nodes['Sys.Modify'];
me.rows = {}; me.rows = {};
@ -163,7 +164,7 @@ Ext.define('PVE.FirewallOptions', {
return; return;
} }
var rowdef = me.rows[rec.data.key]; var rowdef = me.rows[rec.data.key];
if (caps.vms['VM.Config.Network'] || caps.dc['Sys.Modify'] || caps.nodes['Sys.Modify']) { if (canEdit) {
edit_btn.setDisabled(!rowdef.editor); edit_btn.setDisabled(!rowdef.editor);
} }
}; };
@ -175,7 +176,7 @@ Ext.define('PVE.FirewallOptions', {
url: '/api2/extjs/' + me.base_url, url: '/api2/extjs/' + me.base_url,
}, },
listeners: { listeners: {
itemdblclick: me.run_editor, itemdblclick: () => { if (canEdit) { me.run_editor(); } },
selectionchange: set_button_status, selectionchange: set_button_status,
}, },
}); });

11
www/manager6/grid/FirewallRules.js
View File

@ -569,7 +569,7 @@ Ext.define('PVE.FirewallRules', {
} }
me.store.removeAll(); me.store.removeAll();
} else { } else {
if (me.caps.vms['VM.Config.Network'] || me.caps.dc['Sys.Modify'] || me.caps.nodes['Sys.Modify']) { if (me.canEdit) {
me.addBtn.setDisabled(false); me.addBtn.setDisabled(false);
if (me.groupBtn) { if (me.groupBtn) {
me.groupBtn.setDisabled(false); me.groupBtn.setDisabled(false);
@ -653,10 +653,11 @@ Ext.define('PVE.FirewallRules', {
var sm = Ext.create('Ext.selection.RowModel', {}); var sm = Ext.create('Ext.selection.RowModel', {});
me.caps = Ext.state.Manager.get('GuiCap'); me.caps = Ext.state.Manager.get('GuiCap');
me.canEdit = !!me.caps.vms['VM.Config.Network'] || !!me.caps.dc['Sys.Modify'] || !!me.caps.nodes['Sys.Modify'];
var run_editor = function() { var run_editor = function() {
var rec = sm.getSelection()[0]; var rec = sm.getSelection()[0];
if (!rec) { if (!rec || !me.canEdit) {
return; return;
} }
var type = rec.data.type; var type = rec.data.type;
@ -685,7 +686,7 @@ Ext.define('PVE.FirewallRules', {
me.editBtn = Ext.create('Proxmox.button.Button', { me.editBtn = Ext.create('Proxmox.button.Button', {
text: gettext('Edit'), text: gettext('Edit'),
disabled: true, disabled: true,
enableFn: rec => !!me.caps.vms['VM.Config.Network'] || !!me.caps.dc['Sys.Modify'] || !!me.caps.nodes['Sys.Modify'], enableFn: rec => me.canEdit,
selModel: sm, selModel: sm,
handler: run_editor, handler: run_editor,
}); });
@ -727,7 +728,7 @@ Ext.define('PVE.FirewallRules', {
me.copyBtn = Ext.create('Proxmox.button.Button', { me.copyBtn = Ext.create('Proxmox.button.Button', {
text: gettext('Copy'), text: gettext('Copy'),
selModel: sm, selModel: sm,
enableFn: ({ data }) => (data.type === 'in' || data.type === 'out') && (!!me.caps.vms['VM.Config.Network'] || !!me.caps.dc['Sys.Modify'] || !!me.caps.nodes['Sys.Modify']), enableFn: ({ data }) => (data.type === 'in' || data.type === 'out') && me.canEdit,
disabled: true, disabled: true,
handler: run_copy_editor, handler: run_copy_editor,
}); });
@ -749,7 +750,7 @@ Ext.define('PVE.FirewallRules', {
} }
me.removeBtn = Ext.create('Proxmox.button.StdRemoveButton', { me.removeBtn = Ext.create('Proxmox.button.StdRemoveButton', {
enableFn: rec => !!me.caps.vms['VM.Config.Network'] || !!me.caps.dc['Sys.Modify'] || !!me.caps.nodes['Sys.Modify'], enableFn: rec => me.canEdit,
selModel: sm, selModel: sm,
baseurl: me.base_url + '/', baseurl: me.base_url + '/',
confirmMsg: false, confirmMsg: false,

20
www/manager6/panel/IPSet.js
View File

@ -43,6 +43,7 @@ Ext.define('PVE.IPSetList', {
}); });
var caps = Ext.state.Manager.get('GuiCap'); var caps = Ext.state.Manager.get('GuiCap');
let canEdit = !!caps.vms['VM.Config.Network'] || !!caps.dc['Sys.Modify'] || !!caps.nodes['Sys.Modify'];
var sm = Ext.create('Ext.selection.RowModel', {}); var sm = Ext.create('Ext.selection.RowModel', {});
@ -60,7 +61,7 @@ Ext.define('PVE.IPSetList', {
var run_editor = function() { var run_editor = function() {
var rec = sm.getSelection()[0]; var rec = sm.getSelection()[0];
if (!rec) { if (!rec || !canEdit) {
return; return;
} }
var win = Ext.create('Proxmox.window.Edit', { var win = Ext.create('Proxmox.window.Edit', {
@ -96,7 +97,7 @@ Ext.define('PVE.IPSetList', {
me.editBtn = new Proxmox.button.Button({ me.editBtn = new Proxmox.button.Button({
text: gettext('Edit'), text: gettext('Edit'),
disabled: true, disabled: true,
enableFn: rec => !!caps.vms['VM.Config.Network'] || !!caps.dc['Sys.Modify'] || !!caps.nodes['Sys.Modify'], enableFn: rec => canEdit,
selModel: sm, selModel: sm,
handler: run_editor, handler: run_editor,
}); });
@ -131,7 +132,7 @@ Ext.define('PVE.IPSetList', {
}); });
me.removeBtn = Ext.create('Proxmox.button.StdRemoveButton', { me.removeBtn = Ext.create('Proxmox.button.StdRemoveButton', {
enableFn: rec => !!caps.vms['VM.Config.Network'] || !!caps.dc['Sys.Modify'] || !!caps.nodes['Sys.Modify'], enableFn: rec => canEdit,
selModel: sm, selModel: sm,
baseurl: me.base_url + '/', baseurl: me.base_url + '/',
callback: reload, callback: reload,
@ -158,7 +159,7 @@ Ext.define('PVE.IPSetList', {
}, },
}); });
if (!caps.vms['VM.Config.Network'] && !caps.dc['Sys.Modify'] && !caps.nodes['Sys.Modify']) { if (!canEdit) {
me.addBtn.setDisabled(true); me.addBtn.setDisabled(true);
} }
@ -276,7 +277,7 @@ Ext.define('PVE.IPSetGrid', {
me.addBtn.setDisabled(true); me.addBtn.setDisabled(true);
me.store.removeAll(); me.store.removeAll();
} else { } else {
if (me.caps.vms['VM.Config.Network'] || me.caps.dc['Sys.Modify'] || me.caps.nodes['Sys.Modify']) { if (me.canEdit) {
me.addBtn.setDisabled(false); me.addBtn.setDisabled(false);
} }
me.removeBtn.baseurl = url + '/'; me.removeBtn.baseurl = url + '/';
@ -307,10 +308,11 @@ Ext.define('PVE.IPSetGrid', {
var sm = Ext.create('Ext.selection.RowModel', {}); var sm = Ext.create('Ext.selection.RowModel', {});
me.caps = Ext.state.Manager.get('GuiCap'); me.caps = Ext.state.Manager.get('GuiCap');
me.canEdit = !!me.caps.vms['VM.Config.Network'] || !!me.caps.dc['Sys.Modify'] || !!me.caps.nodes['Sys.Modify'];
var run_editor = function() { var run_editor = function() {
var rec = sm.getSelection()[0]; var rec = sm.getSelection()[0];
if (!rec) { if (!rec || !me.canEdit) {
return; return;
} }
var win = Ext.create('PVE.IPSetCidrEdit', { var win = Ext.create('PVE.IPSetCidrEdit', {
@ -324,7 +326,7 @@ Ext.define('PVE.IPSetGrid', {
me.editBtn = new Proxmox.button.Button({ me.editBtn = new Proxmox.button.Button({
text: gettext('Edit'), text: gettext('Edit'),
disabled: true, disabled: true,
enableFn: rec => !!me.caps.vms['VM.Config.Network'] || !!me.caps.dc['Sys.Modify'] || !!me.caps.nodes['Sys.Modify'], enableFn: rec => me.canEdit,
selModel: sm, selModel: sm,
handler: run_editor, handler: run_editor,
}); });
@ -332,7 +334,7 @@ Ext.define('PVE.IPSetGrid', {
me.addBtn = new Proxmox.button.Button({ me.addBtn = new Proxmox.button.Button({
text: gettext('Add'), text: gettext('Add'),
disabled: true, disabled: true,
enableFn: rec => !!me.caps.vms['VM.Config.Network'] || !!me.caps.dc['Sys.Modify'] || !!me.caps.nodes['Sys.Modify'], enableFn: rec => me.canEdit,
handler: function() { handler: function() {
if (!me.base_url) { if (!me.base_url) {
return; return;
@ -348,7 +350,7 @@ Ext.define('PVE.IPSetGrid', {
me.removeBtn = Ext.create('Proxmox.button.StdRemoveButton', { me.removeBtn = Ext.create('Proxmox.button.StdRemoveButton', {
disabled: true, disabled: true,
enableFn: rec => !!me.caps.vms['VM.Config.Network'] || !!me.caps.dc['Sys.Modify'] || !!me.caps.nodes['Sys.Modify'], enableFn: rec => me.canEdit,
selModel: sm, selModel: sm,
baseurl: me.base_url + '/', baseurl: me.base_url + '/',
callback: reload, callback: reload,