diff --git a/core/src/main/java/hudson/model/AbstractProject.java b/core/src/main/java/hudson/model/AbstractProject.java
index 061a03d80b..0572af2389 100644
--- a/core/src/main/java/hudson/model/AbstractProject.java
+++ b/core/src/main/java/hudson/model/AbstractProject.java
@@ -16,7 +16,6 @@ import hudson.scm.NullSCM;
import hudson.scm.SCM;
import hudson.scm.SCMS;
import hudson.search.SearchIndexBuilder;
-import hudson.security.ACL;
import hudson.security.Permission;
import hudson.tasks.BuildStep;
import hudson.tasks.BuildTrigger;
@@ -1159,15 +1158,6 @@ public abstract class AbstractProject
,R extends A
return (AbstractProject)Hudson.getInstance().getItem(nearest);
}
- /**
- * Returns the {@link ACL} for this object.
- * We need to override the identical method in AbstractItem because we won't
- * call getACL(AbstractProject) otherwise (single dispatch)
- */
- public ACL getACL() {
- return Hudson.getInstance().getAuthorizationStrategy().getACL(this);
- }
-
private static final Comparator REVERSE_INTEGER_COMPARATOR = new Comparator() {
public int compare(Integer o1, Integer o2) {
return o2-o1;
@@ -1183,4 +1173,4 @@ public abstract class AbstractProject,R extends A
*/
public static final Permission ABORT = BUILD;
}
-
\ No newline at end of file
+
diff --git a/core/src/main/java/hudson/model/ExternalJob.java b/core/src/main/java/hudson/model/ExternalJob.java
index 5df209e125..b1d3cbca0d 100644
--- a/core/src/main/java/hudson/model/ExternalJob.java
+++ b/core/src/main/java/hudson/model/ExternalJob.java
@@ -1,5 +1,6 @@
package hudson.model;
+import hudson.model.AbstractProject;
import hudson.model.RunMap.Constructor;
import org.kohsuke.stapler.StaplerRequest;
import org.kohsuke.stapler.StaplerResponse;
@@ -59,6 +60,7 @@ public class ExternalJob extends ViewJob implements Top
* Used to post the build result from a remote machine.
*/
public void doPostBuildResult( StaplerRequest req, StaplerResponse rsp ) throws IOException, ServletException {
+ checkPermission(AbstractProject.BUILD);
ExternalRun run = newBuild();
run.acceptRemoteSubmission(req.getReader());
rsp.setStatus(HttpServletResponse.SC_OK);
diff --git a/core/src/main/java/hudson/model/Job.java b/core/src/main/java/hudson/model/Job.java
index b30798f587..3b92e3ccf7 100644
--- a/core/src/main/java/hudson/model/Job.java
+++ b/core/src/main/java/hudson/model/Job.java
@@ -13,6 +13,7 @@ import hudson.search.SearchIndex;
import hudson.search.SearchIndexBuilder;
import hudson.search.SearchItem;
import hudson.search.SearchItems;
+import hudson.security.ACL;
import hudson.tasks.LogRotator;
import hudson.util.AtomicFileWriter;
import hudson.util.ChartUtil;
@@ -1155,4 +1156,13 @@ public abstract class Job, RunT extends Run project) {
+ public ACL getACL(Job,?> project) {
return getRootACL();
}
diff --git a/core/src/main/java/hudson/security/ProjectMatrixAuthorizationStrategy.java b/core/src/main/java/hudson/security/ProjectMatrixAuthorizationStrategy.java
index 2f47a5e238..0e06ed1733 100644
--- a/core/src/main/java/hudson/security/ProjectMatrixAuthorizationStrategy.java
+++ b/core/src/main/java/hudson/security/ProjectMatrixAuthorizationStrategy.java
@@ -1,7 +1,7 @@
package hudson.security;
-import hudson.model.AbstractProject;
import hudson.model.Descriptor;
+import hudson.model.Job;
import hudson.model.Jobs;
import hudson.util.RobustReflectionConverter;
import com.thoughtworks.xstream.io.HierarchicalStreamReader;
@@ -19,7 +19,7 @@ import com.thoughtworks.xstream.core.JVM;
*/
public class ProjectMatrixAuthorizationStrategy extends GlobalMatrixAuthorizationStrategy {
@Override
- public ACL getACL(AbstractProject,?> project) {
+ public ACL getACL(Job,?> project) {
AuthorizationMatrixProperty amp = project.getProperty(AuthorizationMatrixProperty.class);
if (amp != null && amp.isUseProjectSecurity()) {
return amp.getACL().newInheritingACL(getRootACL());