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))
(No client certificate requested)
by lists.proxmox.com (Postfix) with ESMTPS id 0DDC0DE85
for <pve-devel@lists.proxmox.com>; Tue, 6 Dec 2022 12:06:41 +0100 (CET)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id E8CFE2E0CE
for <pve-devel@lists.proxmox.com>; Tue, 6 Dec 2022 12:06:40 +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 <pve-devel@lists.proxmox.com>; Tue, 6 Dec 2022 12:06:39 +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 09BA944D93
for <pve-devel@lists.proxmox.com>; Tue, 6 Dec 2022 12:06:39 +0100 (CET)
From: Dominik Csapak <d.csapak@proxmox.com>
To: pve-devel@lists.proxmox.com
Date: Tue, 6 Dec 2022 12:06:35 +0100
Message-Id: <20221206110635.1885744-7-d.csapak@proxmox.com>
X-Mailer: git-send-email 2.30.2
In-Reply-To: <20221206110635.1885744-1-d.csapak@proxmox.com>
References: <20221206110635.1885744-1-d.csapak@proxmox.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.064 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. [values.id]
Subject: [pve-devel] [PATCH manager v2 3/3] ui: add Realm Sync panel
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: Tue, 06 Dec 2022 11:06:41 -0000
a typical CRUD panel for adding/editing/removing realm sync jobs
the edit window has the typical job options like enabled, schedule, etc.
and the sync options from the existing sync window
we explicitely load the defaults on create (but not on update) when the
realm changes.
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
www/manager6/Makefile | 1 +
www/manager6/dc/Config.js | 7 +
www/manager6/dc/RealmSyncJob.js | 380 ++++++++++++++++++++++++++++++++
3 files changed, 388 insertions(+)
create mode 100644 www/manager6/dc/RealmSyncJob.js
diff --git a/www/manager6/Makefile b/www/manager6/Makefile
index 9786337bb..c005b7ea9 100644
--- a/www/manager6/Makefile
+++ b/www/manager6/Makefile
@@ -164,6 +164,7 @@ JSSRC= \
dc/MetricServerView.js \
dc/UserTagAccessEdit.js \
dc/RegisteredTagsEdit.js \
+ dc/RealmSyncJob.js \
lxc/CmdMenu.js \
lxc/Config.js \
lxc/CreateWizard.js \
diff --git a/www/manager6/dc/Config.js b/www/manager6/dc/Config.js
index 13ded12e8..72a9bec13 100644
--- a/www/manager6/dc/Config.js
+++ b/www/manager6/dc/Config.js
@@ -140,6 +140,13 @@ Ext.define('PVE.dc.Config', {
iconCls: 'fa fa-address-book-o',
itemId: 'domains',
},
+ {
+ xtype: 'pveRealmSyncJobView',
+ title: gettext('Realm Sync'),
+ groups: ['permissions'],
+ iconCls: 'fa fa-refresh',
+ itemId: 'realmsyncjobs',
+ },
{
xtype: 'pveHAStatus',
title: 'HA',
diff --git a/www/manager6/dc/RealmSyncJob.js b/www/manager6/dc/RealmSyncJob.js
new file mode 100644
index 000000000..9fc77fc5c
--- /dev/null
+++ b/www/manager6/dc/RealmSyncJob.js
@@ -0,0 +1,380 @@
+Ext.define('PVE.dc.RealmSyncJobView', {
+ extend: 'Ext.grid.Panel',
+ alias: 'widget.pveRealmSyncJobView',
+
+ stateful: true,
+ stateId: 'grid-realmsyncjobs',
+
+ controller: {
+ xclass: 'Ext.app.ViewController',
+
+ addRealmSyncJob: function(button) {
+ let me = this;
+ Ext.create(`PVE.dc.RealmSyncJobEdit`, {
+ autoShow: true,
+ listeners: {
+ destroy: () => me.reload(),
+ },
+ });
+ },
+
+ editRealmSyncJob: function() {
+ let me = this;
+ let view = me.getView();
+ let selection = view.getSelection();
+ if (!selection || selection.length < 1) {
+ return;
+ }
+
+ Ext.create(`PVE.dc.RealmSyncJobEdit`, {
+ jobid: selection[0].data.id,
+ autoShow: true,
+ listeners: {
+ destroy: () => me.reload(),
+ },
+ });
+ },
+
+ reload: function() {
+ this.getView().getStore().load();
+ },
+ },
+
+ store: {
+ autoLoad: true,
+ id: 'realm-syncs',
+ proxy: {
+ type: 'proxmox',
+ url: '/api2/json/access/jobs/realm-sync',
+ },
+ },
+
+ columns: [
+ {
+ header: gettext('Enabled'),
+ width: 80,
+ dataIndex: 'enabled',
+ xtype: 'checkcolumn',
+ sortable: true,
+ disabled: true,
+ disabledCls: 'x-item-enabled',
+ stopSelection: false,
+ },
+ {
+ text: gettext('Name'),
+ flex: 1,
+ dataIndex: 'id',
+ hidden: true,
+ },
+ {
+ header: gettext('Node'),
+ width: 100,
+ sortable: true,
+ dataIndex: 'node',
+ renderer: value => value || gettext('Any'),
+ },
+ {
+ text: gettext('Realm'),
+ width: 200,
+ dataIndex: 'realm',
+ },
+ {
+ header: gettext('Schedule'),
+ width: 150,
+ dataIndex: 'schedule',
+ },
+ {
+ text: gettext('Next Run'),
+ dataIndex: 'next-run',
+ width: 150,
+ renderer: PVE.Utils.render_next_event,
+ },
+ {
+ header: gettext('Comment'),
+ dataIndex: 'comment',
+ renderer: Ext.htmlEncode,
+ sorter: (a, b) => (a.data.comment || '').localeCompare(b.data.comment || ''),
+ flex: 1,
+ },
+ ],
+
+ tbar: [
+ {
+ text: gettext('Add'),
+ handler: 'addRealmSyncJob',
+ },
+ {
+ text: gettext('Edit'),
+ xtype: 'proxmoxButton',
+ handler: 'editRealmSyncJob',
+ disabled: true,
+ },
+ {
+ xtype: 'proxmoxStdRemoveButton',
+ baseurl: `/api2/extjs/access/jobs/realm-sync`,
+ callback: 'reload',
+ },
+ ],
+
+ listeners: {
+ itemdblclick: 'editRealmSyncJob',
+ },
+
+ initComponent: function() {
+ var me = this;
+
+ me.callParent();
+
+ Proxmox.Utils.monStoreErrors(me, me.getStore());
+ },
+});
+
+Ext.define('PVE.dc.RealmSyncJobEdit', {
+ extend: 'Proxmox.window.Edit',
+ mixins: ['Proxmox.Mixin.CBind'],
+
+ subject: gettext('Realm Sync Job'),
+ onlineHelp: 'pveum_ldap_sync',
+
+ // don't focus the schedule field on edit
+ defaultFocus: 'field[name=id]',
+
+ cbindData: function() {
+ let me = this;
+ me.isCreate = !me.jobid;
+ me.jobid = me.jobid || "";
+ let url = '/api2/extjs/access/jobs/realm-sync';
+ me.url = me.jobid ? `${url}/${me.jobid}` : url;
+ me.method = me.isCreate ? 'POST' : 'PUT';
+ if (!me.isCreate) {
+ me.subject = `${me.subject}: ${me.jobid}`;
+ }
+ return {};
+ },
+
+ submitUrl: function(url, values) {
+ return this.isCreate ? `${url}/${values.id}` : url;
+ },
+
+ controller: {
+ xclass: 'Ext.app.ViewController',
+
+ updateDefaults: function(_field, newValue) {
+ let me = this;
+ // only update on create
+ if (!me.getView().isCreate) {
+ return;
+ }
+ Proxmox.Utils.API2Request({
+ url: `/access/domains/${newValue}`,
+ success: function(response) {
+ // first reset the fields to their default
+ ['acl', 'entry', 'properties'].forEach(opt => {
+ me.lookup(`remove-vanished-${opt}`)?.setValue(false);
+ });
+ me.lookup('enable-new')?.setValue('1');
+ me.lookup('scope')?.setValue(undefined);
+
+ let options = response?.result?.data?.['sync-defaults-options'];
+ if (options) {
+ let parsed = PVE.Parser.parsePropertyString(options);
+ if (parsed['remove-vanished']) {
+ let opts = parsed['remove-vanished'].split(';');
+ for (const opt of opts) {
+ me.lookup(`remove-vanished-${opt}`)?.setValue(true);
+ }
+ delete parsed['remove-vanished'];
+ }
+ for (const [name, value] of Object.entries(parsed)) {
+ me.lookup(name)?.setValue(value);
+ }
+ }
+ },
+ });
+ },
+ },
+
+ items: [
+ {
+ xtype: 'inputpanel',
+
+ cbind: {
+ isCreate: '{isCreate}',
+ },
+
+ onGetValues: function(values) {
+ let me = this;
+
+ let vanished_opts = [];
+ ['acl', 'entry', 'properties'].forEach((prop) => {
+ if (values[`remove-vanished-${prop}`]) {
+ vanished_opts.push(prop);
+ }
+ delete values[`remove-vanished-${prop}`];
+ });
+
+ if (!values.id && me.isCreate) {
+ values.id = 'realmsync-' + Ext.data.identifier.Uuid.Global.generate().slice(0, 13);
+ }
+
+ if (vanished_opts.length > 0) {
+ values['remove-vanished'] = vanished_opts.join(';');
+ } else {
+ values['remove-vanished'] = 'none';
+ }
+
+ PVE.Utils.delete_if_default(values, 'node', '');
+
+ if (me.isCreate) {
+ delete values.delete; // on create we cannot delete values
+ }
+
+ return values;
+ },
+
+ column1: [
+ {
+ xtype: 'pmxDisplayEditField',
+ editConfig: {
+ xtype: 'pmxRealmComboBox',
+ storeFilter: rec => rec.data.type === 'ldap' || rec.data.type === 'ad',
+ },
+ cbind: {
+ editable: '{isCreate}',
+ },
+ listeners: {
+ change: 'updateDefaults',
+ },
+ fieldLabel: gettext('Realm'),
+ name: 'realm',
+ reference: 'realm',
+ },
+ {
+ xtype: 'pveCalendarEvent',
+ fieldLabel: gettext('Schedule'),
+ allowBlank: false,
+ name: 'schedule',
+ reference: 'schedule',
+ },
+ {
+ xtype: 'proxmoxcheckbox',
+ fieldLabel: gettext('Enable'),
+ name: 'enabled',
+ reference: 'enabled',
+ uncheckedValue: 0,
+ defaultValue: 1,
+ checked: true,
+ },
+ ],
+
+ column2: [
+ {
+ xtype: 'pveNodeSelector',
+ name: 'node',
+ fieldLabel: gettext('Node'),
+ allowBlank: true,
+ editable: true,
+ autoSelect: false,
+ emptyText: '-- ' + gettext('Any') + ' --',
+ },
+ {
+ xtype: 'proxmoxKVComboBox',
+ name: 'scope',
+ reference: 'scope',
+ fieldLabel: gettext('Scope'),
+ value: '',
+ emptyText: gettext('No default available'),
+ deleteEmpty: false,
+ allowBlank: false,
+ comboItems: [
+ ['users', gettext('Users')],
+ ['groups', gettext('Groups')],
+ ['both', gettext('Users and Groups')],
+ ],
+ },
+ {
+ xtype: 'proxmoxKVComboBox',
+ value: '1',
+ deleteEmpty: false,
+ allowBlank: false,
+ comboItems: [
+ ['1', Proxmox.Utils.yesText],
+ ['0', Proxmox.Utils.noText],
+ ],
+ name: 'enable-new',
+ reference: 'enable-new',
+ fieldLabel: gettext('Enable new'),
+ },
+ ],
+
+ columnB: [
+ {
+ xtype: 'fieldset',
+ title: gettext('Remove Vanished Options'),
+ items: [
+ {
+ xtype: 'proxmoxcheckbox',
+ fieldLabel: gettext('ACL'),
+ name: 'remove-vanished-acl',
+ reference: 'remove-vanished-acl',
+ boxLabel: gettext('Remove ACLs of vanished users and groups.'),
+ },
+ {
+ xtype: 'proxmoxcheckbox',
+ fieldLabel: gettext('Entry'),
+ name: 'remove-vanished-entry',
+ reference: 'remove-vanished-entry',
+ boxLabel: gettext('Remove vanished user and group entries.'),
+ },
+ {
+ xtype: 'proxmoxcheckbox',
+ fieldLabel: gettext('Properties'),
+ name: 'remove-vanished-properties',
+ reference: 'remove-vanished-properties',
+ boxLabel: gettext('Remove vanished properties from synced users.'),
+ },
+ ],
+ },
+ {
+ xtype: 'proxmoxtextfield',
+ name: 'comment',
+ fieldLabel: gettext('Job Comment'),
+ cbind: {
+ deleteEmpty: '{!isCreate}',
+ },
+ autoEl: {
+ tag: 'div',
+ 'data-qtip': gettext('Description of the job'),
+ },
+ },
+ {
+ xtype: 'displayfield',
+ reference: 'defaulthint',
+ value: gettext('Default sync options can be set by editing the realm.'),
+ userCls: 'pmx-hint',
+ hidden: true,
+ },
+ ],
+ },
+ ],
+
+ initComponent: function() {
+ let me = this;
+ me.callParent();
+ if (me.jobid) {
+ me.load({
+ success: function(response, options) {
+ let values = response.result.data;
+
+ if (values['remove-vanished']) {
+ let opts = values['remove-vanished'].split(';');
+ for (const opt of opts) {
+ values[`remove-vanished-${opt}`] = 1;
+ }
+ }
+ me.down('inputpanel').setValues(values);
+ },
+ });
+ }
+ },
+});
--
2.30.2