apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge release branch 4.14 to 4.15

Browse Source 
* 4.14:
  server: prevent update vm read-only details (#4629)
This commit is contained in:
Daan Hoogland 2021-02-02 09:16:34 +00:00
commit 66d49c5c0d
2 changed files with 38 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
View File

@ -2529,12 +2529,16 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
final List<String> userBlacklistedSettings = Stream.of(QueryService.UserVMBlacklistedDetails.value().split(","))
.map(item -> (item).trim())
.collect(Collectors.toList());
final List<String> userReadOnlySettings = Stream.of(QueryService.UserVMReadOnlyUIDetails.value().split(","))
.map(item -> (item).trim())
.collect(Collectors.toList());
if (cleanupDetails){
if (caller != null && caller.getType() == Account.ACCOUNT_TYPE_ADMIN) {
userVmDetailsDao.removeDetails(id);
} else {
for (final UserVmDetailVO detail : userVmDetailsDao.listDetails(id)) {
if (detail != null && !userBlacklistedSettings.contains(detail.getName())) {
if (detail != null && !userBlacklistedSettings.contains(detail.getName())
&& !userReadOnlySettings.contains(detail.getName())) {
userVmDetailsDao.removeDetail(id, detail.getName());
}
}
@ -2546,15 +2550,18 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
}
if (caller != null && caller.getType() != Account.ACCOUNT_TYPE_ADMIN) {
// Ensure blacklisted detail is not passed by non-root-admin user
// Ensure blacklisted or read-only detail is not passed by non-root-admin user
for (final String detailName : details.keySet()) {
if (userBlacklistedSettings.contains(detailName)) {
throw new InvalidParameterValueException("You're not allowed to add or edit the restricted setting: " + detailName);
}
if (userReadOnlySettings.contains(detailName)) {
throw new InvalidParameterValueException("You're not allowed to add or edit the read-only setting: " + detailName);
}
}
// Add any hidden/blacklisted detail
// Add any hidden/blacklisted or read-only detail
for (final UserVmDetailVO detail : userVmDetailsDao.listDetails(id)) {
if (userBlacklistedSettings.contains(detail.getName())) {
if (userBlacklistedSettings.contains(detail.getName()) || userReadOnlySettings.contains(detail.getName())) {
details.put(detail.getName(), detail.getValue());
}
}

32
ui/legacy/scripts/instances.js
View File

@ -3995,9 +3995,15 @@
// It could happen that a stale web page has been opened up when VM was stopped but
// vm was turned on through another route - UI or API. so we should check again.
var existingDetails = virtualMachine.details;
var readOnlyUIDetails = [];
if (virtualMachine.readonlyuidetails && virtualMachine.readonlyuidetails.length > 0) {
$.each(virtualMachine.readonlyuidetails.split(","), function(){
readOnlyUIDetails.push($.trim(this));
});
}
var newDetails = {};
for (d in existingDetails) {
if (d != data.name) {
if (d != data.name && $.inArray(d, readOnlyUIDetails) < 0) {
newDetails['details[0].' + d] = existingDetails[d];
}
}
@ -4043,9 +4049,15 @@
// vm was turned on through another route - UI or API. so we should check again.
var detailToDelete = args.data.jsonObj.name;
var existingDetails = virtualMachine.details;
var readOnlyUIDetails = [];
if (virtualMachine.readonlyuidetails && virtualMachine.readonlyuidetails.length > 0) {
$.each(virtualMachine.readonlyuidetails.split(","), function(){
readOnlyUIDetails.push($.trim(this));
});
}
var newDetails = {};
for (detail in existingDetails) {
if (detail != detailToDelete) {
if (detail != detailToDelete && $.inArray(detail, readOnlyUIDetails) < 0) {
newDetails['details[0].' + detail] = existingDetails[detail];
}
}
@ -4078,12 +4090,20 @@
var value = args.data.value;
var details;
var readOnlyUIDetails = [];
$.ajax({
url: createURL('listVirtualMachines&id=' + args.context.instances[0].id),
async:false,
success: function(json) {
var dets = json.listvirtualmachinesresponse.virtualmachine[0].details;
details = dets;
var virtualMachine = json.listvirtualmachinesresponse.virtualmachine[0]
if (virtualMachine) {
details = virtualMachine.details;
if (virtualMachine.readonlyuidetails && virtualMachine.readonlyuidetails.length > 0) {
$.each(virtualMachine.readonlyuidetails.split(","), function(){
readOnlyUIDetails.push($.trim(this));
});
}
}
},
error: function(json) {
@ -4093,7 +4113,9 @@
var detailsFormat = '';
for (key in details) {
detailsFormat += "details[0]." + key + "=" + details[key] + "&";
if ($.inArray(key, readOnlyUIDetails) < 0) {
detailsFormat += "details[0]." + key + "=" + details[key] + "&";
}
}
// Add new detail to the existing ones
detailsFormat += "details[0]." + name + "=" + value;