Skip to content

Commit 4b69c58

Browse files
committed
Merge branch '5.0-trunk'
2 parents 8953c08 + 2bd6f19 commit 4b69c58

142 files changed

Lines changed: 209 additions & 152 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM bpssysadmin/rt-base-debian:RT-5.0.6-bullseye-20240506
1+
FROM bpssysadmin/rt-base-debian:RT-5.0.8-bullseye-20241112
22

33
LABEL maintainer="Best Practical Solutions <contact@bestpractical.com>"
44

MANIFEST

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ etc/upgrade/4.9.0/content
6262
etc/upgrade/4.9.1/content
6363
etc/upgrade/5.0.2/content
6464
etc/upgrade/5.0.4/content
65+
etc/upgrade/5.0.8/content
6566
etc/upgrade/process_articles_initialdata
6667
etc/upgrade/remove_files
6768
etc/upgrade/rtir-2.4-upgrade.pl.in

META.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ requires:
3333
perl: 5.10.1
3434
resources:
3535
license: http://opensource.org/licenses/gpl-license.php
36-
version: 5.0.6
37-
x_module_install_rtx_version: '0.43'
36+
version: 5.0.8
37+
x_module_install_rtx_version: '0.44'
3838
x_requires_rt: 5.0.0
3939
x_rt_too_new: 5.2.0

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ To report a bug, send email to [rtir-bugs@bestpractical.com](mailto:rtir-bugs@be
201201

202202
COPYRIGHT:
203203

204-
This software is Copyright (c) 1996-2024 Best Practical Solutions, LLC
204+
This software is Copyright (c) 1996-2025 Best Practical Solutions, LLC
205205
<sales@bestpractical.com>
206206

207207
(Except where explicitly superseded by other copyright notices)

bin/add_constituency.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
# COPYRIGHT:
66
#
7-
# This software is Copyright (c) 1996-2024 Best Practical Solutions, LLC
7+
# This software is Copyright (c) 1996-2025 Best Practical Solutions, LLC
88
# <sales@bestpractical.com>
99
#
1010
# (Except where explicitly superseded by other copyright notices)

etc/RTIR_Config.pm

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -438,6 +438,16 @@ Set( $RTIR_StrictConstituencyLinking, 1 );
438438
439439
=over 4
440440
441+
=item C<$WebStrictBrowserCache>
442+
443+
As part of normal operation, browsers typically store some browsing
444+
history, enabling the Back button to work. Browsers also often
445+
cache pages in the browsing history to improve performance.
446+
447+
Enable this option if you are using RTIR with highly sensitive
448+
information and want to signal the browser to not store any history
449+
or cache any data. The default is disabled.
450+
441451
=item C<$MaxInlineBody>
442452
443453
By default, RT only displays text attachments inline up to

etc/initialdata

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -683,6 +683,7 @@ for my $cf (@CustomFields) {
683683
{
684684
Name => 'Incidents Processes',
685685
Description => 'Processes to be followed in the event of an incident',
686+
ApplyTo => [],
686687
}
687688
);
688689

etc/upgrade/2.5.1/update_saved_searches.pl.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
# COPYRIGHT:
66
#
7-
# This software is Copyright (c) 1996-2024 Best Practical Solutions, LLC
7+
# This software is Copyright (c) 1996-2025 Best Practical Solutions, LLC
88
# <sales@bestpractical.com>
99
#
1010
# (Except where explicitly superseded by other copyright notices)

etc/upgrade/5.0.2/content

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ our @ScripConditions;
66
our @CustomFields = (
77
{ Name => 'CVE ID',
88
Type => 'FreeformMultiple',
9-
Queue => [ 'Incidents', 'Incident Reports', 'Investigations', 'Countermeasures' ],
109
Disabled => 0,
10+
LookupType => 'RT::Queue-RT::Ticket',
1111
Description => 'CVE ID for RTIR queues',
1212
LinkValueTo => 'https://nvd.nist.gov/vuln/detail/__CustomField__#vulnCurrentDescriptionTitle',
1313
},
@@ -207,6 +207,28 @@ our @Final = (
207207
}
208208
}
209209
},
210+
sub {
211+
# Apply new CVE ID CF to existing RTIR queues based on lifecycle
212+
my $cve_id_obj = RT::CustomField->new(RT->SystemUser);
213+
my ($ok, $msg) = $cve_id_obj->LoadByName( Name => 'CVE ID' );
214+
215+
if ( $cve_id_obj->IsGlobal ) {
216+
my $empty_queue = RT::Queue->new( RT->SystemUser );
217+
my ($ok, $msg) = $cve_id_obj->RemoveFromObject( $empty_queue );
218+
}
219+
220+
if ( $ok && $cve_id_obj->Id ) {
221+
my $queues = RT::Queues->new(RT->SystemUser);
222+
$queues->Limit( FIELD => 'Lifecycle', VALUE => [ 'incident_reports', 'incidents', 'investigations', 'countermeasures' ], OPERATOR => 'IN' );
223+
while ( my $queue = $queues->Next ) {
224+
my ($ok, $msg) = $cve_id_obj->AddToObject( $queue );
225+
RT->Logger->error("Unable to apply CVE ID to queue " . $queue->Name . " $msg") unless $ok;
226+
}
227+
}
228+
else {
229+
RT->Logger->error("Unable to load custom field CVE ID: $msg");
230+
}
231+
},
210232
);
211233

212234
1;

etc/upgrade/5.0.8/content

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
our @Final = sub {
2+
require RT::Class;
3+
my $incident_processes = RT::Class->new(RT->SystemUser);
4+
$incident_processes->Load('Incidents Processes');
5+
if ( $incident_processes && $incident_processes->IsApplied( 0 ) ) {
6+
my $empty_queue = RT::Queue->new( RT->SystemUser );
7+
my ($ok, $msg) = $incident_processes->RemoveFromObject( $empty_queue );
8+
warn "Could not remove 'Incidents Processes' from Global: $msg" unless $ok;
9+
}
10+
};

0 commit comments

Comments
 (0)