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 for issue #2874. #2875

Merged
merged 3 commits into from
Mar 9, 2019
Merged

Fix for issue #2874. #2875

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c8ab579
Fix for issue #2874. Add a cache for the tokens in case we are getting
praries880 Jan 24, 2019
f6c0d8d
Merge branch 'master' of https://github.com/azure/azure-sdk-for-java …
praries880 Mar 5, 2019
24f1182
Merge branch 'master' of https://github.com/azure/azure-sdk-for-java …
praries880 Mar 8, 2019
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
53 changes: 52 additions & 1 deletion ...n-provider-jar/src/main/java/com/microsoft/azure/msiAuthTokenProvider/MSICredentials.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;

/**
* Managed Service Identity token based credentials for use with a REST Service Client.
Expand All @@ -24,6 +27,9 @@ public final class MSICredentials{
//
private final List<Integer> retrySlots = new ArrayList<>();
//
private final Lock lock = new ReentrantLock();

private final ConcurrentHashMap<String, MSIToken> cache = new ConcurrentHashMap<>();
private final MSIConfigurationForVirtualMachine configForVM;
private final MSIConfigurationForAppService configForAppService;
private final HostType hostType;
Expand Down Expand Up @@ -157,7 +163,7 @@ public void updateObjectId(String objectId) {
public MSIToken getToken(String tokenAudience) throws IOException, AzureMSICredentialException{
switch (hostType) {
case VIRTUAL_MACHINE:
return this.retrieveTokenFromIDMSWithRetry(tokenAudience == null ? this.configForVM.resource() : tokenAudience);
return this.getTokenForVirtualMachineFromIMDSEndpoint(tokenAudience == null ? this.configForVM.resource() : tokenAudience);
case APP_SERVICE:
return this.getTokenForAppService(tokenAudience);
default:
Expand Down Expand Up @@ -217,6 +223,51 @@ private MSIToken getTokenForAppService(String tokenAudience) throws IOException,
}
}

private MSIToken getTokenForVirtualMachineFromIMDSEndpoint(String tokenAudience) throws AzureMSICredentialException {
String tokenIdentifier = tokenAudience;

String extraIdentifier = null;
if (this.configForVM.objectId() != null)
{
extraIdentifier = configForVM.objectId();
} else if (this.configForVM.clientId() != null) {
extraIdentifier = configForVM.clientId();
} else if (this.configForVM.identityId() != null) {
extraIdentifier = configForVM.identityId();
}

if (extraIdentifier != null) {
tokenIdentifier = tokenIdentifier + "#" + extraIdentifier;
}

MSIToken token = cache.get(tokenIdentifier);
if (token != null && !token.isExpired()) {
return token;
}

lock.lock();

try {
token = cache.get(tokenIdentifier);
if (token != null && !token.isExpired()) {
return token;
}

try {
token = retrieveTokenFromIDMSWithRetry(tokenAudience);
if (token != null) {
cache.put(tokenIdentifier, token);
}
} catch (IOException exception) {
throw new AzureMSICredentialException(exception);
}

return token;
} finally {
lock.unlock();
}
}

private MSIToken retrieveTokenFromIDMSWithRetry(String tokenAudience) throws AzureMSICredentialException, IOException {
StringBuilder payload = new StringBuilder();
final int imdsUpgradeTimeInMs = 70 * 1000;
Expand Down