public inbox for pve-devel@lists.proxmox.com
 help / color / mirror / Atom feed
* [pve-devel] [PATCH stable-7 access-control 1/2] access control: add /sdn/zones/<zone>/<vnet>/<vlan> path
@ 2023-06-09  8:47 Fabian Grünbichler
  2023-06-09  8:47 ` [pve-devel] [PATCH stable-7 access-control 2/2] add new SDN.use privilege in PVESDNUser role Fabian Grünbichler
  2023-06-09  8:51 ` [pve-devel] [PATCH stable-7 access-control 1/2] access control: add /sdn/zones/<zone>/<vnet>/<vlan> path Thomas Lamprecht
  0 siblings, 2 replies; 3+ messages in thread
From: Fabian Grünbichler @ 2023-06-09  8:47 UTC (permalink / raw)
  To: pve-devel

From: Alexandre Derumier <aderumier@odiso.com>

Signed-off-by: Alexandre Derumier <aderumier@odiso.com>

FG: add missing /sdn/zones path

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>

backport: drop removal of /sdn/vnet/.. path

(cherry picked from commit 4d5b0937a3497282aae4d3e8fafbe519c9ef4ea2)

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
---
 src/PVE/AccessControl.pm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/PVE/AccessControl.pm b/src/PVE/AccessControl.pm
index 89b7d90..8d48089 100644
--- a/src/PVE/AccessControl.pm
+++ b/src/PVE/AccessControl.pm
@@ -1282,8 +1282,11 @@ sub check_path {
 	|/pool
 	|/pool/[[:alnum:]\.\-\_]+
 	|/sdn
-	|/sdn/zones/[[:alnum:]\.\-\_]+
 	|/sdn/vnets/[[:alnum:]\.\-\_]+
+	|/sdn/zones
+	|/sdn/zones/[[:alnum:]\.\-\_]+
+	|/sdn/zones/[[:alnum:]\.\-\_]+/[[:alnum:]\.\-\_]+
+	|/sdn/zones/[[:alnum:]\.\-\_]+/[[:alnum:]\.\-\_]+/[1-9][0-9]{0,3}
 	|/storage
 	|/storage/[[:alnum:]\.\-\_]+
 	|/vms
-- 
2.39.2





^ permalink raw reply	[flat|nested] 3+ messages in thread

* [pve-devel] [PATCH stable-7 access-control 2/2] add new SDN.use privilege in PVESDNUser role
  2023-06-09  8:47 [pve-devel] [PATCH stable-7 access-control 1/2] access control: add /sdn/zones/<zone>/<vnet>/<vlan> path Fabian Grünbichler
@ 2023-06-09  8:47 ` Fabian Grünbichler
  2023-06-09  8:51 ` [pve-devel] [PATCH stable-7 access-control 1/2] access control: add /sdn/zones/<zone>/<vnet>/<vlan> path Thomas Lamprecht
  1 sibling, 0 replies; 3+ messages in thread
From: Fabian Grünbichler @ 2023-06-09  8:47 UTC (permalink / raw)
  To: pve-devel

From: Alexandre Derumier <aderumier@odiso.com>

Signed-off-by: Alexandre Derumier <aderumier@odiso.com>

FG: fix test
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>

drop test changes, not needed for stable-7
(cherry picked from commit a62d78db3398417b302249b3593e75a783d9a4e3)

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
---
 src/PVE/AccessControl.pm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/PVE/AccessControl.pm b/src/PVE/AccessControl.pm
index 8d48089..d7c5a71 100644
--- a/src/PVE/AccessControl.pm
+++ b/src/PVE/AccessControl.pm
@@ -1131,6 +1131,9 @@ my $privgroups = {
 	    'SDN.Allocate',
 	    'SDN.Audit',
 	],
+	user => [
+	    'SDN.Use',
+	],
 	audit => [
 	    'SDN.Audit',
 	],
-- 
2.39.2





^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [pve-devel] [PATCH stable-7 access-control 1/2] access control: add /sdn/zones/<zone>/<vnet>/<vlan> path
  2023-06-09  8:47 [pve-devel] [PATCH stable-7 access-control 1/2] access control: add /sdn/zones/<zone>/<vnet>/<vlan> path Fabian Grünbichler
  2023-06-09  8:47 ` [pve-devel] [PATCH stable-7 access-control 2/2] add new SDN.use privilege in PVESDNUser role Fabian Grünbichler
@ 2023-06-09  8:51 ` Thomas Lamprecht
  1 sibling, 0 replies; 3+ messages in thread
From: Thomas Lamprecht @ 2023-06-09  8:51 UTC (permalink / raw)
  To: Proxmox VE development discussion, Fabian Grünbichler

On 09/06/2023 10:47, Fabian Grünbichler wrote:
> From: Alexandre Derumier <aderumier@odiso.com>
> 
> Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
> 
> FG: add missing /sdn/zones path
> 
> Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
> 
> backport: drop removal of /sdn/vnet/.. path
> 
> (cherry picked from commit 4d5b0937a3497282aae4d3e8fafbe519c9ef4ea2)
> 
> Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
> ---
>  src/PVE/AccessControl.pm | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)

for both:

Acked-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
Reviewed-by: Thomas Lamprecht <t.lamprecht@proxmox.com>





^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2023-06-09  8:51 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-06-09  8:47 [pve-devel] [PATCH stable-7 access-control 1/2] access control: add /sdn/zones/<zone>/<vnet>/<vlan> path Fabian Grünbichler
2023-06-09  8:47 ` [pve-devel] [PATCH stable-7 access-control 2/2] add new SDN.use privilege in PVESDNUser role Fabian Grünbichler
2023-06-09  8:51 ` [pve-devel] [PATCH stable-7 access-control 1/2] access control: add /sdn/zones/<zone>/<vnet>/<vlan> path Thomas Lamprecht

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal