From 83d5ac10a5b97162d201ad01d79c8811f32a3049 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20Gond=C5=BEa?= Date: Thu, 12 Sep 2013 17:00:13 +0200 Subject: [PATCH] [JENKINS-18485] Enable Computer.EXTENDED_READ permission using "hudson.security.ExtendedReadPermission". --- core/src/main/java/hudson/model/Computer.java | 5 ++++- test/src/main/java/hudson/cli/CLICommandInvoker.java | 1 + .../src/test/java/hudson/model/ComputerConfigDotXmlTest.java | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/hudson/model/Computer.java b/core/src/main/java/hudson/model/Computer.java index 8a97ddd2fb..0b2a4523ae 100644 --- a/core/src/main/java/hudson/model/Computer.java +++ b/core/src/main/java/hudson/model/Computer.java @@ -1351,7 +1351,10 @@ public /*transient*/ abstract class Computer extends Actionable implements Acces public static final PermissionGroup PERMISSIONS = new PermissionGroup(Computer.class,Messages._Computer_Permissions_Title()); public static final Permission CONFIGURE = new Permission(PERMISSIONS,"Configure", Messages._Computer_ConfigurePermission_Description(), Permission.CONFIGURE, PermissionScope.COMPUTER); - public static final Permission EXTENDED_READ = new Permission(PERMISSIONS,"ExtendedRead", Messages._Computer_ExtendedReadPermission_Description(), CONFIGURE, PermissionScope.COMPUTER); + /** + * @since TODO + */ + public static final Permission EXTENDED_READ = new Permission(PERMISSIONS,"ExtendedRead", Messages._Computer_ExtendedReadPermission_Description(), CONFIGURE, Boolean.getBoolean("hudson.security.ExtendedReadPermission"), new PermissionScope[]{PermissionScope.COMPUTER}); public static final Permission DELETE = new Permission(PERMISSIONS,"Delete", Messages._Computer_DeletePermission_Description(), Permission.DELETE, PermissionScope.COMPUTER); public static final Permission CREATE = new Permission(PERMISSIONS,"Create", Messages._Computer_CreatePermission_Description(), Permission.CREATE, PermissionScope.COMPUTER); public static final Permission DISCONNECT = new Permission(PERMISSIONS,"Disconnect", Messages._Computer_DisconnectPermission_Description(), Jenkins.ADMINISTER, PermissionScope.COMPUTER); diff --git a/test/src/main/java/hudson/cli/CLICommandInvoker.java b/test/src/main/java/hudson/cli/CLICommandInvoker.java index 85cda1d04b..76f96868d8 100644 --- a/test/src/main/java/hudson/cli/CLICommandInvoker.java +++ b/test/src/main/java/hudson/cli/CLICommandInvoker.java @@ -107,6 +107,7 @@ public class CLICommandInvoker { GlobalMatrixAuthorizationStrategy auth = new GlobalMatrixAuthorizationStrategy(); for(Permission p: permissions) { + p.setEnabled(true); auth.add(p, username); } rule.jenkins.setAuthorizationStrategy(auth); diff --git a/test/src/test/java/hudson/model/ComputerConfigDotXmlTest.java b/test/src/test/java/hudson/model/ComputerConfigDotXmlTest.java index 5500506ef3..e2f17f8d34 100644 --- a/test/src/test/java/hudson/model/ComputerConfigDotXmlTest.java +++ b/test/src/test/java/hudson/model/ComputerConfigDotXmlTest.java @@ -107,6 +107,7 @@ public class ComputerConfigDotXmlTest { GlobalMatrixAuthorizationStrategy auth = new GlobalMatrixAuthorizationStrategy(); rule.jenkins.setAuthorizationStrategy(auth); + Computer.EXTENDED_READ.setEnabled(true); auth.add(Computer.EXTENDED_READ, "user"); final OutputStream outputStream = captureOutput(); -- GitLab