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

MSI expiry date format fix for Azure Functions #1308

Merged
merged 2 commits into from
Apr 30, 2020
Merged

MSI expiry date format fix for Azure Functions #1308

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7b1e193
msi change
peterbae Apr 9, 2020
e9faea2
use stringbuilder
peterbae Apr 13, 2020
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
37 changes: 12 additions & 25 deletions src/main/java/com/microsoft/sqlserver/jdbc/SQLServerSecurityUtility.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,7 @@
import java.net.URL;
import java.security.InvalidKeyException;
import java.security.NoSuchAlgorithmException;
import java.text.DateFormat;
import java.text.MessageFormat;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
Expand Down Expand Up @@ -270,7 +268,7 @@ static SqlFedAuthToken getMSIAuthToken(String resource, String msiClientId) thro
&& !msiSecret.isEmpty();

if (isAzureFunction) {
urlString.append(msiEndpoint).append("?api-version=2017-09-01&resource=").append(resource);
urlString.append(msiEndpoint).append("?api-version=2019-08-01&resource=").append(resource);
} else {
urlString.append(ActiveDirectoryAuthentication.AZURE_REST_MSI_URL).append("&resource=").append(resource);
// Retry acquiring access token upto 20 times due to possible IMDS upgrade (Applies to VM only)
Expand All @@ -283,11 +281,7 @@ static SqlFedAuthToken getMSIAuthToken(String resource, String msiClientId) thro

// Append Client Id if available
if (null != msiClientId && !msiClientId.isEmpty()) {
if (isAzureFunction) {
urlString.append("&clientid=").append(msiClientId);
} else {
urlString.append("&client_id=").append(msiClientId);
}
urlString.append("&client_id=").append(msiClientId);
}

// Loop while maxRetry reaches its limit
Expand All @@ -299,7 +293,7 @@ static SqlFedAuthToken getMSIAuthToken(String resource, String msiClientId) thro
connection.setRequestMethod("GET");

if (isAzureFunction) {
connection.setRequestProperty("Secret", msiSecret);
connection.setRequestProperty("X-IDENTITY-HEADER", msiSecret);
if (connectionlogger.isLoggable(Level.FINER)) {
connectionlogger.finer("Using Azure Function/App Service MSI auth: " + urlString);
}
Expand All @@ -324,30 +318,23 @@ static SqlFedAuthToken getMSIAuthToken(String resource, String msiClientId) thro

Calendar cal = new Calendar.Builder().setInstant(new Date()).build();

int startIndex_ATX;

// Fetch expires_on
if (isAzureFunction) {
// Fetch expires_on
int startIndex_ATX = result
startIndex_ATX = result
.indexOf(ActiveDirectoryAuthentication.ACCESS_TOKEN_EXPIRES_ON_IDENTIFIER)
+ ActiveDirectoryAuthentication.ACCESS_TOKEN_EXPIRES_ON_IDENTIFIER.length();
String accessTokenExpiry = result.substring(startIndex_ATX,
result.indexOf("\"", startIndex_ATX + 1));
if (connectionlogger.isLoggable(Level.FINER)) {
connectionlogger.finer("MSI auth token expires on: " + accessTokenExpiry);
}

DateFormat df = new SimpleDateFormat(
ActiveDirectoryAuthentication.ACCESS_TOKEN_EXPIRES_ON_DATE_FORMAT);
cal = new Calendar.Builder().setInstant(df.parse(accessTokenExpiry)).build();
} else {
// Fetch expires_in
int startIndex_ATX = result
startIndex_ATX = result
.indexOf(ActiveDirectoryAuthentication.ACCESS_TOKEN_EXPIRES_IN_IDENTIFIER)
+ ActiveDirectoryAuthentication.ACCESS_TOKEN_EXPIRES_IN_IDENTIFIER.length();
String accessTokenExpiry = result.substring(startIndex_ATX,
result.indexOf("\"", startIndex_ATX + 1));
cal.add(Calendar.SECOND, Integer.parseInt(accessTokenExpiry));
}

String accessTokenExpiry = result.substring(startIndex_ATX,
result.indexOf("\"", startIndex_ATX + 1));
cal.add(Calendar.SECOND, Integer.parseInt(accessTokenExpiry));

return new SqlFedAuthToken(accessToken, cal.getTime());
}
} catch (Exception e) {
Expand Down