Skip to content

Commit fbd401c

Browse files
tkyclilgreenbird
tkyc
and
lilgreenbird
authored
change MSAL logging info to FINER (#2489) (#2491)
Co-authored-by: lilgreenbird <[email protected]>
1 parent 0e97689 commit fbd401c

File tree

1 file changed

+39
-37
lines changed

1 file changed

+39
-37
lines changed

‎src/main/java/com/microsoft/sqlserver/jdbc/SQLServerMSAL4JUtils.java

Lines changed: 39 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -99,12 +99,12 @@ static SqlAuthenticationToken getSqlFedAuthToken(SqlFedAuthInfo fedAuthInfo, Str
9999
persistentTokenCacheAccessAspect = new PersistentTokenCacheAccessAspect();
100100
TOKEN_CACHE_MAP.addEntry(hashedSecret, persistentTokenCacheAccessAspect);
101101

102-
if (logger.isLoggable(Level.FINEST)) {
103-
logger.finest(LOGCONTEXT + ": cache token for user: " + user);
102+
if (logger.isLoggable(Level.FINER)) {
103+
logger.finer(LOGCONTEXT + ": cache token for user: " + user);
104104
}
105105
} else {
106-
if (logger.isLoggable(Level.FINEST)) {
107-
logger.finest(LOGCONTEXT + ": retrieved cached token for user: " + user);
106+
if (logger.isLoggable(Level.FINER)) {
107+
logger.finer(LOGCONTEXT + ": retrieved cached token for user: " + user);
108108
}
109109
}
110110

@@ -118,8 +118,8 @@ static SqlAuthenticationToken getSqlFedAuthToken(SqlFedAuthInfo fedAuthInfo, Str
118118

119119
final IAuthenticationResult authenticationResult = future.get();
120120

121-
if (logger.isLoggable(Level.FINEST)) {
122-
logger.finest(
121+
if (logger.isLoggable(Level.FINER)) {
122+
logger.finer(
123123
LOGCONTEXT + (authenticationResult.account() != null ? authenticationResult.account().username()
124124
+ ": " : "" + ACCESS_TOKEN_EXPIRE + authenticationResult.expiresOnDate()));
125125
}
@@ -165,12 +165,12 @@ static SqlAuthenticationToken getSqlFedAuthTokenPrincipal(SqlFedAuthInfo fedAuth
165165
persistentTokenCacheAccessAspect = new PersistentTokenCacheAccessAspect();
166166
TOKEN_CACHE_MAP.addEntry(hashedSecret, persistentTokenCacheAccessAspect);
167167

168-
if (logger.isLoggable(Level.FINEST)) {
169-
logger.finest(LOGCONTEXT + ": cache token for principal id: " + aadPrincipalID);
168+
if (logger.isLoggable(Level.FINER)) {
169+
logger.finer(LOGCONTEXT + ": cache token for principal id: " + aadPrincipalID);
170170
}
171171
} else {
172-
if (logger.isLoggable(Level.FINEST)) {
173-
logger.finest(LOGCONTEXT + ": retrieved cached token for principal id: " + aadPrincipalID);
172+
if (logger.isLoggable(Level.FINER)) {
173+
logger.finer(LOGCONTEXT + ": retrieved cached token for principal id: " + aadPrincipalID);
174174
}
175175
}
176176

@@ -183,8 +183,8 @@ static SqlAuthenticationToken getSqlFedAuthTokenPrincipal(SqlFedAuthInfo fedAuth
183183
.acquireToken(ClientCredentialParameters.builder(scopes).build());
184184
final IAuthenticationResult authenticationResult = future.get();
185185

186-
if (logger.isLoggable(Level.FINEST)) {
187-
logger.finest(
186+
if (logger.isLoggable(Level.FINER)) {
187+
logger.finer(
188188
LOGCONTEXT + (authenticationResult.account() != null ? authenticationResult.account().username()
189189
+ ": " : "" + ACCESS_TOKEN_EXPIRE + authenticationResult.expiresOnDate()));
190190
}
@@ -232,12 +232,12 @@ static SqlAuthenticationToken getSqlFedAuthTokenPrincipalCertificate(SqlFedAuthI
232232
persistentTokenCacheAccessAspect = new PersistentTokenCacheAccessAspect();
233233
TOKEN_CACHE_MAP.addEntry(hashedSecret, persistentTokenCacheAccessAspect);
234234

235-
if (logger.isLoggable(Level.FINEST)) {
236-
logger.finest(LOGCONTEXT + ": cache token for principal id: " + aadPrincipalID);
235+
if (logger.isLoggable(Level.FINER)) {
236+
logger.finer(LOGCONTEXT + ": cache token for principal id: " + aadPrincipalID);
237237
}
238238
} else {
239-
if (logger.isLoggable(Level.FINEST)) {
240-
logger.finest(LOGCONTEXT + ": retrieved cached token for principal id: " + aadPrincipalID);
239+
if (logger.isLoggable(Level.FINER)) {
240+
logger.finer(LOGCONTEXT + ": retrieved cached token for principal id: " + aadPrincipalID);
241241
}
242242
}
243243

@@ -270,21 +270,21 @@ static SqlAuthenticationToken getSqlFedAuthTokenPrincipalCertificate(SqlFedAuthI
270270
0, null);
271271
} catch (CertificateException | NoSuchAlgorithmException | IOException e) {
272272
// ignore not PKCS12 cert error, will try another format after this
273-
if (logger.isLoggable(Level.FINEST)) {
274-
logger.finest(LOGCONTEXT + "Error loading PKCS12 certificate: " + e.getMessage());
273+
if (logger.isLoggable(Level.FINER)) {
274+
logger.finer(LOGCONTEXT + "Error loading PKCS12 certificate: " + e.getMessage());
275275
}
276276
}
277277

278278
if (clientApplication == null) {
279279
// try loading X509 cert
280280
X509Certificate cert = (X509Certificate) SQLServerCertificateUtils.loadCertificate(certFile);
281281

282-
if (logger.isLoggable(Level.FINEST)) {
283-
logger.finest(LOGCONTEXT + "certificate type: " + cert.getType());
282+
if (logger.isLoggable(Level.FINER)) {
283+
logger.finer(LOGCONTEXT + "certificate type: " + cert.getType());
284284

285285
// we don't really need to do this, MSAL will fail if cert is not valid, but good to check here and throw with proper error message
286286
cert.checkValidity();
287-
logger.finest(LOGCONTEXT + "certificate: " + cert.toString());
287+
logger.finer(LOGCONTEXT + "certificate: " + cert.toString());
288288
}
289289

290290
PrivateKey privateKey = SQLServerCertificateUtils.loadPrivateKey(certKey, certKeyPassword);
@@ -299,8 +299,8 @@ static SqlAuthenticationToken getSqlFedAuthTokenPrincipalCertificate(SqlFedAuthI
299299
.acquireToken(ClientCredentialParameters.builder(scopes).build());
300300
final IAuthenticationResult authenticationResult = future.get();
301301

302-
if (logger.isLoggable(Level.FINEST)) {
303-
logger.finest(
302+
if (logger.isLoggable(Level.FINER)) {
303+
logger.finer(
304304
LOGCONTEXT + (authenticationResult.account() != null ? authenticationResult.account().username()
305305
+ ": " : "" + ACCESS_TOKEN_EXPIRE + authenticationResult.expiresOnDate()));
306306
}
@@ -335,8 +335,8 @@ static SqlAuthenticationToken getSqlFedAuthTokenIntegrated(SqlFedAuthInfo fedAut
335335
KerberosPrincipal kerberosPrincipal = new KerberosPrincipal("username");
336336
String user = kerberosPrincipal.getName();
337337

338-
if (logger.isLoggable(Level.FINEST)) {
339-
logger.finest(LOGCONTEXT + authenticationString + ": get FedAuth token integrated, user: " + user
338+
if (logger.isLoggable(Level.FINER)) {
339+
logger.finer(LOGCONTEXT + authenticationString + ": get FedAuth token integrated, user: " + user
340340
+ "realm name:" + kerberosPrincipal.getRealm());
341341
}
342342

@@ -354,8 +354,8 @@ static SqlAuthenticationToken getSqlFedAuthTokenIntegrated(SqlFedAuthInfo fedAut
354354

355355
final IAuthenticationResult authenticationResult = future.get();
356356

357-
if (logger.isLoggable(Level.FINEST)) {
358-
logger.finest(
357+
if (logger.isLoggable(Level.FINER)) {
358+
logger.finer(
359359
LOGCONTEXT + (authenticationResult.account() != null ? authenticationResult.account().username()
360360
+ ": " : "" + ACCESS_TOKEN_EXPIRE + authenticationResult.expiresOnDate()));
361361
}
@@ -378,8 +378,8 @@ static SqlAuthenticationToken getSqlFedAuthTokenInteractive(SqlFedAuthInfo fedAu
378378
String authenticationString) throws SQLServerException {
379379
ExecutorService executorService = Executors.newSingleThreadExecutor();
380380

381-
if (logger.isLoggable(Level.FINEST)) {
382-
logger.finest(LOGCONTEXT + authenticationString + ": get FedAuth token interactive for user: " + user);
381+
if (logger.isLoggable(Level.FINER)) {
382+
logger.finer(LOGCONTEXT + authenticationString + ": get FedAuth token interactive for user: " + user);
383383
}
384384

385385
lock.lock();
@@ -406,8 +406,10 @@ static SqlAuthenticationToken getSqlFedAuthTokenInteractive(SqlFedAuthInfo fedAu
406406
acc.append(account.username());
407407
}
408408
}
409-
logger.finest(LOGCONTEXT + "Accounts in cache = " + acc + ", size = "
410-
+ (accountsInCache == null ? null : accountsInCache.size()) + ", user = " + user);
409+
if (logger.isLoggable(Level.FINEST)) {
410+
logger.finest(LOGCONTEXT + "Accounts in cache = " + acc + ", size = "
411+
+ (accountsInCache == null ? null : accountsInCache.size()) + ", user = " + user);
412+
}
411413
}
412414
if (null != accountsInCache && !accountsInCache.isEmpty() && null != user && !user.isEmpty()) {
413415
IAccount account = getAccountByUsername(accountsInCache, user);
@@ -445,8 +447,8 @@ static SqlAuthenticationToken getSqlFedAuthTokenInteractive(SqlFedAuthInfo fedAu
445447
authenticationResult = future.get();
446448
}
447449

448-
if (logger.isLoggable(Level.FINEST)) {
449-
logger.finest(
450+
if (logger.isLoggable(Level.FINER)) {
451+
logger.finer(
450452
LOGCONTEXT + (authenticationResult.account() != null ? authenticationResult.account().username()
451453
+ ": " : "" + ACCESS_TOKEN_EXPIRE + authenticationResult.expiresOnDate()));
452454
}
@@ -526,8 +528,8 @@ PersistentTokenCacheAccessAspect getEntry(String value, String key) {
526528

527529
tokenCacheMap.put(key, persistentTokenCacheAccessAspect);
528530

529-
if (logger.isLoggable(Level.FINEST)) {
530-
logger.finest(LOGCONTEXT + ": entry expired for: " + value + " new entry will expire in: "
531+
if (logger.isLoggable(Level.FINER)) {
532+
logger.finer(LOGCONTEXT + ": entry expired for: " + value + " new entry will expire in: "
531533
+ TimeUnit.MILLISECONDS.toSeconds(PersistentTokenCacheAccessAspect.TIME_TO_LIVE) + "s");
532534
}
533535
}
@@ -539,8 +541,8 @@ PersistentTokenCacheAccessAspect getEntry(String value, String key) {
539541
void addEntry(String key, PersistentTokenCacheAccessAspect value) {
540542
value.setExpiryTime(System.currentTimeMillis() + PersistentTokenCacheAccessAspect.TIME_TO_LIVE);
541543
tokenCacheMap.put(key, value);
542-
if (logger.isLoggable(Level.FINEST)) {
543-
logger.finest(LOGCONTEXT + ": add entry for: " + value + ", will expire in: "
544+
if (logger.isLoggable(Level.FINER)) {
545+
logger.finer(LOGCONTEXT + ": add entry for: " + value + ", will expire in: "
544546
+ TimeUnit.MILLISECONDS.toSeconds(PersistentTokenCacheAccessAspect.TIME_TO_LIVE) + "s");
545547
}
546548
}

0 commit comments

Comments
 (0)