提交 07720988 编写于 作者: J Jesse Glick

Refer to permissions now defined in Item by that name, not via AbstractProject or Job.

上级 6c886e7b
......@@ -2053,7 +2053,7 @@ public abstract class AbstractProject<P extends AbstractProject<P,R>,R extends A
* Serves the workspace files.
*/
public DirectoryBrowserSupport doWs( StaplerRequest req, StaplerResponse rsp ) throws IOException, ServletException, InterruptedException {
checkPermission(AbstractProject.WORKSPACE);
checkPermission(Item.WORKSPACE);
FilePath ws = getSomeWorkspace();
if ((ws == null) || (!ws.exists())) {
// if there's no workspace, report a nice error message
......
......@@ -75,7 +75,7 @@ public final class BuildAuthorizationToken {
throw new AccessDeniedException(Messages.BuildAuthorizationToken_InvalidTokenProvided());
}
project.checkPermission(AbstractProject.BUILD);
project.checkPermission(Item.BUILD);
if (req.getMethod().equals("POST")) {
return;
......
......@@ -120,7 +120,7 @@ public abstract class ItemGroupMixIn {
* or throws an exception if it fails.
*/
public synchronized TopLevelItem createTopLevelItem( StaplerRequest req, StaplerResponse rsp ) throws IOException, ServletException {
acl.checkPermission(Job.CREATE);
acl.checkPermission(Item.CREATE);
TopLevelItem result;
......@@ -192,7 +192,7 @@ public abstract class ItemGroupMixIn {
*/
@SuppressWarnings({"unchecked"})
public synchronized <T extends TopLevelItem> T copy(T src, String name) throws IOException {
acl.checkPermission(Job.CREATE);
acl.checkPermission(Item.CREATE);
T result = (T)createProject(src.getDescriptor(),name,false);
......@@ -216,7 +216,7 @@ public abstract class ItemGroupMixIn {
}
public synchronized TopLevelItem createProjectFromXML(String name, InputStream xml) throws IOException {
acl.checkPermission(Job.CREATE);
acl.checkPermission(Item.CREATE);
Jenkins.getInstance().getProjectNamingStrategy().checkName(name);
// place it as config.xml
......@@ -248,7 +248,7 @@ public abstract class ItemGroupMixIn {
public synchronized TopLevelItem createProject( TopLevelItemDescriptor type, String name, boolean notify )
throws IOException {
acl.checkPermission(Job.CREATE);
acl.checkPermission(Item.CREATE);
Jenkins.getInstance().getProjectNamingStrategy().checkName(name);
if(parent.getItem(name)!=null)
......
......@@ -57,7 +57,7 @@ public class MyView extends View {
@Override
public boolean contains(TopLevelItem item) {
return item.hasPermission(Job.CONFIGURE);
return item.hasPermission(Item.CONFIGURE);
}
@Override
......@@ -74,7 +74,7 @@ public class MyView extends View {
public Collection<TopLevelItem> getItems() {
List<TopLevelItem> items = new ArrayList<TopLevelItem>();
for (TopLevelItem item : getOwnerItemGroup().getItems()) {
if (item.hasPermission(Job.CONFIGURE)) {
if (item.hasPermission(Item.CONFIGURE)) {
items.add(item);
}
}
......
......@@ -24,13 +24,11 @@
package hudson.security;
import hudson.diagnosis.OldDataMonitor;
import hudson.model.AbstractProject;
import hudson.model.Item;
import hudson.model.Job;
import hudson.model.JobProperty;
import hudson.model.JobPropertyDescriptor;
import jenkins.model.Jenkins;
import hudson.model.Run;
import hudson.Extension;
import hudson.util.FormValidation;
import hudson.util.RobustReflectionConverter;
......@@ -184,7 +182,7 @@ public class AuthorizationMatrixProperty extends JobProperty<Job<?, ?>> {
}
public FormValidation doCheckName(@AncestorInPath Job project, @QueryParameter String value) throws IOException, ServletException {
return GlobalMatrixAuthorizationStrategy.DESCRIPTOR.doCheckName_(value, project, AbstractProject.CONFIGURE);
return GlobalMatrixAuthorizationStrategy.DESCRIPTOR.doCheckName_(value, project, Item.CONFIGURE);
}
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册