engineering/unrhodecode
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

audit-logs: store properly IP and user for certain comments types.

Browse source 
- before mostly IP could be missing from audit log data.
This commit is contained in:
Marcin Kuzminski 2018-04-26 00:59:07 +02:00
parent 7ba1dd57ac
commit 1a717208f4
5 changed files with 16 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

3
rhodecode/api/views/pull_request_api.py
View file

@ -548,7 +548,8 @@ def comment_pull_request(
closing_pr=False, closing_pr=False,
renderer=renderer, renderer=renderer,
comment_type=comment_type, comment_type=comment_type,
resolves_comment_id=resolves_comment_id resolves_comment_id=resolves_comment_id,
auth_user=apiuser
) )
if allowed_to_change_status and status: if allowed_to_change_status and status:

3
rhodecode/api/views/repo_api.py
View file

@ -1469,7 +1469,8 @@ def comment_commit(
status_change_type=status, status_change_type=status,
renderer=renderer, renderer=renderer,
comment_type=comment_type, comment_type=comment_type,
resolves_comment_id=resolves_comment_id resolves_comment_id=resolves_comment_id,
auth_user=apiuser
) )
if status: if status:
# also do a status change # also do a status change

5
rhodecode/apps/repository/views/repo_commits.py
View file

@ -437,7 +437,8 @@ class RepoCommitsView(RepoAppView):
if status else None), if status else None),
status_change_type=status, status_change_type=status,
comment_type=comment_type, comment_type=comment_type,
resolves_comment_id=resolves_comment_id resolves_comment_id=resolves_comment_id,
auth_user=self._rhodecode_user
) )
# get status if set ! # get status if set !
@ -528,7 +529,7 @@ class RepoCommitsView(RepoAppView):
comment_repo_admin = is_repo_admin and is_repo_comment comment_repo_admin = is_repo_admin and is_repo_comment
if super_admin or comment_owner or comment_repo_admin: if super_admin or comment_owner or comment_repo_admin:
CommentsModel().delete(comment=comment, user=self._rhodecode_db_user) CommentsModel().delete(comment=comment, auth_user=self._rhodecode_user)
Session().commit() Session().commit()
return True return True
else: else:

2
rhodecode/apps/repository/views/repo_pull_requests.py
View file

@ -1285,7 +1285,7 @@ class RepoPullRequestsView(RepoAppView, DataGridAppView):
if super_admin or comment_owner or comment_repo_admin: if super_admin or comment_owner or comment_repo_admin:
old_calculated_status = comment.pull_request.calculated_review_status() old_calculated_status = comment.pull_request.calculated_review_status()
CommentsModel().delete(comment=comment, user=self._rhodecode_user) CommentsModel().delete(comment=comment, auth_user=self._rhodecode_user)
Session().commit() Session().commit()
calculated_status = comment.pull_request.calculated_review_status() calculated_status = comment.pull_request.calculated_review_status()
if old_calculated_status != calculated_status: if old_calculated_status != calculated_status:

14
rhodecode/model/comment.py
View file

@ -159,18 +159,18 @@ class CommentsModel(BaseModel):
return todos return todos
def _log_audit_action(self, action, action_data, user, comment): def _log_audit_action(self, action, action_data, auth_user, comment):
audit_logger.store( audit_logger.store(
action=action, action=action,
action_data=action_data, action_data=action_data,
user=user, user=auth_user,
repo=comment.repo) repo=comment.repo)
def create(self, text, repo, user, commit_id=None, pull_request=None, def create(self, text, repo, user, commit_id=None, pull_request=None,
f_path=None, line_no=None, status_change=None, f_path=None, line_no=None, status_change=None,
status_change_type=None, comment_type=None, status_change_type=None, comment_type=None,
resolves_comment_id=None, closing_pr=False, send_email=True, resolves_comment_id=None, closing_pr=False, send_email=True,
renderer=None): renderer=None, auth_user=None):
""" """
Creates new comment for commit or pull request. Creates new comment for commit or pull request.
IF status_change is not none this comment is associated with a IF status_change is not none this comment is associated with a
@ -190,6 +190,8 @@ class CommentsModel(BaseModel):
:param send_email: :param send_email:
:param renderer: pick renderer for this comment :param renderer: pick renderer for this comment
""" """
auth_user = auth_user or user
if not text: if not text:
log.warning('Missing text for comment, skipping...') log.warning('Missing text for comment, skipping...')
return return
@ -355,7 +357,7 @@ class CommentsModel(BaseModel):
comment_data = comment.get_api_data() comment_data = comment.get_api_data()
self._log_audit_action( self._log_audit_action(
action, {'data': comment_data}, user, comment) action, {'data': comment_data}, auth_user, comment)
msg_url = '' msg_url = ''
channel = None channel = None
@ -388,7 +390,7 @@ class CommentsModel(BaseModel):
return comment return comment
def delete(self, comment, user): def delete(self, comment, auth_user):
""" """
Deletes given comment Deletes given comment
""" """
@ -402,7 +404,7 @@ class CommentsModel(BaseModel):
action = 'repo.commit.comment.delete' action = 'repo.commit.comment.delete'
self._log_audit_action( self._log_audit_action(
action, {'old_data': old_data}, user, comment) action, {'old_data': old_data}, auth_user, comment)
return comment return comment