NuKVM/xen-orchestra
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(xo-server/VIF): set MAC address requires Admin ACL on network (#5631)

Browse Source 
Fixes #4700
This commit is contained in:
Mathieu 2021-03-05 09:27:22 +01:00 committed by GitHub
parent 6ea71ec6a2
commit 872b05a7de
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.unreleased.md
View File

@ -7,6 +7,8 @@
> Users must be able to say: “Nice enhancement, I'm eager to test it” > Users must be able to say: “Nice enhancement, I'm eager to test it”
- [VIF] To edit MAC address on a VIF, user has to be operator of the VIF and administrator of its network [#4700](https://github.com/vatesfr/xen-orchestra/issues/4700) (PR [#5631](https://github.com/vatesfr/xen-orchestra/pull/5631))
### Bug fixes ### Bug fixes
> Users must be able to say: “I had this issue, happy to know it's fixed” > Users must be able to say: “I had this issue, happy to know it's fixed”
@ -31,4 +33,4 @@
> In case of conflict, the highest (lowest in previous list) `$version` wins. > In case of conflict, the highest (lowest in previous list) `$version` wins.
- xo-server minor - xo-server minor
- xo-web patch - xo-web patch

3
packages/xo-server/src/api/vif.js
View File

@ -89,6 +89,9 @@ export async function set({
if (isNetworkChanged || mac) { if (isNetworkChanged || mac) {
const networkId = network?.id const networkId = network?.id
if (mac !== undefined && this.user.permission !== 'admin') {
await this.checkPermissions(this.user.id, [[networkId ?? vif.$network, 'administrate']])
}
if (networkId !== undefined && this.user.permission !== 'admin') { if (networkId !== undefined && this.user.permission !== 'admin') {
if (resourceSet !== undefined) { if (resourceSet !== undefined) {
await this.checkResourceSetConstraints(resourceSet, this.user.id, [networkId]) await this.checkResourceSetConstraints(resourceSet, this.user.id, [networkId])