From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <pve-devel-bounces@lists.proxmox.com>
Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68])
by lore.proxmox.com (Postfix) with ESMTPS id C748F1FF16E
for <inbox@lore.proxmox.com>; Mon, 14 Apr 2025 04:31:30 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 3EA99FDAA;
Mon, 14 Apr 2025 04:31:22 +0200 (CEST)
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1744597841; x=1745202641;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc
:subject:date:message-id:reply-to;
bh=INRkEOCbIw2hv2fiUbJseiOVAbPMdF9zN4XDVFFF0wQ=;
b=l6cRlX2noRqMWoV1OZ3gPDxZkEmGIX8Z/x7wySUGDaTOu6Mv3hWRhnkxvH1tt5VU3V
bWATQuGAuqajm3LOrSe2rSiQMqSjzBTcvn0KitrQy6ZBV7e6PCRB2OO1R2YUqfQzsHyL
8zGgoXa11+ynJpq2cYe9RJduYF10Z2+55nVVzFmNC7xNMpu7dZOm/3L3lf4PqheRbX5+
ZsSW17OsR825TcFl0jwaofN7k1AC3OxUNDGLCPqO+29I5ZdqF4fqc5DPmDEA7ZtMYObM
puQPsNMr9Pg9dzELCD1CU/DXBhUSWQjRJ1S+Nxiu/CFvolB5fow18ZuRjq4pqQ60O86C
6DfQ==
X-Gm-Message-State: AOJu0YwehGZ8HySn6GJWxcyGjy7MD/Ia2oS7ZTwN+rzVaWZF3VAiwpuy
ABmF+aA5Aez0E2Skts7ZCsdm/wJ0KKWkqiDPZ9vO6nyd826lW22msTajCA==
X-Gm-Gg: ASbGnct4I1y6NfPIIff+PAY+Ri9Mc0+O5h3sIBniv1b9T3DJuSFYEbuW4KCEQ5BVn6a
+/a9F8be6GtmXtCtjA6jHxiiKu80JVrsVZCkDxDj+e2Zf5OE0qRI1AhwXat60AFG5DvZeuZC0VW
AVTKEKR9X8VomvEwP7SqPrRtHZHxA+Sa/R2LzJoRTyRlQxZC4qXIvYttTvXqfzQFBHdG4dLy0ue
ElcCOMjxgI6QO7HlxyOZSNoszJ0S70LjNH+RD+PyqVu62iThmeq/mhO46uw6AbrRuDXQlvv1ZzA
BzSMmg9eGC6CfahyOE3Vn0ecTWxZyIIihy1gCeOwEHqEnq3FZ0q0K2RWU/3ZPGqCwMjtQcQnc3P
Mpo7DAXZGgf2SYCR3GXpqLEAjeIapkwE+a+GbPzxaGeF+LvJesjmEOw==
X-Google-Smtp-Source: AGHT+IFuL2vK1St7x/hHorVNyA1m5XzUXTPLeLLGz6nlfdg2Pb/czlHkxP+EYHwH2GzPVKN9hdk/6g==
X-Received: by 2002:a05:690c:4c07:b0:6f9:97f7:a5c3 with SMTP id
00721157ae682-70559a016b1mr196449237b3.18.1744597332332;
Sun, 13 Apr 2025 19:22:12 -0700 (PDT)
From: Thomas Skinner <thomas@atskinner.net>
To: pve-devel@lists.proxmox.com
Date: Sun, 13 Apr 2025 21:18:36 -0500
Message-Id: <20250414021836.1469242-2-thomas@atskinner.net>
X-Mailer: git-send-email 2.39.5
In-Reply-To: <20250414021836.1469242-1-thomas@atskinner.net>
References: <20250414021836.1469242-1-thomas@atskinner.net>
MIME-Version: 1.0
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.016 Adjusted score from AWL reputation of From: address
BAYES_00 -1.9 Bayes spam probability is 0 to 1%
DMARC_MISSING 0.1 Missing DMARC policy
FREEMAIL_FORGED_FROMDOMAIN 0.001 2nd level domains in From and EnvelopeFrom
freemail headers are different
FREEMAIL_FROM 0.001 Sender email is commonly abused enduser mail provider
HEADER_FROM_DIFFERENT_DOMAINS 0.001 From and EnvelopeFrom 2nd level mail
domains are different
KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment
RCVD_IN_DNSWL_NONE -0.0001 Sender listed at https://www.dnswl.org/,
no trust RCVD_IN_MSPIKE_H2 -0.01 Average reputation (+2)
SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record
SPF_PASS -0.001 SPF: sender matches SPF record
Subject: [pve-devel] [PATCH manager 1/1] fix #6311: ui: prevent consent text
from showing twice for oidc
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>
Reply-To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>
Cc: Thomas Skinner <thomas@atskinner.net>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: pve-devel-bounces@lists.proxmox.com
Sender: "pve-devel" <pve-devel-bounces@lists.proxmox.com>
Signed-off-by: Thomas Skinner <thomas@atskinner.net>
---
www/manager6/window/LoginWindow.js | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/www/manager6/window/LoginWindow.js b/www/manager6/window/LoginWindow.js
index b4dff0c1..a1ba3cdb 100644
--- a/www/manager6/window/LoginWindow.js
+++ b/www/manager6/window/LoginWindow.js
@@ -22,12 +22,15 @@ Ext.define('PVE.window.LoginWindow', {
init: async function() {
if (Proxmox.ConsentText) {
- Ext.create("Proxmox.window.ConsentModal", {
- autoShow: true,
- consent: Proxmox.Markdown.parse(
- Proxmox.Utils.base64ToUtf8(Proxmox.ConsentText),
- ),
- });
+ let oidc_auth_redirect = Proxmox.Utils.getOpenIDRedirectionAuthorization();
+ if (oidc_auth_redirect === undefined) {
+ Ext.create("Proxmox.window.ConsentModal", {
+ autoShow: true,
+ consent: Proxmox.Markdown.parse(
+ Proxmox.Utils.base64ToUtf8(Proxmox.ConsentText),
+ ),
+ });
+ }
}
},
--
2.39.5
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel