[Rt-commit] rt branch 4.4/improve-urlified-subject-tag-handling created. rt-4.4.5-38-g20574b4db9
BPS Git Server
git at git.bestpractical.com
Tue Apr 5 15:57:20 UTC 2022
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "rt".
The branch, 4.4/improve-urlified-subject-tag-handling has been created
at 20574b4db9dadb3695ec330b803735bf16010271 (commit)
- Log -----------------------------------------------------------------
commit 20574b4db9dadb3695ec330b803735bf16010271
Author: Brian Conry <bconry at bestpractical.com>
Date: Fri Mar 25 13:38:17 2022 -0500
Improve recognition of urlified subject tags
This change improves RT's handling of subject tags that have been
modified by an external mail client to include a http:// prefix (e.g.
because the mail client believes it looks like the name of a possible
web server).
A previous change allowed RT to recognize the modified tags enough to
not create new tickets, but in some places they were still being
detected as tags from another RT system, resulting in the ticket subject
being modified.
With this change, RT now completely treats the modified tag the same as
it treats the unmodified tag, which will preserve the ticket subject
unchanged.
diff --git a/etc/RT_Config.pm.in b/etc/RT_Config.pm.in
index 97afc855d5..663b9f4c78 100644
--- a/etc/RT_Config.pm.in
+++ b/etc/RT_Config.pm.in
@@ -483,8 +483,8 @@ accordingly.
Set($ExtractSubjectTagMatch, qr/\[[^\]]+? #\d+\]/);
Set($ExtractSubjectTagNoMatch, ( ${RT::EmailSubjectTagRegex}
- ? qr/\[(?:${RT::EmailSubjectTagRegex}) #\d+\]/
- : qr/\[\Q$RT::rtname\E #\d+\]/));
+ ? qr{\[(?:https?://)?(?:${RT::EmailSubjectTagRegex}) #\d+\]}
+ : qr{\[(?:https?://)?\Q$RT::rtname\E #\d+\]}));
=item C<$CheckMoreMSMailHeaders>
diff --git a/lib/RT/Action/ExtractSubjectTag.pm b/lib/RT/Action/ExtractSubjectTag.pm
index af2374fbfa..161452eb96 100644
--- a/lib/RT/Action/ExtractSubjectTag.pm
+++ b/lib/RT/Action/ExtractSubjectTag.pm
@@ -118,7 +118,7 @@ sub Commit {
my $tag = $1;
next if $tag =~ /$nomatch/;
foreach my $subject_tag ( RT->System->SubjectTag ) {
- if ($tag =~ /\[\Q$subject_tag\E\s+\#(\d+)\s*\]/) {
+ if ($tag =~ m{\[(?:https?://)?\Q$subject_tag\E\s+#(\d+)\s*\]}) {
next TAGLIST;
}
}
diff --git a/lib/RT/Interface/Email.pm b/lib/RT/Interface/Email.pm
index 71eda2462f..09b56580ce 100644
--- a/lib/RT/Interface/Email.pm
+++ b/lib/RT/Interface/Email.pm
@@ -631,11 +631,11 @@ sub ParseTicketId {
# We use @captures and pull out the last capture value to guard against
# someone using (...) instead of (?:...) in $EmailSubjectTagRegex.
my $id;
- if ( my @captures = $Subject =~ m{\[(?:http://)?$test_name\s+\#(\d+)\s*\]}i ) {
+ if ( my @captures = $Subject =~ m{\[(?:https?://)?$test_name\s+\#(\d+)\s*\]}i ) {
$id = $captures[-1];
} else {
foreach my $tag ( RT->System->SubjectTag ) {
- next unless my @captures = $Subject =~ m{\[(?:http://)?\Q$tag\E\s+\#(\d+)\s*\]}i;
+ next unless my @captures = $Subject =~ m{\[(?:https?://)?\Q$tag\E\s+\#(\d+)\s*\]}i;
$id = $captures[-1];
last;
}
@@ -1429,7 +1429,7 @@ sub AddSubjectTag {
} elsif ( $queue_tag ) {
$tag_re = qr/$tag_re|\Q$queue_tag\E/;
}
- return $subject if $subject =~ /\[$tag_re\s+#$id\]/;
+ return $subject if $subject =~ m{\[(?:https?://)?$tag_re\s+#$id\]};
$subject =~ s/(\r\n|\n|\s)/ /g;
chomp $subject;
diff --git a/t/mail/extractsubjecttag.t b/t/mail/extractsubjecttag.t
index 36f29ab1e4..2ebd0d78ad 100644
--- a/t/mail/extractsubjecttag.t
+++ b/t/mail/extractsubjecttag.t
@@ -9,119 +9,128 @@ my $queue = RT::Test->load_or_create_queue(
CorrespondAddress => 'rt-recipient at example.com',
CommentAddress => 'rt-recipient at example.com',
);
+
my $subject_tag = 'Windows/Servers-Desktops';
ok $queue && $queue->id, 'loaded or created queue';
-diag "Set Subject Tag";
-{
- is(RT->System->SubjectTag($queue), undef, 'No Subject Tag yet');
- my ($status, $msg) = $queue->SetSubjectTag( $subject_tag );
- ok $status, "set subject tag for the queue" or diag "error: $msg";
- is(RT->System->SubjectTag($queue), $subject_tag, "Set Subject Tag to $subject_tag");
-}
-
-my $original_ticket = RT::Ticket->new( RT->SystemUser );
-diag "Create a ticket and make sure it has the subject tag";
-{
- $original_ticket->Create(
- Queue => $queue->id,
- Subject => 'test',
- Requestor => 'root at localhost'
- );
- my @mails = RT::Test->fetch_caught_mails;
- ok @mails, "got some outgoing emails";
-
- my $status = 1;
- foreach my $mail ( @mails ) {
- my $entity = parse_mail( $mail );
- my $subject = $entity->head->get('Subject');
- $subject =~ /\[\Q$subject_tag\E #\d+\]/
- or do { $status = 0; diag "wrong subject: $subject" };
+foreach my $expected_tag ('example.com', $subject_tag) {
+ if ($expected_tag eq $subject_tag) {
+ diag "Set Subject Tag";
+ {
+ is(RT->System->SubjectTag($queue), undef, 'No Subject Tag yet');
+ my ($status, $msg) = $queue->SetSubjectTag( $subject_tag );
+ ok $status, "set subject tag for the queue" or diag "error: $msg";
+ is(RT->System->SubjectTag($queue), $subject_tag, "Set Subject Tag to $subject_tag");
+ }
}
- ok $status, "Correctly added subject tag to ticket";
-}
-
-diag "Test that a reply with a Subject Tag doesn't change the subject";
-{
- my $ticketid = $original_ticket->Id;
- my $text = <<EOF;
+ foreach my $prefix ('', 'http://', 'https://') {
+ my $original_ticket = RT::Ticket->new( RT->SystemUser );
+ diag "Create a ticket and make sure it has the subject tag";
+ {
+ $original_ticket->Create(
+ Queue => $queue->id,
+ Subject => 'test',
+ Requestor => 'root at localhost'
+ );
+ my @mails = RT::Test->fetch_caught_mails;
+ ok @mails, "got some outgoing emails";
+
+ my $status = 1;
+ foreach my $mail ( @mails ) {
+ my $entity = parse_mail( $mail );
+ my $subject = $entity->head->get('Subject');
+ $subject =~ /\[\Q$expected_tag\E #\d+\]/
+ or do { $status = 0; diag "wrong subject: $subject" };
+ }
+ ok $status, "Correctly added subject tag to ticket";
+ }
+
+
+ diag "Test that a reply with a Subject Tag doesn't change the subject";
+ {
+ my $ticketid = $original_ticket->Id;
+ my $text = <<EOF;
From: root\@localhost
To: general\@$RT::rtname
-Subject: [$subject_tag #$ticketid] test
+Subject: [$prefix$expected_tag #$ticketid] test
reply with subject tag
EOF
- my ($status, $id) = RT::Test->send_via_mailgate($text, queue => $queue->Name);
- is ($status >> 8, 0, "The mail gateway exited normally");
- is ($id, $ticketid, "Replied to ticket $id correctly");
+ my ($status, $id) = RT::Test->send_via_mailgate($text, queue => $queue->Name);
+ is ($status >> 8, 0, "The mail gateway exited normally");
+ is ($id, $ticketid, "Replied to ticket $id correctly");
- my $freshticket = RT::Ticket->new( RT->SystemUser );
- $freshticket->LoadById($id);
- is($original_ticket->Subject,$freshticket->Subject,'Stripped Queue Subject Tag correctly');
+ my $freshticket = RT::Ticket->new( RT->SystemUser );
+ $freshticket->LoadById($id);
+ is($freshticket->Subject,$original_ticket->Subject,'Stripped Queue Subject Tag correctly');
-}
+ }
-diag "Test that a reply with another RT's subject tag changes the subject";
-{
- my $ticketid = $original_ticket->Id;
- my $text = <<EOF;
+ diag "Test that a reply with another RT's subject tag changes the subject";
+ {
+ my $ticketid = $original_ticket->Id;
+ my $text = <<EOF;
From: root\@localhost
To: general\@$RT::rtname
-Subject: [$subject_tag #$ticketid] [remote-rt-system #79] test
+Subject: [$prefix$expected_tag #$ticketid] [remote-rt-system #79] test
reply with subject tag and remote rt subject tag
EOF
- my ($status, $id) = RT::Test->send_via_mailgate($text, queue => $queue->Name);
- is ($status >> 8, 0, "The mail gateway exited normally");
- is ($id, $ticketid, "Replied to ticket $id correctly");
+ my ($status, $id) = RT::Test->send_via_mailgate($text, queue => $queue->Name);
+ is ($status >> 8, 0, "The mail gateway exited normally");
+ is ($id, $ticketid, "Replied to ticket $id correctly");
- my $freshticket = RT::Ticket->new( RT->SystemUser );
- $freshticket->LoadById($id);
- like($freshticket->Subject,qr/\[remote-rt-system #79\]/,"Kept remote rt's subject tag");
- unlike($freshticket->Subject,qr/\[\Q$subject_tag\E #$ticketid\]/,'Stripped Queue Subject Tag correctly');
+ my $freshticket = RT::Ticket->new( RT->SystemUser );
+ $freshticket->LoadById($id);
+ like($freshticket->Subject,qr/\[remote-rt-system #79\]/,"Kept remote rt's subject tag");
+ unlike($freshticket->Subject,qr/\[\Q$expected_tag\E #$ticketid\]/,'Stripped Queue Subject Tag correctly');
-}
+ }
-diag "Test that extraction of another RT's subject tag grabs only tag";
-{
- my $ticketid = $original_ticket->Id;
- my $text = <<EOF;
+ diag "Test that extraction of another RT's subject tag grabs only tag";
+ {
+ my $ticketid = $original_ticket->Id;
+ my $text = <<EOF;
From: root\@localhost
To: general\@$RT::rtname
-Subject: [$subject_tag #$ticketid] [comment] [remote-rt-system #79] test
+Subject: [$prefix$expected_tag #$ticketid] [comment] [remote-rt-system #79] test
reply with subject tag and remote rt subject tag
EOF
- my ($status, $id) = RT::Test->send_via_mailgate($text, queue => $queue->Name);
- is ($status >> 8, 0, "The mail gateway exited normally");
- is ($id, $ticketid, "Replied to ticket $id correctly");
-
- my $freshticket = RT::Ticket->new( RT->SystemUser );
- $freshticket->LoadById($id);
- like($freshticket->Subject,qr/\[remote-rt-system #79\]/,"Kept remote rt's subject tag");
- unlike($freshticket->Subject,qr/comment/,"doesn't grab comment");
- unlike($freshticket->Subject,qr/\[\Q$subject_tag\E #$ticketid\]/,'Stripped Queue Subject Tag correctly');
+ my ($status, $id) = RT::Test->send_via_mailgate($text, queue => $queue->Name);
+ is ($status >> 8, 0, "The mail gateway exited normally");
+ is ($id, $ticketid, "Replied to ticket $id correctly");
+
+ my $freshticket = RT::Ticket->new( RT->SystemUser );
+ $freshticket->LoadById($id);
+ like($freshticket->Subject,qr/\[remote-rt-system #79\]/,"Kept remote rt's subject tag");
+ unlike($freshticket->Subject,qr/comment/,"doesn't grab comment");
+ unlike($freshticket->Subject,qr/\[\Q$expected_tag\E #$ticketid\]/,'Stripped Queue Subject Tag correctly');
+ }
+ }
}
-
-$queue = RT::Test->load_or_create_queue(
- Name => 'Unicode Character Subject Tag Queue',
- CorrespondAddress => 'rt-recipient at example.com',
- CommentAddress => 'rt-recipient at example.com',
-);
-$subject_tag = 'Demande générale';
-ok $queue && $queue->id, 'loaded or created queue';
-
-diag "Test System Subject Tag Matches Queue Object Subject Tag";
+diag "unicode tests";
{
- is(RT->System->SubjectTag($queue), undef, 'No Subject Tag yet');
- my ($status, $msg) = $queue->SetSubjectTag( $subject_tag );
- ok $status, "set subject tag for the queue" or diag "error: $msg";
+ $queue = RT::Test->load_or_create_queue(
+ Name => 'Unicode Character Subject Tag Queue',
+ CorrespondAddress => 'rt-recipient at example.com',
+ CommentAddress => 'rt-recipient at example.com',
+ );
+ my $subject_tag = 'Demande générale';
+ ok $queue && $queue->id, 'loaded or created queue';
- my @subject_tags = sort RT->System->SubjectTag();
+ diag "Test System Subject Tag Matches Queue Object Subject Tag";
+ {
+ is(RT->System->SubjectTag($queue), undef, 'No Subject Tag yet');
+ my ($status, $msg) = $queue->SetSubjectTag( $subject_tag );
+ ok $status, "set subject tag for the queue" or diag "error: $msg";
- is($subject_tags[0], $subject_tag, "Set Subject Tag to $subject_tag");
+ my @subject_tags = sort RT->System->SubjectTag();
+
+ is($subject_tags[0], $subject_tag, "Set Subject Tag to $subject_tag");
+ }
}
done_testing();
-----------------------------------------------------------------------
hooks/post-receive
--
rt
More information about the rt-commit
mailing list