audit-logs: use auth_user in few places to track action IP.

This commit is contained in:
Marcin Kuzminski 2018-06-12 18:29:54 +02:00
parent 61af3befa8
commit b058fefee1
3 changed files with 9 additions and 5 deletions

View file

@ -677,7 +677,8 @@ def create_pull_request(
[commit.raw_id for commit in reversed(commit_ranges)]),
reviewers=reviewers,
title=title,
description=Optional.extract(description)
description=Optional.extract(description),
auth_user=apiuser
)
Session().commit()

View file

@ -894,7 +894,8 @@ class RepoPullRequestsView(RepoAppView, DataGridAppView):
pull_request = PullRequestModel().create(
self._rhodecode_user.user_id, source_repo, source_ref,
target_repo, target_ref, commit_ids, reviewers,
pullrequest_title, description, reviewer_rules
pullrequest_title, description, reviewer_rules,
auth_user=self._rhodecode_user
)
Session().commit()
@ -1203,7 +1204,8 @@ class RepoPullRequestsView(RepoAppView, DataGridAppView):
status_change_type=(status
if status and allowed_to_change_status else None),
comment_type=comment_type,
resolves_comment_id=resolves_comment_id
resolves_comment_id=resolves_comment_id,
auth_user=self._rhodecode_user
)
if allowed_to_change_status:

View file

@ -444,10 +444,11 @@ class PullRequestModel(BaseModel):
def create(self, created_by, source_repo, source_ref, target_repo,
target_ref, revisions, reviewers, title, description=None,
reviewer_data=None, translator=None):
reviewer_data=None, translator=None, auth_user=None):
translator = translator or get_current_request().translate
created_by_user = self._get_user(created_by)
auth_user = auth_user or created_by_user
source_repo = self._get_repo(source_repo)
target_repo = self._get_repo(target_repo)
@ -537,7 +538,7 @@ class PullRequestModel(BaseModel):
creation_data = pull_request.get_api_data(with_merge_state=False)
self._log_audit_action(
'repo.pull_request.create', {'data': creation_data},
created_by_user, pull_request)
auth_user, pull_request)
return pull_request