[Rt-commit] rt branch 5.0/update-ticket-owner-before-message updated. rt-5.0.4-228-g31d544f449

[BPS Git Server]

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, 5.0/update-ticket-owner-before-message has been updated
       via  31d544f44900b0f090b3fba724412d4b024d293c (commit)
      from  c9be6f908ac8699b5f37b93b36a5ff876e4f5413 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 31d544f44900b0f090b3fba724412d4b024d293c
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Wed Nov 15 15:22:58 2023 -0500

    Cache ticket rights for atomic changes
    
    Ticket changes can revoke rights from current user, which can block
    changes after them because of the revoked rights. E.g. current user can
    modify a ticket as the owner, which has "ModifyTicket" right granted.
    When current user replies the ticket and also changes ticket owner on
    ticket update page, as ticket owner change happens first, previously
    he/she wouldn't be able to apply the rest of changes.
    
    This commit caches ticket related rights in advance to ignore rights
    revocation inside an atomic change, to get around it.

diff --git a/lib/RT/Ticket.pm b/lib/RT/Ticket.pm
index 2f615bdcb5..166452663f 100644
--- a/lib/RT/Ticket.pm
+++ b/lib/RT/Ticket.pm
@@ -1806,6 +1806,28 @@ sub Atomic {
     my $context = wantarray;
     my @ret;
 
+    my $orig_current_user_has_right = $self->can('CurrentUserHasRight');
+    no warnings 'redefine';
+
+    local *CurrentUserHasRight = $orig_current_user_has_right;
+    if ( $self->{Atomic} == 1 ) {
+        my %granted;
+        for my $right ( keys %{ RT::Queue->AvailableRights } ) {
+            if ( $self->CurrentUserHasRight($right) ) {
+                $granted{$right} = 1;
+            }
+        }
+
+        if (%granted) {
+            *CurrentUserHasRight = sub {
+                my $self  = shift;
+                my $right = shift;
+                return 1 if $granted{$right};
+                return $orig_current_user_has_right->( $self, $right, @_ );
+            };
+        }
+    }
+
     local $@;
     eval {
         if ($context) {
diff --git a/t/web/ticket_owner.t b/t/web/ticket_owner.t
index e7b7f1a806..6c7afd531f 100644
--- a/t/web/ticket_owner.t
+++ b/t/web/ticket_owner.t
@@ -509,4 +509,38 @@ diag "user can take/steal ticket with ReassignTicket+OwnTicket right";
     ok !($agent_c->find_all_links( text => 'Steal' ))[0], 'no Steal link';
 }
 
+ok(
+    RT::Test->add_rights(
+        { Principal => 'Owner', Right => [qw(ModifyTicket)] },
+    ),
+    'add ModifyTicket to Owner'
+);
+
+diag "user can update ticket with owner change when rights are granted via Owner";
+{
+    my $ticket = RT::Ticket->new($user_a);
+    my ( $id, $txn, $msg ) = $ticket->Create(
+        Queue   => $queue->id,
+        Subject => 'Test reply with owner change',
+        Owner   => $user_b,
+    );
+    ok( $id, 'created a ticket #' . $id ) or diag "error: $msg";
+    is( $ticket->Owner, $user_b->id, 'correct owner' );
+
+    $agent_b->goto_ticket($id);
+    $agent_b->follow_link_ok( { text => 'Reply' } );
+    $agent_b->submit_form(
+        form_name => 'TicketUpdate',
+        fields    => {
+            Owner         => $user_a->id,
+            UpdateContent => 'Reply content along with owner change',
+        },
+        button => 'SubmitTicket',
+    );
+    $agent_b->text_contains( 'Owner changed from user_b to user_a',   'got owner change message' );
+    $agent_b->text_contains( 'Correspondence added',                  'got correspondence message' );
+    $agent_b->text_contains( 'Reply content along with owner change', 'got correspondence' );
+    ok( !$agent_b->find_link(text => 'Reply'), 'No reply link any more' );
+}
+
 done_testing;

-----------------------------------------------------------------------

Summary of changes:
 lib/RT/Ticket.pm     | 22 ++++++++++++++++++++++
 t/web/ticket_owner.t | 34 ++++++++++++++++++++++++++++++++++
 2 files changed, 56 insertions(+)


hooks/post-receive
-- 
rt