* [pmg-devel] [PATCH pmg-api 1/1] fix #3450: api: add 'filter' parameter to queue DELETE endpoint
2025-09-19 14:50 [pmg-devel] [PATCH pmg-api/pmg-gui 0/2] add support to delete multiple queue entries at once Hannes Laimer
@ 2025-09-19 14:50 ` Hannes Laimer
2025-09-19 14:50 ` [pmg-devel] [PATCH pmg-gui 1/1] fix #3450: ui: add button to delete all queue entries matching a filter Hannes Laimer
1 sibling, 0 replies; 3+ messages in thread
From: Hannes Laimer @ 2025-09-19 14:50 UTC (permalink / raw)
To: pmg-devel
This allows to delete all mails in the queue which have a
sender/recipient that matches the passed filter.
Signed-off-by: Hannes Laimer <h.laimer@proxmox.com>
---
src/PMG/API2/Postfix.pm | 14 ++++++++++++--
src/PMG/Postfix.pm | 40 ++++++++++++++++++++++++++++++++++++++++
2 files changed, 52 insertions(+), 2 deletions(-)
diff --git a/src/PMG/API2/Postfix.pm b/src/PMG/API2/Postfix.pm
index ba0689c..31f7449 100644
--- a/src/PMG/API2/Postfix.pm
+++ b/src/PMG/API2/Postfix.pm
@@ -339,7 +339,7 @@ __PACKAGE__->register_method({
name => 'delete_queue',
path => 'queue/{queue}',
method => 'DELETE',
- description => "Delete all mails in the queue.",
+ description => "Delete all mails in the queue, or only those matching an optional filter.",
proxyto => 'node',
permissions => { check => ['admin'] },
protected => 1,
@@ -348,13 +348,23 @@ __PACKAGE__->register_method({
properties => {
node => get_standard_option('pve-node'),
queue => $queue_name_option,
+ filter => {
+ description => "Filter string (matches sender and recipients).",
+ type => 'string',
+ maxLength => 64,
+ optional => 1,
+ },
},
},
returns => { type => 'null' },
code => sub {
my ($param) = @_;
- PMG::Postfix::delete_queue($param->{queue});
+ if (defined($param->{filter}) && $param->{filter} ne '') {
+ PMG::Postfix::delete_queue_filtered($param->{queue}, $param->{filter});
+ } else {
+ PMG::Postfix::delete_queue($param->{queue});
+ }
return undef;
},
diff --git a/src/PMG/Postfix.pm b/src/PMG/Postfix.pm
index 966130f..7c7869e 100644
--- a/src/PMG/Postfix.pm
+++ b/src/PMG/Postfix.pm
@@ -221,6 +221,46 @@ sub delete_queue {
PVE::Tools::run_command($cmd);
}
+# delete mails in a queue matching a sender/recipient filter
+sub delete_queue_filtered {
+ my ($queue, $filter) = @_;
+
+ die "no filter specified\n" if !defined($filter) || $filter eq '';
+
+ open(my $fh, '-|', '/usr/sbin/postqueue', '-j') || die "ERROR: unable to run postqueue - $!\n";
+
+ my %seen;
+ my @queue_ids;
+ my $line;
+ while (defined($line = <$fh>)) {
+ my $rec = decode_json($line);
+ next if $rec->{queue_name} ne $queue;
+
+ my $match = 0;
+ my $sender = $rec->{sender} // '';
+ if ($sender =~ m/$filter/i) {
+ $match = 1;
+ } else {
+ my $recipients = $rec->{recipients} // [];
+ foreach my $entry (@$recipients) {
+ if (($entry->{address} // '') =~ m/$filter/i) { $match = 1; last; }
+ }
+ }
+
+ next if !$match;
+
+ my $qid = $rec->{queue_id};
+ next if !$qid || $seen{$qid}++;
+ push @queue_ids, $qid;
+ }
+
+ return if !@queue_ids;
+
+ my $input = join("\n", @queue_ids) . "\n";
+ my $cmd = ['/usr/sbin/postsuper', '-d', '-', $queue];
+ PVE::Tools::run_command($cmd, input => $input);
+}
+
sub discard_verify_cache {
unlink "/var/lib/postfix/verify_cache.db";
--
2.47.3
_______________________________________________
pmg-devel mailing list
pmg-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pmg-devel
^ permalink raw reply [flat|nested] 3+ messages in thread* [pmg-devel] [PATCH pmg-gui 1/1] fix #3450: ui: add button to delete all queue entries matching a filter
2025-09-19 14:50 [pmg-devel] [PATCH pmg-api/pmg-gui 0/2] add support to delete multiple queue entries at once Hannes Laimer
2025-09-19 14:50 ` [pmg-devel] [PATCH pmg-api 1/1] fix #3450: api: add 'filter' parameter to queue DELETE endpoint Hannes Laimer
@ 2025-09-19 14:50 ` Hannes Laimer
1 sibling, 0 replies; 3+ messages in thread
From: Hannes Laimer @ 2025-09-19 14:50 UTC (permalink / raw)
To: pmg-devel
Signed-off-by: Hannes Laimer <h.laimer@proxmox.com>
---
js/PostfixMailQueue.js | 46 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 46 insertions(+)
diff --git a/js/PostfixMailQueue.js b/js/PostfixMailQueue.js
index 17c7d05..f51fb40 100644
--- a/js/PostfixMailQueue.js
+++ b/js/PostfixMailQueue.js
@@ -112,6 +112,45 @@ Ext.define('PMG.Postfix.MailQueue', {
win.show();
},
+ onDeleteFilter: function (button, event, rec) {
+ let view = this.getView();
+ let filter = view.lookupReference('filter').getValue();
+
+ if (!filter) {
+ Ext.Msg.alert(gettext('Error'), gettext('Please enter a filter first.'));
+ return;
+ }
+
+ Ext.Msg.show({
+ title: gettext('Confirm'),
+ message: Ext.String.format(
+ gettext('Delete all mails in {0} queue matching filter: \'{1}\'?'),
+ view.queuename,
+ Ext.htmlEncode(filter)
+ ),
+ buttons: Ext.Msg.YESNO,
+ icon: Ext.Msg.WARNING,
+ fn: function (btn) {
+ if (btn !== 'yes') { return; }
+ let url =
+ '/api2/extjs/nodes/' +
+ view.nodename +
+ '/postfix/queue/' +
+ view.queuename +
+ '?filter=' + encodeURIComponent(filter);
+ Proxmox.Utils.API2Request({
+ url: url,
+ method: 'DELETE',
+ waitMsgTarget: view,
+ success: function () { view.store.load(); },
+ failure: function (response) {
+ Ext.Msg.alert(gettext('Error'), response.htmlStatus);
+ },
+ });
+ },
+ });
+ },
+
control: {
'#': {
activate: function () {
@@ -144,6 +183,13 @@ Ext.define('PMG.Postfix.MailQueue', {
xtype: 'proxmoxStdRemoveButton',
handler: 'onRemove',
},
+ '-',
+ {
+ xtype: 'proxmoxButton',
+ text: gettext('Delete Matching Filter'),
+ selModel: null,
+ handler: 'onDeleteFilter',
+ },
{
xtype: 'label',
html: gettext('Filter') + ':',
--
2.47.3
_______________________________________________
pmg-devel mailing list
pmg-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pmg-devel
^ permalink raw reply [flat|nested] 3+ messages in thread