Browse Source

SONAR-21589 Revert gitlab login permission for no group sync to read_user

tags/10.5.0.89998
Nolwenn Cadic 1 month ago
parent
commit
c966f4783a

+ 2
- 1
server/sonar-auth-gitlab/src/main/java/org/sonar/auth/gitlab/GitLabIdentityProvider.java View File

@@ -42,6 +42,7 @@ import static java.util.stream.Collectors.toSet;
public class GitLabIdentityProvider implements OAuth2IdentityProvider {

public static final String API_SCOPE = "api";
public static final String READ_USER_SCOPE = "read_user";
public static final String KEY = "gitlab";
private final GitLabSettings gitLabSettings;
private final ScribeGitLabOauth2Api scribeApi;
@@ -93,7 +94,7 @@ public class GitLabIdentityProvider implements OAuth2IdentityProvider {
checkState(isEnabled(), "GitLab authentication is disabled");
return new ServiceBuilder(gitLabSettings.applicationId())
.apiSecret(gitLabSettings.secret())
.defaultScope(API_SCOPE)
.defaultScope(gitLabSettings.syncUserGroups() ? API_SCOPE : READ_USER_SCOPE)
.callback(context.getCallbackUrl());
}


+ 1
- 1
server/sonar-auth-gitlab/src/test/java/org/sonar/auth/gitlab/GitLabIdentityProviderTest.java View File

@@ -85,7 +85,7 @@ public class GitLabIdentityProviderTest {

gitLabIdentityProvider.init(initContext);

verify(initContext).redirectTo("http://server/oauth/authorize?response_type=code&client_id=123&redirect_uri=http%3A%2F%2Fserver%2Fcallback&scope=api");
verify(initContext).redirectTo("http://server/oauth/authorize?response_type=code&client_id=123&redirect_uri=http%3A%2F%2Fserver%2Fcallback&scope=read_user");
}

@Test

Loading…
Cancel
Save