Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: update the way how Azure OAuth2 token is validated #462

Merged
merged 1 commit into from
Mar 10, 2023
Merged

fix: update the way how Azure OAuth2 token is validated #462

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions ...s/src/main/java/org/eclipse/che/api/factory/server/azure/devops/AzureDevOpsApiClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,16 +126,6 @@ private AzureDevOpsUser getUser(String url, String authorizationHeader)
});
}

/**
* Returns the scopes of the OAuth token. Consider using the REST API:
*
* <p>https://learn.microsoft.com/en-us/rest/api/azure/devops/tokens/pats/get?view=azure-devops-rest-7.0&tabs=HTTP
*/
public String[] getTokenScopes(String authenticationToken)
throws ScmItemNotFoundException, ScmCommunicationException, ScmBadRequestException {
return scopes;
}

private <T> T executeRequest(
HttpClient httpClient,
HttpRequest request,
Expand Down
13 changes: 4 additions & 9 deletions ...rg/eclipse/che/api/factory/server/azure/devops/AzureDevOpsPersonalAccessTokenFetcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
import static org.eclipse.che.api.factory.server.azure.devops.AzureDevOps.getAuthenticateUrlPath;
import static org.eclipse.che.commons.lang.StringUtils.trimEnd;

import com.google.common.collect.Sets;
import java.util.Arrays;
import java.util.Optional;
import javax.inject.Inject;
Expand Down Expand Up @@ -136,20 +135,16 @@ public Optional<Boolean> isValid(PersonalAccessToken personalAccessToken) {
}

try {
AzureDevOpsUser user;
if (personalAccessToken.getScmTokenName() != null
&& personalAccessToken.getScmTokenName().startsWith(OAUTH_2_PREFIX)) {
String[] scopes = azureDevOpsApiClient.getTokenScopes(personalAccessToken.getToken());
return Optional.of(Sets.newHashSet(scopes).containsAll(Sets.newHashSet(this.scopes)));
user = azureDevOpsApiClient.getUserWithOAuthToken(personalAccessToken.getToken());
} else {
AzureDevOpsUser user =
user =
azureDevOpsApiClient.getUserWithPAT(
personalAccessToken.getToken(), personalAccessToken.getScmOrganization());
if (personalAccessToken.getScmUserId().equals(user.getId())) {
return Optional.of(Boolean.TRUE);
} else {
return Optional.of(Boolean.FALSE);
}
}
return Optional.of(personalAccessToken.getScmUserId().equals(user.getId()));
} catch (ScmItemNotFoundException | ScmCommunicationException | ScmBadRequestException e) {
return Optional.of(Boolean.FALSE);
}
Expand Down
118 changes: 0 additions & 118 deletions ...n/test/java/org/eclipse/che/api/factory/server/azure/devops/AzureDevOpsURLParserTest.java
View file
Open in desktop

This file was deleted.

53 changes: 22 additions & 31 deletions ...DevOpsPersonalAccessTokenFetcherTest.java → ...DevOpsPersonalAccessTokenFetcherTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,55 +11,44 @@
*/
package org.eclipse.che.api.factory.server.azure.devops;

import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import static org.testng.Assert.*;

import org.eclipse.che.api.auth.shared.dto.OAuthToken;
import org.eclipse.che.api.factory.server.scm.PersonalAccessToken;
import org.eclipse.che.api.factory.server.urlfactory.DevfileFilenamesProvider;
import org.eclipse.che.api.factory.server.urlfactory.URLFactoryBuilder;
import org.eclipse.che.commons.subject.Subject;
import org.eclipse.che.security.oauth.OAuthAPI;
import org.mockito.Mock;
import org.mockito.testng.MockitoTestNGListener;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Listeners;
import org.testng.annotations.Test;

import java.util.Optional;

import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import static org.testng.Assert.*;

/**
* @author Anatalii Bazko
*/
/** @author Anatalii Bazko */
@Listeners(MockitoTestNGListener.class)
public class AzureDevOpsPersonalAccessTokenFetcherTest {

@Mock
private AzureDevOpsApiClient azureDevOpsApiClient;
@Mock
private OAuthAPI oAuthAPI;
@Mock
private OAuthToken oAuthToken;
@Mock
private AzureDevOpsUser azureDevOpsUser;
@Mock private AzureDevOpsApiClient azureDevOpsApiClient;
@Mock private OAuthAPI oAuthAPI;
@Mock private OAuthToken oAuthToken;
@Mock private AzureDevOpsUser azureDevOpsUser;
private AzureDevOpsPersonalAccessTokenFetcher personalAccessTokenFetcher;

@BeforeMethod
protected void start() {
personalAccessTokenFetcher = new AzureDevOpsPersonalAccessTokenFetcher(
"localhost",
"https://dev.azure.com",
new String[]{},
azureDevOpsApiClient,
oAuthAPI);
personalAccessTokenFetcher =
new AzureDevOpsPersonalAccessTokenFetcher(
"localhost", "https://dev.azure.com", new String[] {}, azureDevOpsApiClient, oAuthAPI);
}

@Test
public void fetchPersonalAccessTokenShouldReturnNullIfScmServerUrlIsNotAzureDevOps() throws Exception {
PersonalAccessToken personalAccessToken = personalAccessTokenFetcher.fetchPersonalAccessToken(mock(Subject.class), "https://eclipse.org");
public void fetchPersonalAccessTokenShouldReturnNullIfScmServerUrlIsNotAzureDevOps()
throws Exception {
PersonalAccessToken personalAccessToken =
personalAccessTokenFetcher.fetchPersonalAccessToken(
mock(Subject.class), "https://eclipse.org");

assertNull(personalAccessToken);
}
Expand All @@ -68,9 +57,11 @@ public void fetchPersonalAccessTokenShouldReturnNullIfScmServerUrlIsNotAzureDevO
public void fetchPersonalAccessTokenShouldReturnToken() throws Exception {
when(oAuthAPI.getToken(AzureDevOps.PROVIDER_NAME)).thenReturn(oAuthToken);
when(azureDevOpsApiClient.getUserWithOAuthToken(any())).thenReturn(azureDevOpsUser);
when(azureDevOpsApiClient.getTokenScopes(any())).thenReturn(new String[]{"vso.code_full"});
when(azureDevOpsUser.getId()).thenReturn("user-id");

PersonalAccessToken personalAccessToken = personalAccessTokenFetcher.fetchPersonalAccessToken(mock(Subject.class), "https://dev.azure.com/");
PersonalAccessToken personalAccessToken =
personalAccessTokenFetcher.fetchPersonalAccessToken(
mock(Subject.class), "https://dev.azure.com/");

assertNotNull(personalAccessToken);
}
Expand Down
Loading