Skip to content

Kerberos Constrained Delegation Impersonated Credential Expiry fix #636

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
rene-ye merged 11 commits into from
May 31, 2018
Merged

Kerberos Constrained Delegation Impersonated Credential Expiry fix #636

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
dc68b14
Kerberos DC
rene-ye Feb 8, 2018
9ebc1b3
Merge branch 'dev' into KerbConsDel
rene-ye May 1, 2018
f4bf4ed
formatting fixes
rene-ye May 1, 2018
c532095
Merge branch 'dev' into KerbConsDel
rene-ye May 29, 2018
61d15e2
Merge branch 'dev' into KerbConsDel
cheenamalhotra May 29, 2018
d969b03
update felix to 3.5.0
rene-ye May 29, 2018
88dc78b
Revised implementation
rene-ye May 30, 2018
c44a30b
Merge branch 'dev' into KerbConsDel
rene-ye May 30, 2018
ead01d3
Updated flag set location
rene-ye May 31, 2018
2c59e1d
remoed unncessary function
rene-ye May 31, 2018
0345af1
Merge branch 'dev' into KerbConsDel
rene-ye May 31, 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
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>3.4.0</version>
<version>3.5.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
Expand Down
7 changes: 6 additions & 1 deletion src/main/java/com/microsoft/sqlserver/jdbc/KerbAuthentication.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ final class KerbAuthentication extends SSPIAuthentication {

private final GSSManager manager = GSSManager.getInstance();
private LoginContext lc = null;
private boolean isUserCreatedCredential = false;
private GSSCredential peerCredentials = null;
private GSSContext peerContext = null;

Expand Down Expand Up @@ -390,6 +391,7 @@ interface RealmValidator {
int port,
GSSCredential ImpersonatedUserCred) throws SQLServerException {
this(con, address, port);
isUserCreatedCredential = true;

@ulvii ulvii May 31, 2018

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we pass this flag to the constructor from logon()?
if (null != ImpersonatedUserCred)

@rene-ye rene-ye May 31, 2018

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

changes pushed

peerCredentials = ImpersonatedUserCred;
}

Expand All @@ -403,8 +405,11 @@ byte[] GenerateClientContext(byte[] pin,

int ReleaseClientContext() throws SQLServerException {
try {
if (null != peerCredentials)
if (null != peerCredentials && !isUserCreatedCredential) {
peerCredentials.dispose();
} else if (null != peerCredentials && isUserCreatedCredential) {
peerCredentials = null;
}
if (null != peerContext)
peerContext.dispose();
if (null != lc)
Expand Down
21 changes: 7 additions & 14 deletions src/main/java/com/microsoft/sqlserver/jdbc/SQLServerConnection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3435,9 +3435,10 @@ final boolean doExecute() throws SQLServerException {
if (integratedSecurity && AuthenticationScheme.nativeAuthentication == intAuthScheme)
authentication = new AuthenticationJNI(this, currentConnectPlaceHolder.getServerName(), currentConnectPlaceHolder.getPortNumber());
if (integratedSecurity && AuthenticationScheme.javaKerberos == intAuthScheme) {
if (null != ImpersonatedUserCred)
if (null != ImpersonatedUserCred) {
authentication = new KerbAuthentication(this, currentConnectPlaceHolder.getServerName(), currentConnectPlaceHolder.getPortNumber(),
ImpersonatedUserCred);
}
else
authentication = new KerbAuthentication(this, currentConnectPlaceHolder.getServerName(), currentConnectPlaceHolder.getPortNumber());
}
Expand All @@ -3459,7 +3460,6 @@ final boolean doExecute() throws SQLServerException {
// No need any further info from the server for token based authentication. So set _federatedAuthenticationRequested to true
federatedAuthenticationRequested = true;
}

try {
sendLogon(command, authentication, fedAuthFeatureExtensionData);

Expand All @@ -3473,21 +3473,14 @@ final boolean doExecute() throws SQLServerException {
connectionCommand(sqlStmt, "Change Settings");
}
}
}
finally {
} finally {
if (integratedSecurity) {
if (null != authentication)
if (null != authentication) {
authentication.ReleaseClientContext();
authentication = null;

authentication = null;
}
if (null != ImpersonatedUserCred) {
try {
ImpersonatedUserCred.dispose();
}
catch (GSSException e) {
if (connectionlogger.isLoggable(Level.FINER))
connectionlogger.finer(toString() + " Release of the credentials failed GSSException: " + e);
}
ImpersonatedUserCred = null;
}
}
}
Expand Down