From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <d.csapak@proxmox.com>
Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256)
 (No client certificate requested)
 by lists.proxmox.com (Postfix) with ESMTPS id 3EA8E91584
 for <pve-devel@lists.proxmox.com>; Fri,  7 Oct 2022 10:45:01 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
 by firstgate.proxmox.com (Proxmox) with ESMTP id 2807B23660
 for <pve-devel@lists.proxmox.com>; Fri,  7 Oct 2022 10:45:01 +0200 (CEST)
Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com
 [94.136.29.106])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256)
 (No client certificate requested)
 by firstgate.proxmox.com (Proxmox) with ESMTPS
 for <pve-devel@lists.proxmox.com>; Fri,  7 Oct 2022 10:44:59 +0200 (CEST)
Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1])
 by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 2C04B445DB
 for <pve-devel@lists.proxmox.com>; Fri,  7 Oct 2022 10:44:59 +0200 (CEST)
From: Dominik Csapak <d.csapak@proxmox.com>
To: pve-devel@lists.proxmox.com
Date: Fri,  7 Oct 2022 10:44:58 +0200
Message-Id: <20221007084458.1242670-1-d.csapak@proxmox.com>
X-Mailer: git-send-email 2.30.2
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-SPAM-LEVEL: Spam detection results:  0
 AWL 0.068 Adjusted score from AWL reputation of From: address
 BAYES_00                 -1.9 Bayes spam probability is 0 to 1%
 KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment
 SPF_HELO_NONE           0.001 SPF: HELO does not publish an SPF Record
 SPF_PASS               -0.001 SPF: sender matches SPF record
 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See
 http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more
 information. [proxmox.com]
Subject: [pve-devel] [PATCH novnc] don't show error messages for users
 without VM.Audit privileges
X-BeenThere: pve-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>, 
 <mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/>
List-Post: <mailto:pve-devel@lists.proxmox.com>
List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>, 
 <mailto:pve-devel-request@lists.proxmox.com?subject=subscribe>
X-List-Received-Date: Fri, 07 Oct 2022 08:45:01 -0000

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