kallithea Changeset - 1658beb26ff9

Changeset - 1658beb26ff9

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Søren Løvborg - 10 years ago 2016-04-06 21:47:53
sorenl@unity3d.com

pull requests: prevent adding DEFAULT user as reviewer

Add a helper method to resolve reviewers, with an added check to prevent
the adding of the DEFAULT user as reviewer.

The __add_reviewers method, although internal, had a troubling interface
where the method was responsible for resolving reviewers, but the caller
was responsible for resolving mention_recipients. The method is changed
to always take two sets of database User objects, leaving the resolution
to the caller in both cases.

1 file changed with 19 insertions and 9 deletions:

kallithea/model/pull_request.py

0 comments (0 inline, 0 general)

kallithea/model/pull_request.py

➞

Show inline comments

@@ @@ -32,13 +32,13 @@ from pylons.i18n.translation import _ @@
 from kallithea.model.meta import Session
 from kallithea.lib import helpers as h
 from kallithea.lib.exceptions import UserInvalidException
 from kallithea.model import BaseModel
 from kallithea.model.db import PullRequest, PullRequestReviewers, Notification, \
     ChangesetStatus
+    ChangesetStatus, User
 from kallithea.model.notification import NotificationModel
 from kallithea.lib.utils2 import extract_mentioned_users, safe_unicode
 log = logging.getLogger(__name__)
@@ @@ -68,12 +68,23 @@ class PullRequestModel(BaseModel): @@
         else:
             q = q.filter(PullRequest.other_repo == repo)
         if not closed:
             q = q.filter(PullRequest.status != PullRequest.STATUS_CLOSED)
         return q.order_by(PullRequest.created_on.desc()).all()
     def _get_valid_reviewers(self, seq):
         """ Generate User objects from a sequence of user IDs, usernames or
         User objects. Raises UserInvalidException if the DEFAULT user is
         specified, or if a given ID or username does not match any user.
         """
         for user_spec in seq:
             user = self._get_user(user_spec)
             if user is None or user.username == User.DEFAULT_USER:
                 raise UserInvalidException(user_spec)
             yield user
     def create(self, created_by, org_repo, org_ref, other_repo, other_ref,
                revisions, reviewers, title, description=None):
         from kallithea.model.changeset_status import ChangesetStatusModel
         created_by_user = self._get_user(created_by)
         org_repo = self._get_repo(org_repo)
@@ @@ -106,24 +117,23 @@ class PullRequestModel(BaseModel): @@
             ChangesetStatus.STATUS_UNDER_REVIEW,
             new.owner,
             comment,
             pull_request=new
+        )
         reviewers = set(self._get_valid_reviewers(reviewers))
         mention_recipients = extract_mentioned_users(new.description)
         self.__add_reviewers(created_by_user, new, reviewers, mention_recipients)
         return new
     def __add_reviewers(self, user, pr, reviewers, mention_recipients=None):
     def __add_reviewers(self, user, pr, reviewers, mention_recipients):
         # reviewers and mention_recipients should be sets of User objects.
         #members
         for member in set(reviewers):
             _usr = self._get_user(member)
             if _usr is None:
                 raise UserInvalidException(member)
             reviewer = PullRequestReviewers(_usr, pr)
         for reviewer in reviewers:
             reviewer = PullRequestReviewers(reviewer, pr)
             Session().add(reviewer)
         revision_data = [(x.raw_id, x.message)
                          for x in map(pr.org_repo.get_changeset, pr.revisions)]
         #notification to reviewers
@@ @@ -173,13 +183,13 @@ class PullRequestModel(BaseModel): @@
     def mention_from_description(self, user, pr, old_description=''):
         mention_recipients = (extract_mentioned_users(pr.description) -
                               extract_mentioned_users(old_description))
         log.debug("Mentioning %s", mention_recipients)
-        self.__add_reviewers(user, pr, [], mention_recipients)
+        self.__add_reviewers(user, pr, set(), mention_recipients)
     def update_reviewers(self, user, pull_request, reviewers_ids):
         reviewers_ids = set(reviewers_ids)
         pull_request = self.__get_pull_request(pull_request)
         current_reviewers = PullRequestReviewers.query() \
                             .filter(PullRequestReviewers.pull_request==
@@ @@ -188,13 +198,13 @@ class PullRequestModel(BaseModel): @@
         current_reviewers_ids = set([x.user.user_id for x in current_reviewers])
         to_add = reviewers_ids.difference(current_reviewers_ids)
         to_remove = current_reviewers_ids.difference(reviewers_ids)
         log.debug("Adding %s reviewers", to_add)
         self.__add_reviewers(user, pull_request, to_add)
+        self.__add_reviewers(user, pull_request, set(self._get_valid_reviewers(to_add)), set())
         log.debug("Removing %s reviewers", to_remove)
         for uid in to_remove:
             reviewer = PullRequestReviewers.query() \
                     .filter(PullRequestReviewers.user_id==uid,
                             PullRequestReviewers.pull_request==pull_request) \

0 comments (0 inline, 0 general)