From: Dominik Csapak <d.csapak@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH novnc] don't show error messages for users without VM.Audit privileges
Date: Fri, 7 Oct 2022 10:44:58 +0200 [thread overview]
Message-ID: <20221007084458.1242670-1-d.csapak@proxmox.com> (raw)
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
next reply other threads:[~2022-10-07 8:45 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-07 8:44 Dominik Csapak [this message]
2022-10-10 8:45 ` [pve-devel] applied: " Thomas Lamprecht
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221007084458.1242670-1-d.csapak@proxmox.com \
--to=d.csapak@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox