[FIXED JENKINS-41246] Guard against PRs from deleted forks #143
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jglick
reviewed
Jul 4, 2017
| this.sourceOwner = pr.getHead().getRepository().getOwnerName(); | ||
| this.sourceRepo = pr.getHead().getRepository().getName(); | ||
| GHRepository repository = pr.getHead().getRepository(); // may be null for deleted forks JENKINS-41246 | ||
| this.sourceOwner = repository.getOwnerName(); |
There was a problem hiding this comment.
So, did you mean to check for null??
There was a problem hiding this comment.
Trying to ascertain reasons about code I wrote more than 15 minutes ago is an exercise in futility... I suspect I did mean to check for null though... good catch
|
This pull request originates from a CloudBees employee. At CloudBees, we require that all pull requests be reviewed by other CloudBees employees before we seek to have the change accepted. If you want to learn more about our process please see this explanation. |
jglick
approved these changes
Jul 5, 2017
| this.sourceRepo = pr.getHead().getRepository().getName(); | ||
| GHRepository repository = pr.getHead().getRepository(); // may be null for deleted forks JENKINS-41246 | ||
| this.sourceOwner = repository == null ? null : repository.getOwnerName(); | ||
| this.sourceRepo = repository == null ? null : repository.getName(); |
There was a problem hiding this comment.
Suggest marking getters @CheckForNull.
| if (!trusted) { | ||
| listener.getLogger().format(" (not from a trusted source)%n"); | ||
| } | ||
| for (boolean merge : new boolean[] {false, true}) { | ||
| for (boolean merge : new boolean[]{false, true}) { |
| @@ -671,7 +673,7 @@ private void doRetrieve(SCMSourceCriteria criteria, SCMHeadObserver observer, Ta | |||
| user.getLogin(), | |||
| user.getName(), | |||
| user.getEmail() | |||
| )); | |||
| )); | |||
| @@ -708,10 +710,12 @@ private void doRetrieve(SCMSourceCriteria criteria, SCMHeadObserver observer, Ta | |||
| } else { | |||
| baseHash = ghPullRequest.getBase().getSha(); | |||
| } | |||
| PullRequestSCMRevision rev = new PullRequestSCMRevision(head, baseHash, ghPullRequest.getHead().getSha()); | |||
| PullRequestSCMRevision rev = | |||
| new PullRequestSCMRevision(head, baseHash, ghPullRequest.getHead().getSha()); | |||
| observer.observe(head, rev); | ||
| if (!observer.isObserving()) { | ||
| listener.getLogger().format("%n %d pull requests were processed (query completed)%n", pullrequests); | ||
| listener.getLogger() | ||
| .format("%n %d pull requests were processed (query completed)%n", pullrequests); |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
See JENKINS-41246
@reviewbybees