SONAR-8761 remove calls of WS to UserSession#isRoot()

replace by UserSession#isSystemAdministrator()

diff --git a/it/it-tests/src/test/java/it/serverSystem/RestartTest.java b/it/it-tests/src/test/java/it/serverSystem/RestartTest.java
index 05b6fa3f52818200bcdeac88fda9ffa10c443904..495836ce6f75aa88925d4d820c369aa6191fec3e 100644 (file)
--- a/it/it-tests/src/test/java/it/serverSystem/RestartTest.java
+++ b/it/it-tests/src/test/java/it/serverSystem/RestartTest.java
@@ -33,6 +33,7 @@ import org.sonarqube.ws.client.GetRequest;
 import org.sonarqube.ws.client.PostRequest;
 import org.sonarqube.ws.client.WsClient;
 import org.sonarqube.ws.client.WsResponse;
+import org.sonarqube.ws.client.permission.AddUserWsRequest;
 import util.ItUtils;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -60,7 +61,7 @@ public class RestartTest {
   }
 
   @Test
-  public void restart_in_prod_mode_requires_root_and_restarts_WebServer_and_ES() throws Exception {
+  public void restart_in_prod_mode_requires_sysadmin_permission_and_restarts() throws Exception {
     // server classloader locks Jar files on Windows
     if (!SystemUtils.IS_OS_WINDOWS) {
       orchestrator = Orchestrator.builderEnv()
@@ -70,10 +71,10 @@ public class RestartTest {
 
       verifyFailWith403(() -> newWsClient(orchestrator).system().restart());
 
-      createNonRootUser("john", "doe");
+      createNonSystemAdministrator("john", "doe");
       verifyFailWith403(() -> ItUtils.newUserWsClient(orchestrator, "john", "doe").system().restart());
 
-      createRootUser("big", "boss");
+      createSystemAdministrator("big", "boss");
       ItUtils.newUserWsClient(orchestrator, "big", "boss").system().restart();
       WsResponse wsResponse = newAdminWsClient(orchestrator).wsConnector().call(new GetRequest("/api/system/status")).failIfNotSuccessful();
       assertThat(wsResponse.content()).contains("RESTARTING");
@@ -114,17 +115,17 @@ public class RestartTest {
     }
   }
 
-   private void createRootUser(String login, String password) {
+  private void createSystemAdministrator(String login, String password) {
     WsClient wsClient = newAdminWsClient(orchestrator);
-    createNonRootUser(wsClient, login, password);
-    wsClient.rootService().setRoot(login);
+    createNonSystemAdministrator(wsClient, login, password);
+    wsClient.permissions().addUser(new AddUserWsRequest().setLogin(login).setPermission("admin"));
   }
 
-  private void createNonRootUser(String login, String password) {
-    createNonRootUser(newAdminWsClient(orchestrator), login, password);
+  private void createNonSystemAdministrator(String login, String password) {
+    createNonSystemAdministrator(newAdminWsClient(orchestrator), login, password);
   }
 
-  private static void createNonRootUser(WsClient wsClient, String login, String password) {
+  private static void createNonSystemAdministrator(WsClient wsClient, String login, String password) {
     wsClient.wsConnector().call(
       new PostRequest("api/users/create")
         .setParam("login", login)

diff --git a/server/sonar-server/src/main/java/org/sonar/server/property/ws/IndexAction.java b/server/sonar-server/src/main/java/org/sonar/server/property/ws/IndexAction.java
index 42a5a70ab9ee15aba25e632e4979de757299f467..7154d689f7e91a368fda9493b11aa03d2f99e5ff 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/property/ws/IndexAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/property/ws/IndexAction.java
@@ -146,7 +146,9 @@ public class IndexAction implements WsAction {
   }
 
   private boolean hasAdminPermission(Optional<ComponentDto> component) {
-    return component.isPresent() ? userSession.hasComponentPermission(ADMIN, component.get()) : userSession.isRoot();
+    return component
+      .map(c -> userSession.hasComponentPermission(ADMIN, c))
+      .orElse(userSession.isSystemAdministrator());
   }
 
   private List<PropertyDto> loadGlobalSettings(DbSession dbSession, Optional<String> key) {

diff --git a/server/sonar-server/src/main/java/org/sonar/server/ui/ws/SettingsAction.java b/server/sonar-server/src/main/java/org/sonar/server/ui/ws/SettingsAction.java
index 65afbfdb246e96701e4c6b4b8bc370e56f075194..b104a0d89fba643c5874dcf62f1dfcf64c6b7088 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/ui/ws/SettingsAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/ui/ws/SettingsAction.java
@@ -57,13 +57,13 @@ public class SettingsAction implements NavigationWsAction {
 
   @Override
   public void handle(Request request, Response response) throws Exception {
-    boolean isRoot = userSession.isRoot();
+    boolean isSysAdmin = userSession.isSystemAdministrator();
 
     JsonWriter json = response.newJsonWriter().beginObject();
-    json.prop("showUpdateCenter", isRoot && settings.getBoolean(WebConstants.SONAR_UPDATECENTER_ACTIVATE));
+    json.prop("showUpdateCenter", isSysAdmin && settings.getBoolean(WebConstants.SONAR_UPDATECENTER_ACTIVATE));
 
     json.name("extensions").beginArray();
-    if (isRoot) {
+    if (isSysAdmin) {
       for (Page page : pageRepository.getGlobalPages(true)) {
         json.beginObject()
           .prop("key", page.getKey())

diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/ws/UserJsonWriter.java b/server/sonar-server/src/main/java/org/sonar/server/user/ws/UserJsonWriter.java
index 79591dd307dde19e3d581d4dc3f392baff321ec3..a26136bdc28cb038be218f21d1db5eb958f17083 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/user/ws/UserJsonWriter.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/user/ws/UserJsonWriter.java
@@ -93,7 +93,7 @@ public class UserJsonWriter {
   }
 
   private void writeGroupsIfNeeded(JsonWriter json, Collection<String> groups, @Nullable Collection<String> fields) {
-    if (isFieldNeeded(FIELD_GROUPS, fields) && userSession.isRoot()) {
+    if (isFieldNeeded(FIELD_GROUPS, fields) && userSession.isSystemAdministrator()) {
       json.name(FIELD_GROUPS).beginArray();
       for (String groupName : groups) {
         json.value(groupName);

diff --git a/server/sonar-server/src/main/java/org/sonar/server/usertoken/ws/TokenPermissionsValidator.java b/server/sonar-server/src/main/java/org/sonar/server/usertoken/ws/TokenPermissionsValidator.java
index 81397044761594b9622abe3db2b38871f4133e6a..e0008553358bfe409b450a2f3dc9727c26a2fe3e 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/usertoken/ws/TokenPermissionsValidator.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/usertoken/ws/TokenPermissionsValidator.java
@@ -31,7 +31,7 @@ class TokenPermissionsValidator {
 
   static void validate(UserSession userSession, @Nullable String requestLogin) {
     userSession.checkLoggedIn();
-    if (!userSession.isRoot() && !isLoggedInUser(userSession, requestLogin)) {
+    if (!userSession.isSystemAdministrator() && !isLoggedInUser(userSession, requestLogin)) {
       throw insufficientPrivilegesException();
     }
   }

diff --git a/server/sonar-server/src/test/java/org/sonar/server/tester/UserSessionRule.java b/server/sonar-server/src/test/java/org/sonar/server/tester/UserSessionRule.java
index 6f9d0c55bd7b602d385851cef003f087e24808bf..f71e74df9469db75ba9b1b1f55d6df0a0ce9160d 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/tester/UserSessionRule.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/tester/UserSessionRule.java
@@ -139,6 +139,16 @@ public class UserSessionRule implements TestRule, UserSession {
     return this;
   }
 
+  public UserSessionRule setSystemAdministrator() {
+    ensureMockUserSession().setSystemAdministrator(true);
+    return this;
+  }
+
+  public UserSessionRule setNonSystemAdministrator() {
+    ensureMockUserSession().setSystemAdministrator(false);
+    return this;
+  }
+
   @Override
   public Statement apply(Statement statement, Description description) {
     return this.statement(statement);

diff --git a/server/sonar-server/src/test/java/org/sonar/server/usertoken/ws/GenerateActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/usertoken/ws/GenerateActionTest.java
index 3b7a497fde3c70774de6b3b851994053e3f7c489..8e28e4a4f0b37c184b01349bf40ae03d28e6e535 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/usertoken/ws/GenerateActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/usertoken/ws/GenerateActionTest.java
@@ -79,7 +79,7 @@ public class GenerateActionTest {
 
   @Test
   public void json_example() {
-    userSession.logIn().setRoot();
+    logInAsSystemAdministrator();
 
     String response = ws.newRequest()
       .setMediaType(MediaTypes.JSON)
@@ -101,7 +101,7 @@ public class GenerateActionTest {
 
   @Test
   public void fail_if_name_is_longer_than_100_characters() {
-    userSession.logIn().setRoot();
+    logInAsSystemAdministrator();
 
     expectedException.expect(IllegalArgumentException.class);
     expectedException.expectMessage("Token name length (101) is longer than the maximum authorized (100)");
@@ -111,7 +111,7 @@ public class GenerateActionTest {
 
   @Test
   public void fail_if_login_does_not_exist() {
-    userSession.logIn().setRoot();
+    logInAsSystemAdministrator();
 
     expectedException.expect(ForbiddenException.class);
 
@@ -120,7 +120,7 @@ public class GenerateActionTest {
 
   @Test
   public void fail_if_name_is_blank() {
-    userSession.logIn().setRoot();
+    logInAsSystemAdministrator();
 
     expectedException.expect(BadRequestException.class);
     expectedException.expectMessage("The 'name' parameter must not be blank");
@@ -130,7 +130,7 @@ public class GenerateActionTest {
 
   @Test
   public void fail_if_token_with_same_login_and_name_exists() {
-    userSession.logIn().setRoot();
+    logInAsSystemAdministrator();
 
     newRequest(GRACE_HOPPER, TOKEN_NAME);
     expectedException.expect(BadRequestException.class);
@@ -141,7 +141,7 @@ public class GenerateActionTest {
 
   @Test
   public void fail_if_token_hash_already_exists_in_db() {
-    userSession.logIn().setRoot();
+    logInAsSystemAdministrator();
 
     when(tokenGenerator.hash(anyString())).thenReturn("987654321");
     db.getDbClient().userTokenDao().insert(db.getSession(), newUserToken().setTokenHash("987654321"));
@@ -154,7 +154,7 @@ public class GenerateActionTest {
 
   @Test
   public void throw_ForbiddenException_if_non_administrator_creates_token_for_someone_else() {
-    userSession.logIn().setNonRoot();
+    userSession.logIn().setNonSystemAdministrator();
 
     expectedException.expect(ForbiddenException.class);
 
@@ -187,4 +187,8 @@ public class GenerateActionTest {
       throw propagate(e);
     }
   }
+
+  private void logInAsSystemAdministrator() {
+    userSession.logIn().setSystemAdministrator();
+  }
 }

diff --git a/server/sonar-server/src/test/java/org/sonar/server/usertoken/ws/RevokeActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/usertoken/ws/RevokeActionTest.java
index 013888dd7ee0b82e8bd4554ee51652066d4da66a..7ef7baf7921768a7b5b9479dcb5fd82e9c68b4c5 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/usertoken/ws/RevokeActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/usertoken/ws/RevokeActionTest.java
@@ -65,7 +65,7 @@ public class RevokeActionTest {
 
   @Test
   public void delete_token_in_db() {
-    userSession.logIn().setRoot();
+    logInAsSystemAdministrator();
     insertUserToken(newUserToken().setLogin(GRACE_HOPPER).setName("token-to-delete"));
     insertUserToken(newUserToken().setLogin(GRACE_HOPPER).setName("token-to-keep-1"));
     insertUserToken(newUserToken().setLogin(GRACE_HOPPER).setName("token-to-keep-2"));
@@ -91,7 +91,7 @@ public class RevokeActionTest {
 
   @Test
   public void does_not_fail_when_incorrect_login_or_name() {
-    userSession.logIn().setRoot();
+    logInAsSystemAdministrator();
     insertUserToken(newUserToken().setLogin(GRACE_HOPPER).setName(TOKEN_NAME));
 
     newRequest(ADA_LOVELACE, "another-token-name");
@@ -131,4 +131,8 @@ public class RevokeActionTest {
     dbClient.userTokenDao().insert(dbSession, userToken);
     dbSession.commit();
   }
+
+  private void logInAsSystemAdministrator() {
+    userSession.logIn().setSystemAdministrator();
+  }
 }

diff --git a/server/sonar-server/src/test/java/org/sonar/server/usertoken/ws/SearchActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/usertoken/ws/SearchActionTest.java
index 9fcb1f079bb37efc508904ca5311f101e02943b4..bf448aa09fc7420a5b1d67f98596204494eb92bc 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/usertoken/ws/SearchActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/usertoken/ws/SearchActionTest.java
@@ -68,7 +68,7 @@ public class SearchActionTest {
 
   @Test
   public void search_json_example() {
-    userSession.logIn().setRoot();
+    logInAsSystemAdministrator();
 
     dbClient.userTokenDao().insert(dbSession, newUserToken()
       .setCreatedAt(1448523067221L)
@@ -111,7 +111,7 @@ public class SearchActionTest {
 
   @Test
   public void fail_when_login_does_not_exist() {
-    userSession.logIn().setRoot();
+    logInAsSystemAdministrator();
 
     expectedException.expect(NotFoundException.class);
     expectedException.expectMessage("User with login 'unknown-login' not found");
@@ -154,4 +154,8 @@ public class SearchActionTest {
 
     throw new IllegalStateException("unreachable");
   }
+
+  private void logInAsSystemAdministrator() {
+    userSession.logIn().setSystemAdministrator();
+  }
 }