public inbox for pve-devel@lists.proxmox.com
 help / color / mirror / Atom feed
* [pve-devel] [PATCH novnc] don't show error messages for users without VM.Audit privileges
@ 2022-10-07  8:44 Dominik Csapak
  2022-10-10  8:45 ` [pve-devel] applied: " Thomas Lamprecht
  0 siblings, 1 reply; 2+ messages in thread
From: Dominik Csapak @ 2022-10-07  8:44 UTC (permalink / raw)
  To: pve-devel

we now query the guest status before starting, but that requires VM.Audit
privileges, which are not necessary since only VM.Console is actually
required to connect to the console.

In that case, skip the error message and continue connecting

reported in the forum:
https://forum.proxmox.com/threads/vm-console-require-vm-audit.116176/

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
 ...ow-start-button-on-not-running-vm-ct.patch | 26 ++++++++++++++-----
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/debian/patches/0018-show-start-button-on-not-running-vm-ct.patch b/debian/patches/0018-show-start-button-on-not-running-vm-ct.patch
index 162acc4..4e1b99d 100644
--- a/debian/patches/0018-show-start-button-on-not-running-vm-ct.patch
+++ b/debian/patches/0018-show-start-button-on-not-running-vm-ct.patch
@@ -13,15 +13,24 @@ colors were adapted
 
 Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
 ---
- app/pve.js         | 38 ++++++++++++++++++++++++++----
+ app/pve.js         | 45 +++++++++++++++++++++++++++++++----
  app/styles/pve.css | 58 ++++++++++++++++++++++++++++++++++++++++++++++
  vnc.html           |  9 +++++++
- 3 files changed, 101 insertions(+), 4 deletions(-)
+ 3 files changed, 107 insertions(+), 5 deletions(-)
 
 diff --git a/app/pve.js b/app/pve.js
-index 583a406..3eeaa47 100644
+index 583a406..287615f 100644
 --- a/app/pve.js
 +++ b/app/pve.js
+@@ -117,7 +117,7 @@ PVEUI.prototype = {
+ 
+ 	    if (errmsg !== undefined) {
+ 		if (reqOpts.failure) {
+-		    reqOpts.failure.call(scope, errmsg);
++		    reqOpts.failure.call(scope, errmsg, xhr.status);
+ 		}
+ 	    } else {
+ 		if (reqOpts.success) {
 @@ -231,7 +231,7 @@ PVEUI.prototype = {
  
      },
@@ -63,7 +72,7 @@ index 583a406..3eeaa47 100644
  	me.API2Request({
  	    url: me.url,
  	    method: 'POST',
-@@ -391,6 +396,31 @@ PVEUI.prototype = {
+@@ -391,6 +396,36 @@ PVEUI.prototype = {
  	});
      },
  
@@ -83,8 +92,13 @@ index 583a406..3eeaa47 100644
 +			    .classList.add("noVNC_open");
 +		    }
 +		},
-+		failure: function(msg) {
-+		    me.UI.showStatus(msg, 'error');
++		failure: function(msg, code) {
++		    if (code === 403) {
++			// connect anyway for users with VM.Console but without VM.Audit
++			me.initConnection(callback);
++		    } else {
++			me.UI.showStatus(msg, 'error');
++		    }
 +		}
 +	    });
 +	} else {
-- 
2.30.2





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

* [pve-devel] applied: [PATCH novnc] don't show error messages for users without VM.Audit privileges
  2022-10-07  8:44 [pve-devel] [PATCH novnc] don't show error messages for users without VM.Audit privileges Dominik Csapak
@ 2022-10-10  8:45 ` Thomas Lamprecht
  0 siblings, 0 replies; 2+ messages in thread
From: Thomas Lamprecht @ 2022-10-10  8:45 UTC (permalink / raw)
  To: Proxmox VE development discussion, Dominik Csapak

Am 07/10/2022 um 10:44 schrieb Dominik Csapak:
> we now query the guest status before starting, but that requires VM.Audit
> privileges, which are not necessary since only VM.Console is actually
> required to connect to the console.
> 
> In that case, skip the error message and continue connecting
> 
> reported in the forum:
> https://forum.proxmox.com/threads/vm-console-require-vm-audit.116176/
> 
> Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
> ---
>  ...ow-start-button-on-not-running-vm-ct.patch | 26 ++++++++++++++-----
>  1 file changed, 20 insertions(+), 6 deletions(-)
> 
>

applied, but reworked commit message for more context (or maybe better said,
reword it such that it's a bit clearer why/what/how) and to avoid sounding a
bit like that this is a front end solution for a issue where we allowed to
query the guest status if only VM.Console was present, thanks!




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

end of thread, other threads:[~2022-10-10  8:46 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-10-07  8:44 [pve-devel] [PATCH novnc] don't show error messages for users without VM.Audit privileges Dominik Csapak
2022-10-10  8:45 ` [pve-devel] applied: " 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