@@ -392,21 +392,30 @@ public HttpClientSettingsKey getHttpClientKey() throws SnowflakeSQLException {
392
392
boolean httpUseProxy = Boolean .parseBoolean (systemGetProperty ("http.useProxy" ));
393
393
String httpProxyHost = systemGetProperty ("http.proxyHost" );
394
394
String httpProxyPort = systemGetProperty ("http.proxyPort" );
395
+ String httpProxyUser = systemGetProperty ("http.proxyUser" );
396
+ String httpProxyPassword = systemGetProperty ("http.proxyPassword" );
395
397
String httpsProxyHost = systemGetProperty ("https.proxyHost" );
396
398
String httpsProxyPort = systemGetProperty ("https.proxyPort" );
399
+ String httpsProxyUser = systemGetProperty ("https.proxyUser" );
400
+ String httpsProxyPassword = systemGetProperty ("https.proxyPassword" );
397
401
String httpProxyProtocol = systemGetProperty ("http.proxyProtocol" );
398
402
String noProxy = systemGetEnv ("NO_PROXY" );
399
403
String nonProxyHosts = systemGetProperty ("http.nonProxyHosts" );
400
404
// log the JVM parameters that are being used
401
405
if (httpUseProxy ) {
402
406
logger .debug (
403
- "http.useProxy={}, http.proxyHost={}, http.proxyPort={}, https.proxyHost={},"
404
- + " https.proxyPort={}, http.nonProxyHosts={}, NO_PROXY={}, http.proxyProtocol={}" ,
407
+ "Proxy environment settings: http.useProxy={}, http.proxyHost={}, http.proxyPort={}, http.proxyUser={}, "
408
+ + "http.proxyPassword is {}, https.proxyHost={}, https.proxyPort={}, https.proxyUser={}, "
409
+ + "https.proxyPassword is {}, http.nonProxyHosts={}, NO_PROXY={}, http.proxyProtocol={}" ,
405
410
httpUseProxy ,
406
411
httpProxyHost ,
407
412
httpProxyPort ,
413
+ httpProxyUser ,
414
+ httpProxyPassword == null || httpProxyPassword .isEmpty () ? "not set" : "set" ,
408
415
httpsProxyHost ,
409
416
httpsProxyPort ,
417
+ httpsProxyUser ,
418
+ httpsProxyPassword == null || httpsProxyPassword .isEmpty () ? "not set" : "set" ,
410
419
nonProxyHosts ,
411
420
noProxy ,
412
421
httpProxyProtocol ,
@@ -447,8 +456,8 @@ public HttpClientSettingsKey getHttpClientKey() throws SnowflakeSQLException {
447
456
httpsProxyHost ,
448
457
proxyPort ,
449
458
combinedNonProxyHosts ,
450
- "" , /* user = empty */
451
- "" , /* password = empty */
459
+ httpsProxyUser ,
460
+ httpsProxyPassword ,
452
461
"https" ,
453
462
userAgentSuffix ,
454
463
gzipDisabled );
@@ -468,8 +477,8 @@ public HttpClientSettingsKey getHttpClientKey() throws SnowflakeSQLException {
468
477
httpProxyHost ,
469
478
proxyPort ,
470
479
combinedNonProxyHosts ,
471
- "" , /* user = empty */
472
- "" , /* password = empty */
480
+ httpProxyUser ,
481
+ httpProxyPassword ,
473
482
"http" ,
474
483
userAgentSuffix ,
475
484
gzipDisabled );
0 commit comments