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

Add logging when deriving realm #1672

Merged
merged 2 commits into from
Oct 20, 2021
Merged

Add logging when deriving realm #1672

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3249487
added logging
lilgreenbird Oct 19, 2021
1e52144
update
lilgreenbird Oct 19, 2021
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
18 changes: 15 additions & 3 deletions src/main/java/com/microsoft/sqlserver/jdbc/SSPIAuthentication.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ abstract class SSPIAuthentication {
*/
private static final Pattern SPN_PATTERN = Pattern.compile("MSSQLSvc/(.*):([^:@]+)(@.+)?",
Pattern.CASE_INSENSITIVE);

private static final Logger logger = Logger.getLogger("com.microsoft.sqlserver.jdbc.SSPIAuthentication");

/**
Expand Down Expand Up @@ -141,9 +141,14 @@ String enrichSpnWithRealm(SQLServerConnection con, String spn, boolean allowHost
// Realm is already present, no need to enrich, the job has already been done
return spn;
}

// Try to derive realm if not specified in the connection. This might take some time if DNS lookup is slow
if (logger.isLoggable(Level.FINER)) {
logger.finer("Deriving realm");
}

String dnsName = m.group(1);
String portOrInstance = m.group(2);
// If realm is not specified in the connection, try to derive it.
if (null == realm || realm.trim().isEmpty()) {
RealmValidator realmValidator = getRealmValidator();
realm = findRealmFromHostname(realmValidator, dnsName);
Expand All @@ -152,7 +157,7 @@ String enrichSpnWithRealm(SQLServerConnection con, String spn, boolean allowHost
try {
String canonicalHostName = InetAddress.getByName(dnsName).getCanonicalHostName();
realm = findRealmFromHostname(realmValidator, canonicalHostName);
// match means hostname is correct (for instance if server name was an IP) so override dnsName as well
// match means hostname is correct (eg if server name was an IP) so override dnsName as well
dnsName = canonicalHostName;
} catch (UnknownHostException e) {
// ignored, cannot canonicalize
Expand All @@ -162,9 +167,16 @@ String enrichSpnWithRealm(SQLServerConnection con, String spn, boolean allowHost
}
}
}

if (null == realm) {
if (logger.isLoggable(Level.FINER)) {
logger.finer("Could not derive realm.");
}
return spn;
} else {
if (logger.isLoggable(Level.FINER)) {
logger.finer("Derived realm: " + realm);
}
StringBuilder sb = new StringBuilder("MSSQLSvc/");
sb.append(dnsName).append(":").append(portOrInstance).append("@").append(realm.toUpperCase(Locale.ENGLISH));
return sb.toString();
Expand Down