From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 37E1C8C0F for ; Wed, 16 Nov 2022 16:48:21 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id C612F21EAC for ; Wed, 16 Nov 2022 16:48:20 +0100 (CET) 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)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Wed, 16 Nov 2022 16:48:17 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id E661843DFE for ; Wed, 16 Nov 2022 16:48:16 +0100 (CET) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Wed, 16 Nov 2022 16:47:54 +0100 Message-Id: <20221116154815.358385-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: =?UTF-8?Q?0=0A=09?=AWL -0.085 Adjusted score from AWL reputation of From: =?UTF-8?Q?address=0A=09?=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 =?UTF-8?Q?Alignment=0A=09?=POISEN_SPAM_PILL 0.1 Meta: its =?UTF-8?Q?spam=0A=09?=POISEN_SPAM_PILL_1 0.1 random spam to be learned in =?UTF-8?Q?bayes=0A=09?=POISEN_SPAM_PILL_3 0.1 random spam to be learned in =?UTF-8?Q?bayes=0A=09?=SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF =?UTF-8?Q?Record=0A=09?=SPF_PASS -0.001 SPF: sender matches SPF =?UTF-8?Q?record=0A=09?=URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [api2.pm, qemu.pm, guesthelpers.pm, lxc.pm, datacenterconfig.pm, cluster.pm] Subject: [pve-devel] [PATCH cluster/guest-common/qemu-server/ct/manager v11] add tags to ui X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Nov 2022 15:48:21 -0000 this series brings the already existing 'tags' for ct/vms to the gui: * tags can be edited in the status toolbar of the guest * existing tags will be shown in the tree/global search/resource grids * when editing a tag, a list of tags will be shown * by default, the color is (consistently) autogenerated based on the text * that color can be overridden in datacenter -> options (cluster wide) (edit window for browser local storage is TBD) * by default, the text color is either white or black, depending which provides the greater contrast (according to SAPC) * this text color can also be overridden * there are multiple shapes available for the tree * implements some permission control in datacenter.cfg with 'user-tag-access' and 'registered-tags' with that it's possible to have better control over what tags a user can actually add to its guests i intentionally left out the gui for those for now, but they shouldn't be that hard to add, should we go this way changes from v10: * adapted c code to wolfgangs requests - make the config \n terminated if it's not already - comment that lines must be null terminated - better types * renamed 'privileged-tags' to 'registered-tags' (also in the ui) * moved 'get_allowed_tags' into pve-guest-common * internal improvements in assert_tag_permissions * made alphabetical ordering the default (@thomas request) * removed /ui-options, reused /cluster/options for that * show warning in gui when tag is in allow list and registered * reworded the descriptions in DataCenterConfig * some minor gui changes - gettext fixes - renaming pmxTag to pveTag - refactored the dc edit windows out into their own files * omitted already applied widget-toolkit patches changes from v9: * implemented changes required by wolfgang - fixed some c code behaviour - refactored the permission check into guest-common * changed a bit how the permission check worked: - get_allowed_tags now takes a bool (privileged_user) and a closure for checking the vm access. with this we can avoid a cluster <-> access-control cyclic dependency - refactored some of the internal code of the permission check (see patch for details) - the forbidden tags are now in quotes in the error * added an optional 'ordering' option into the 'tag-style' property with this the tags will be sorted in the gui (ui only) i left the patches separately (omitted older changelog) pve-cluster: Dominik Csapak (5): add CFS_IPC_GET_GUEST_CONFIG_PROPERTIES method Cluster: add get_guest_config_properties datacenter.cfg: add option for tag-style datacenter.cfg: add tag rights control to the datacenter config datacenter.cfg: add 'ordering' to 'tag-style' config data/PVE/Cluster.pm | 27 +++++ data/PVE/DataCenterConfig.pm | 109 ++++++++++++++++++ data/src/cfs-ipc-ops.h | 2 + data/src/server.c | 63 +++++++++++ data/src/status.c | 207 +++++++++++++++++++++++++---------- data/src/status.h | 3 + 6 files changed, 353 insertions(+), 58 deletions(-) pve-guest-common: Dominik Csapak (1): GuestHelpers: add tag related helpers debian/control | 3 +- src/PVE/GuestHelpers.pm | 99 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 100 insertions(+), 2 deletions(-) qemu-server: Dominik Csapak (1): api: update: check for tags permissions with 'assert_tag_permissions' PVE/API2/Qemu.pm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) pve-container: Dominik Csapak (1): check_ct_modify_config_perm: check for tags permissions with 'assert_tag_permissions' src/PVE/LXC.pm | 4 ++++ 1 file changed, 4 insertions(+) pve-manager: Dominik Csapak (13): api: /cluster/resources: add tags to returned properties api: allow all users to (partially) read datacenter.cfg ui: save ui options from /cluster/options instead of version ui: parse and save tag infos from /cluster/options ui: add form/TagColorGrid ui: add PVE.form.ListField ui: dc/OptionView: add editors for tag settings ui: add form/Tag ui: add form/TagEdit.js ui: {lxc,qemu}/Config: show Tags and make them editable ui: tree/ResourceTree: show Tags in tree ui: add tags to ResourceGrid and GlobalSearchField ui: implement tag ordering from datacenter.cfg PVE/API2.pm | 3 +- PVE/API2/Cluster.pm | 33 ++- www/css/ext6-pve.css | 57 ++++ www/manager6/Makefile | 6 + www/manager6/Utils.js | 104 ++++++- www/manager6/Workspace.js | 2 + www/manager6/data/ResourceStore.js | 7 + www/manager6/dc/OptionView.js | 139 +++++++++- www/manager6/dc/RegisteredTagsEdit.js | 70 +++++ www/manager6/dc/UserTagAccessEdit.js | 90 +++++++ www/manager6/form/GlobalSearchField.js | 20 +- www/manager6/form/ListField.js | 165 ++++++++++++ www/manager6/form/Tag.js | 232 ++++++++++++++++ www/manager6/form/TagColorGrid.js | 357 +++++++++++++++++++++++++ www/manager6/form/TagEdit.js | 336 +++++++++++++++++++++++ www/manager6/grid/ResourceGrid.js | 1 + www/manager6/lxc/Config.js | 36 ++- www/manager6/qemu/Config.js | 35 ++- www/manager6/tree/ResourceTree.js | 10 +- 19 files changed, 1682 insertions(+), 21 deletions(-) create mode 100644 www/manager6/dc/RegisteredTagsEdit.js create mode 100644 www/manager6/dc/UserTagAccessEdit.js create mode 100644 www/manager6/form/ListField.js create mode 100644 www/manager6/form/Tag.js create mode 100644 www/manager6/form/TagColorGrid.js create mode 100644 www/manager6/form/TagEdit.js -- 2.30.2