Skip to content

Commit

Permalink
Update GRR links to UIv2 (#773)
Browse files Browse the repository at this point in the history
  • Loading branch information
Tati1701 authored Aug 4, 2023
1 parent 22c4b09 commit c81029d
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions dftimewolf/lib/collectors/grr_base.py
Original file line number Diff line number Diff line change
Expand Up @@ -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})')
2 changes: 1 addition & 1 deletion tests/lib/collectors/grr_base.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit c81029d

Please sign in to comment.