aboutsummaryrefslogtreecommitdiffstats
path: root/sonar-server
diff options
context:
space:
mode:
authorJulien Lancelot <julien.lancelot@sonarsource.com>2014-06-20 11:32:54 +0200
committerJulien Lancelot <julien.lancelot@sonarsource.com>2014-06-20 11:32:54 +0200
commit5113cefa1ca5f4aa87e7fbca0b076533e80980ef (patch)
treec180884e58be835e18aa4d14578d532df0c99bbd /sonar-server
parentf992861dbc8cf7f769e7d1f2a7460b0e5b06a5dd (diff)
downloadsonarqube-5113cefa1ca5f4aa87e7fbca0b076533e80980ef.tar.gz
sonarqube-5113cefa1ca5f4aa87e7fbca0b076533e80980ef.zip
DoPrivileged do not set anymore a System user
Diffstat (limited to 'sonar-server')
-rw-r--r--sonar-server/src/main/java/org/sonar/server/qualitygate/QualityGates.java7
-rw-r--r--sonar-server/src/main/java/org/sonar/server/user/DoPrivileged.java5
-rw-r--r--sonar-server/src/test/java/org/sonar/server/user/DoPrivilegedTest.java2
3 files changed, 3 insertions, 11 deletions
diff --git a/sonar-server/src/main/java/org/sonar/server/qualitygate/QualityGates.java b/sonar-server/src/main/java/org/sonar/server/qualitygate/QualityGates.java
index 924eb4a914c..9d1fcc9872b 100644
--- a/sonar-server/src/main/java/org/sonar/server/qualitygate/QualityGates.java
+++ b/sonar-server/src/main/java/org/sonar/server/qualitygate/QualityGates.java
@@ -39,11 +39,7 @@ import org.sonar.core.qualitygate.db.QualityGateConditionDto;
import org.sonar.core.qualitygate.db.QualityGateDao;
import org.sonar.core.qualitygate.db.QualityGateDto;
import org.sonar.server.component.persistence.ComponentDao;
-import org.sonar.server.exceptions.BadRequestException;
-import org.sonar.server.exceptions.Errors;
-import org.sonar.server.exceptions.Message;
-import org.sonar.server.exceptions.NotFoundException;
-import org.sonar.server.exceptions.ServerException;
+import org.sonar.server.exceptions.*;
import org.sonar.server.user.UserSession;
import org.sonar.server.util.Validation;
@@ -364,7 +360,6 @@ public class QualityGates {
}
private void checkPermission(UserSession userSession) {
- userSession.checkLoggedIn();
userSession.checkGlobalPermission(GlobalPermissions.QUALITY_PROFILE_ADMIN);
}
}
diff --git a/sonar-server/src/main/java/org/sonar/server/user/DoPrivileged.java b/sonar-server/src/main/java/org/sonar/server/user/DoPrivileged.java
index edae46ab7ae..954191b136b 100644
--- a/sonar-server/src/main/java/org/sonar/server/user/DoPrivileged.java
+++ b/sonar-server/src/main/java/org/sonar/server/user/DoPrivileged.java
@@ -29,9 +29,6 @@ import java.util.Locale;
*/
public final class DoPrivileged {
- private static final String SYSTEM_LOGIN = "<system>";
- private static final String SYSTEM_NAME = "<System>";
-
private DoPrivileged() {
// Only static stuff
}
@@ -70,7 +67,7 @@ public final class DoPrivileged {
public boolean hasProjectPermission(String permission, String projectKey) {
return true;
}
- }.setLocale(Locale.getDefault()).setLogin(SYSTEM_LOGIN).setName(SYSTEM_NAME));
+ }.setLocale(Locale.getDefault()));
}
private void stop() {
diff --git a/sonar-server/src/test/java/org/sonar/server/user/DoPrivilegedTest.java b/sonar-server/src/test/java/org/sonar/server/user/DoPrivilegedTest.java
index e1db8f717b7..75a8bc7a32b 100644
--- a/sonar-server/src/test/java/org/sonar/server/user/DoPrivilegedTest.java
+++ b/sonar-server/src/test/java/org/sonar/server/user/DoPrivilegedTest.java
@@ -31,7 +31,7 @@ public class DoPrivilegedTest {
@Override
protected void doPrivileged() {
UserSession userSession = UserSession.get();
- assertThat(userSession.isLoggedIn()).isTrue();
+ assertThat(userSession.isLoggedIn()).isFalse();
assertThat(userSession.hasGlobalPermission("any permission")).isTrue();
assertThat(userSession.hasProjectPermission("any permission", "any project")).isTrue();
}