Merge pull request #114 from stephenc/jenkins-40652

[JENKINS-40652] Minimal fix for trusted revision
jenkinsci · Jan 27, 2017 · 5607e40 · 5607e40
2 parents df02d73 + 93d81cf
commit 5607e40
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/main/java/org/jenkinsci/plugins/github_branch_source/GitHubSCMSource.java b/src/main/java/org/jenkinsci/plugins/github_branch_source/GitHubSCMSource.java
@@ -984,6 +984,11 @@ private void checkout(GitSCM scm, Run<?,?> build, GitClient git, TaskListener li
     public SCMRevision getTrustedRevision(SCMRevision revision, TaskListener listener)
             throws IOException, InterruptedException {
         if (revision instanceof PullRequestSCMRevision) {
+            PullRequestSCMHead head = (PullRequestSCMHead) revision.getHead();
+            if (repoOwner.equals(head.getSourceRepo()) && repository.equals(head.getSourceRepo())) {
+                // origin PR
+                return revision;
+            }
             /*
              * Evaluates whether this pull request is coming from a trusted source.
              * Quickest is to check whether the author of the PR
@@ -1050,7 +1055,6 @@ public SCMRevision getTrustedRevision(SCMRevision revision, TaskListener listene
                     }
                 }
             }
-            PullRequestSCMHead head = (PullRequestSCMHead) revision.getHead();
             if (!collaboratorNames.contains(head.getSourceOwner())) {
                 PullRequestSCMRevision rev = (PullRequestSCMRevision) revision;
                 listener.getLogger().format("Loading trusted files from base branch %s at %s rather than %s%n",