[FIXED JENKINS-16956] Noting merge of #1172.

jenkinsci · Apr 12, 2014 · 7f76a93 · 7f76a93
1 parent 26ec7bd
commit 7f76a93
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/changelog.html b/changelog.html
@@ -55,6 +55,12 @@
 <!-- Record your changes in the trunk here. -->
 <div id="trunk" style="display:none"><!--=TRUNK-BEGIN=-->
 <ul class=image>
+  <li class='major rfe'>
+    Enforcing build trigger authentication at runtime by checking authentication associated with a build, rather than at configuration time.
+    For compatibility, enforcement is skipped by default; you must install the Authorize Project plugin or similar for this to take effect.
+    The “upstream pseudo trigger” was also removed in favor of a true trigger configured on the downstream project;
+    you may use either the post-build action or the trigger according to where you want this configuration stored, and who is authorized to change it.
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-16956">issue 16956</a>)
   <li class=bug>
     Fixed NPE from view new job name autocompletion since 1.553.
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-22142">issue 22142</a>)

diff --git a/core/src/main/java/hudson/model/queue/Tasks.java b/core/src/main/java/hudson/model/queue/Tasks.java
@@ -116,7 +116,7 @@ public static Authentication getDefaultAuthenticationOf(Task t) {
      * in case some {@link QueueItemAuthenticator#authenticate(hudson.model.Queue.Item)} takes (for example) actions into consideration.
      * @param t a task
      * @return an authentication as specified by some {@link QueueItemAuthenticator#authenticate(hudson.model.Queue.Task)}; else {@link #getDefaultAuthenticationOf}
-     * @since TODO
+     * @since 1.560
      */
     public static @Nonnull Authentication getAuthenticationOf(@Nonnull Task t) {
         for (QueueItemAuthenticator qia : QueueItemAuthenticatorConfiguration.get().getAuthenticators()) {

diff --git a/core/src/main/java/jenkins/security/QueueItemAuthenticator.java b/core/src/main/java/jenkins/security/QueueItemAuthenticator.java
@@ -55,7 +55,7 @@ public abstract class QueueItemAuthenticator extends AbstractDescribableImpl<Que
      *      returning non-null will determine the identity. If null is returned, the next
      *      configured {@link QueueItemAuthenticator} will be given a chance to authenticate
      *      the executor. If everything fails, fall back to {@link Task#getDefaultAuthentication()}.
-     * @since TODO
+     * @since 1.560
      */
     public @CheckForNull Authentication authenticate(Queue.Task task) {
         if (Util.isOverridden(QueueItemAuthenticator.class, getClass(), "authenticate", Queue.Item.class)) {

diff --git a/core/src/main/java/jenkins/triggers/ReverseBuildTrigger.java b/core/src/main/java/jenkins/triggers/ReverseBuildTrigger.java
@@ -77,6 +77,7 @@
  * so run implicitly at the end of the upstream build,
  * when used on a pair of {@link AbstractProject}s.
  * Otherwise directly listens for the upstream build to complete.
+ * @since 1.560
  */
 @SuppressWarnings("rawtypes")
 public final class ReverseBuildTrigger extends Trigger<Job> implements DependencyDeclarer {