Skip to content

MSI support minor alignments and adjustments #915

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

Merged
cheenamalhotra merged 31 commits into from
Dec 27, 2018
Merged

MSI support minor alignments and adjustments #915

Changes from 30 commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
538468a
Feature: Active Directory MSI Authentication Support
cheenamalhotra Oct 18, 2018
b5b3934
Remove Debug Logs
cheenamalhotra Oct 18, 2018
d01293d
Add support for User Assigned Managed Identity
cheenamalhotra Oct 19, 2018
af076a5
Merge branch 'ms-dev' into msi-support
cheenamalhotra Oct 19, 2018
bd5d7f9
Add Resource Description
cheenamalhotra Oct 19, 2018
39605ae
Add checks for exception cases.
cheenamalhotra Oct 19, 2018
810c8a8
Remove HostNameInCertificate fix for separate tracking
cheenamalhotra Oct 19, 2018
8ae6eb0
Fetch and store Expiry time with tokens
Oct 23, 2018
f84542a
Merge branch 'ms-dev' into msi-support
Oct 29, 2018
bc021b6
Changes to add back Refresh Token logic (with improvements)
Oct 31, 2018
9ba3643
Add support for Azure App Service and Functions
cheenamalhotra Nov 20, 2018
3b8cb9b
Merge branch 'ms-dev' into msi-support
cheenamalhotra Nov 20, 2018
5841982
Minor Fix in PooledConnection
cheenamalhotra Nov 22, 2018
ec2309b
Merge branch 'ms-dev' into msi-support
cheenamalhotra Nov 22, 2018
5c04311
Fix PooledConnection refresh token logic
cheenamalhotra Nov 23, 2018
eb8b54a
Revert to original design
cheenamalhotra Nov 26, 2018
86721e9
Merge branch 'ms-dev' into msi-support
cheenamalhotra Dec 11, 2018
459ced8
Fix PooledConnection
cheenamalhotra Dec 12, 2018
7297bde
Change MSI Object ID to Client ID
cheenamalhotra Dec 17, 2018
4371e88
Use Internal needsReconnect()
cheenamalhotra Dec 18, 2018
053ca0d
Remove unwanted code
cheenamalhotra Dec 18, 2018
ec379ff
Update APIs to MSIClientId
cheenamalhotra Dec 18, 2018
7bbf6f0
Fix numerous trimming calls
cheenamalhotra Dec 18, 2018
50f17e9
Add Retry logic for MSI Rest API call on VM
cheenamalhotra Dec 18, 2018
7887831
Reflect comments
cheenamalhotra Dec 21, 2018
47844c6
Updated Error Messages
cheenamalhotra Dec 22, 2018
0271ea2
Error message updates
cheenamalhotra Dec 24, 2018
6fdbf70
Additional change for AAD MSI Authentication feature
cheenamalhotra Dec 27, 2018
0f55f3b
Move new property to end.
cheenamalhotra Dec 27, 2018
5a13898
Merge branch 'ms-dev' into msi-support
cheenamalhotra Dec 27, 2018
5c40d10
Duplicate entry
cheenamalhotra Dec 27, 2018
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
7 changes: 5 additions & 2 deletions src/main/java/com/microsoft/sqlserver/jdbc/SQLServerDriver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -480,7 +480,8 @@ public final class SQLServerDriver implements java.sql.Driver {
SQLServerDriverStringProperty.AUTHENTICATION.getDefaultValue(), false,
new String[] {SqlAuthentication.NotSpecified.toString(), SqlAuthentication.SqlPassword.toString(),
SqlAuthentication.ActiveDirectoryPassword.toString(),
SqlAuthentication.ActiveDirectoryIntegrated.toString()}),
SqlAuthentication.ActiveDirectoryIntegrated.toString(),
SqlAuthentication.ActiveDirectoryMSI.toString()}),
new SQLServerDriverPropertyInfo(SQLServerDriverIntProperty.SOCKET_TIMEOUT.toString(),
Integer.toString(SQLServerDriverIntProperty.SOCKET_TIMEOUT.getDefaultValue()), false, null),
new SQLServerDriverPropertyInfo(SQLServerDriverBooleanProperty.FIPS.toString(),
Expand Down Expand Up @@ -510,7 +511,9 @@ public final class SQLServerDriver implements java.sql.Driver {
Integer.toString(SQLServerDriverIntProperty.CANCEL_QUERY_TIMEOUT.getDefaultValue()), false, null),
new SQLServerDriverPropertyInfo(SQLServerDriverBooleanProperty.USE_BULK_COPY_FOR_BATCH_INSERT.toString(),
Boolean.toString(SQLServerDriverBooleanProperty.USE_BULK_COPY_FOR_BATCH_INSERT.getDefaultValue()),
false, TRUE_FALSE),};
false, TRUE_FALSE),
new SQLServerDriverPropertyInfo(SQLServerDriverStringProperty.MSI_CLIENT_ID.toString(),
SQLServerDriverStringProperty.MSI_CLIENT_ID.getDefaultValue(), false, null),};

/**
* Properties that can only be set by using Properties. Cannot set in connection string
Expand Down