From c81029d91489da90e8ca262b92ac88bfb6a7002f Mon Sep 17 00:00:00 2001 From: Tati <955662+Tati1701@users.noreply.github.com> Date: Fri, 4 Aug 2023 02:05:51 +0200 Subject: [PATCH] Update GRR links to UIv2 (#773) --- dftimewolf/lib/collectors/grr_base.py | 6 +++--- tests/lib/collectors/grr_base.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dftimewolf/lib/collectors/grr_base.py b/dftimewolf/lib/collectors/grr_base.py index 9ce9b2a4e..d690ccbbb 100644 --- a/dftimewolf/lib/collectors/grr_base.py +++ b/dftimewolf/lib/collectors/grr_base.py @@ -137,9 +137,9 @@ def _WrapGRRRequestWithApproval( approval = grr_object.CreateApproval( reason=self.reason, notified_users=self.approvers) approval_sent = True - approval_url = ('{0:s}/#/users/{1:s}/approvals/client/{2:s}/{3:s}'. - format(self.grr_url, approval.username, - approval.client_id, + approval_url = ('{0:s}/v2/clients/{1:s}/users/{2:s}/approvals/{3:s}'. + format(self.grr_url, approval.client_id, + approval.username, approval.approval_id)) logger.info(f'{grr_object}: approval request sent to: ' f'{self.approvers} (reason: {self.reason})') diff --git a/tests/lib/collectors/grr_base.py b/tests/lib/collectors/grr_base.py index 4542b72d2..5b19bd7e4 100644 --- a/tests/lib/collectors/grr_base.py +++ b/tests/lib/collectors/grr_base.py @@ -109,7 +109,7 @@ def testApprovalWrapper(self, _): mock_publish_message.assert_has_calls([ # pylint: disable=line-too-long - mock.call('Approval needed at: http://fake/endpoint/#/users/nobody/approvals/client/abcd/dcba', False) + mock.call('Approval needed at: http://fake/endpoint/v2/clients/abcd/users/nobody/approvals/dcba', False) # pylint: enable=line-too-long ]) self.assertEqual(mock_publish_message.call_count, 1)