Skip to content

Commit cd5d01e

Browse files
committed
- fixes a bug where the auth provider would add the JWT on wrong hostnames
1 parent e85001d commit cd5d01e

2 files changed

Lines changed: 65 additions & 14 deletions

File tree

‎src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java‎

Lines changed: 26 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,12 @@
99
import okhttp3.Request;
1010
import com.microsoft.graph.exceptions.ErrorConstants.*;
1111

12+
import java.net.MalformedURLException;
13+
import java.net.URL;
14+
import java.util.Arrays;
15+
import java.util.HashSet;
1216
import java.util.List;
17+
import java.util.Locale;
1318

1419
import javax.annotation.Nonnull;
1520

@@ -59,7 +64,9 @@ public TokenCredentialAuthProvider(@Nonnull final List<String> scopes, @Nonnull
5964
*/
6065
@Override
6166
public void authenticateRequest(@Nonnull final IHttpRequest request) {
62-
request.addHeader(AuthConstants.AUTHORIZATION_HEADER, AuthConstants.BEARER + getAccessToken());
67+
if(ShouldAuthenticateRequest(request.getRequestUrl().toString())) {
68+
request.addHeader(AuthConstants.AUTHORIZATION_HEADER, AuthConstants.BEARER + getAccessToken());
69+
}
6370
}
6471

6572
/**
@@ -71,17 +78,33 @@ public void authenticateRequest(@Nonnull final IHttpRequest request) {
7178
@Override
7279
@Nonnull
7380
public Request authenticateRequest(@Nonnull final Request request) {
74-
return request.newBuilder()
81+
if(ShouldAuthenticateRequest(request.url().toString())) {
82+
return request.newBuilder()
7583
.addHeader(AuthConstants.AUTHORIZATION_HEADER, AuthConstants.BEARER + getAccessToken())
7684
.build();
85+
} else {
86+
return request;
87+
}
88+
}
89+
90+
private static final HashSet<String> validGraphHostNames = new HashSet<>(Arrays.asList("graph.microsoft.com", "graph.microsoft.us", "dod-graph.microsoft.us", "graph.microsoft.de", "microsoftgraph.chinacloudapi.cn"));
91+
private boolean ShouldAuthenticateRequest(@Nonnull final String requestUrl) {
92+
try {
93+
final URL url = new URL(requestUrl);
94+
final String hostName = url.getHost().toLowerCase(Locale.getDefault());
95+
return validGraphHostNames.contains(hostName);
96+
} catch (MalformedURLException ex) {
97+
return false;
98+
}
99+
77100
}
78101

79102
/**
80103
* Returns an AccessToken as a string
81104
*
82105
* @return String representing the retrieved AccessToken
83106
*/
84-
String getAccessToken() {
107+
private String getAccessToken() {
85108
String accessToken = null;
86109
try {
87110
AccessToken token = this.tokenCredential.getToken(this.context).block();

‎src/test/java/com/microsoft/graph/authentication/TokenCredentialAuthProviderTest.java‎

Lines changed: 39 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,12 @@
22

33
import com.azure.core.credential.TokenCredential;
44
import com.microsoft.graph.exceptions.AuthenticationException;
5-
import com.microsoft.graph.httpcore.IHttpRequest;
65
import com.microsoft.graph.mocks.MockIHttpRequest;
76
import com.microsoft.graph.mocks.MockTokenCredential;
8-
import com.microsoft.graph.options.HeaderOption;
97
import okhttp3.Request;
108
import org.junit.Assert;
119
import org.junit.Test;
1210

13-
import java.util.List;
14-
1511
import static org.junit.Assert.*;
1612

1713
public class TokenCredentialAuthProviderTest {
@@ -22,13 +18,13 @@ public class TokenCredentialAuthProviderTest {
2218
public void TokenCredentialAuthProviderTestICoreAuthentication() throws AuthenticationException {
2319

2420
//Arrange
25-
Request request = new Request.Builder().url("https://localhost").build();
26-
TokenCredential mockCredential = MockTokenCredential.getMockTokenCredential();
27-
TokenCredentialAuthProvider authProvider = new TokenCredentialAuthProvider(mockCredential);
21+
final Request request = new Request.Builder().url("https://graph.microsoft.com").build();
22+
final TokenCredential mockCredential = MockTokenCredential.getMockTokenCredential();
23+
final TokenCredentialAuthProvider authProvider = new TokenCredentialAuthProvider(mockCredential);
2824

2925
//Act
3026
Assert.assertNull(request.header(AuthConstants.AUTHORIZATION_HEADER));
31-
Request authenticatedRequest = authProvider.authenticateRequest(request);
27+
final Request authenticatedRequest = authProvider.authenticateRequest(request);
3228

3329
//Assert
3430
Assert.assertEquals(request.url(), authenticatedRequest.url());
@@ -40,9 +36,9 @@ public void TokenCredentialAuthProviderTestICoreAuthentication() throws Authenti
4036
public void TokenCredentialAuthProviderTestIAuthentication() throws AuthenticationException {
4137

4238
//Arrange
43-
TokenCredential mockCredential = MockTokenCredential.getMockTokenCredential();
44-
MockIHttpRequest request = new MockIHttpRequest("https://localhost");
45-
TokenCredentialAuthProvider authProvider = new TokenCredentialAuthProvider(mockCredential);
39+
final TokenCredential mockCredential = MockTokenCredential.getMockTokenCredential();
40+
final MockIHttpRequest request = new MockIHttpRequest("https://graph.microsoft.com");
41+
final TokenCredentialAuthProvider authProvider = new TokenCredentialAuthProvider(mockCredential);
4642

4743
//Act
4844
Assert.assertTrue(request.getHeaders().isEmpty());
@@ -52,4 +48,36 @@ public void TokenCredentialAuthProviderTestIAuthentication() throws Authenticati
5248
Assert.assertTrue(request.getHeaders().get(0).getName().equals(AuthConstants.AUTHORIZATION_HEADER));
5349
Assert.assertTrue(request.getHeaders().get(0).getValue().equals(AuthConstants.BEARER + this.testToken));
5450
}
51+
@Test
52+
public void TokenCredentialAuthProviderDoesNotAddTokenOnInvalidDomainsTestICoreAuthentication() throws AuthenticationException {
53+
54+
//Arrange
55+
final Request request = new Request.Builder().url("https://localhost").build();
56+
final TokenCredential mockCredential = MockTokenCredential.getMockTokenCredential();
57+
final TokenCredentialAuthProvider authProvider = new TokenCredentialAuthProvider(mockCredential);
58+
59+
//Act
60+
Assert.assertNull(request.header(AuthConstants.AUTHORIZATION_HEADER));
61+
final Request authenticatedRequest = authProvider.authenticateRequest(request);
62+
63+
//Assert
64+
Assert.assertEquals(request.url(), authenticatedRequest.url());
65+
Assert.assertNull(authenticatedRequest.header(AuthConstants.AUTHORIZATION_HEADER));
66+
}
67+
68+
@Test
69+
public void TokenCredentialAuthProviderDoesNotAddTokenOnInvalidDomainsTestIAuthentication() throws AuthenticationException {
70+
71+
//Arrange
72+
final TokenCredential mockCredential = MockTokenCredential.getMockTokenCredential();
73+
final MockIHttpRequest request = new MockIHttpRequest("https://localhost");
74+
final TokenCredentialAuthProvider authProvider = new TokenCredentialAuthProvider(mockCredential);
75+
76+
//Act
77+
Assert.assertTrue(request.getHeaders().isEmpty());
78+
authProvider.authenticateRequest(request);
79+
80+
//Assert
81+
Assert.assertTrue(request.getHeaders().isEmpty());
82+
}
5583
}

0 commit comments

Comments
 (0)