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

Fix for Github issue 629 (SNOW-902727) #1513

Merged
merged 4 commits into from
Mar 6, 2024
+15 −6
Merged

Fix for Github issue 629 (SNOW-902727) #1513

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
480104f
Fix for Github issue 629 (SNOW-902727)
sfc-gh-spanaite Sep 19, 2023
19980e5
Remove logging password
sfc-gh-pbulawa Mar 5, 2024
3690005
Removed redundant check
sfc-gh-pbulawa Mar 5, 2024
afdca19
Fix typo
sfc-gh-pbulawa Mar 6, 2024
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
21 changes: 15 additions & 6 deletions src/main/java/net/snowflake/client/core/SFBaseSession.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,21 +392,30 @@ public HttpClientSettingsKey getHttpClientKey() throws SnowflakeSQLException {
boolean httpUseProxy = Boolean.parseBoolean(systemGetProperty("http.useProxy"));
String httpProxyHost = systemGetProperty("http.proxyHost");
String httpProxyPort = systemGetProperty("http.proxyPort");
String httpProxyUser = systemGetProperty("http.proxyUser");
String httpProxyPassword = systemGetProperty("http.proxyPassword");
String httpsProxyHost = systemGetProperty("https.proxyHost");
String httpsProxyPort = systemGetProperty("https.proxyPort");
String httpsProxyUser = systemGetProperty("https.proxyUser");
String httpsProxyPassword = systemGetProperty("https.proxyPassword");
String httpProxyProtocol = systemGetProperty("http.proxyProtocol");
String noProxy = systemGetEnv("NO_PROXY");
String nonProxyHosts = systemGetProperty("http.nonProxyHosts");
// log the JVM parameters that are being used
if (httpUseProxy) {
logger.debug(
"http.useProxy={}, http.proxyHost={}, http.proxyPort={}, https.proxyHost={},"
+ " https.proxyPort={}, http.nonProxyHosts={}, NO_PROXY={}, http.proxyProtocol={}",
"Proxy environment settings: http.useProxy={}, http.proxyHost={}, http.proxyPort={}, http.proxyUser={}, "
+ "http.proxyPassword is {}, https.proxyHost={}, https.proxyPort={}, https.proxyUser={}, "
+ "https.proxyPassword is {}, http.nonProxyHosts={}, NO_PROXY={}, http.proxyProtocol={}",
httpUseProxy,
httpProxyHost,
httpProxyPort,
httpProxyUser,
httpProxyPassword == null || httpProxyPassword.isEmpty() ? "not set" : "set",
httpsProxyHost,
httpsProxyPort,
httpsProxyUser,
httpsProxyPassword == null || httpsProxyPassword.isEmpty() ? "not set" : "set",
nonProxyHosts,
noProxy,
httpProxyProtocol,
Expand Down Expand Up @@ -447,8 +456,8 @@ public HttpClientSettingsKey getHttpClientKey() throws SnowflakeSQLException {
httpsProxyHost,
proxyPort,
combinedNonProxyHosts,
"", /* user = empty */
"", /* password = empty */
httpsProxyUser,
httpsProxyPassword,
"https",
userAgentSuffix,
gzipDisabled);
Expand All @@ -468,8 +477,8 @@ public HttpClientSettingsKey getHttpClientKey() throws SnowflakeSQLException {
httpProxyHost,
proxyPort,
combinedNonProxyHosts,
"", /* user = empty */
"", /* password = empty */
httpProxyUser,
httpProxyPassword,
sfc-gh-pfus marked this conversation as resolved.
Show resolved Hide resolved
"http",
userAgentSuffix,
gzipDisabled);
Expand Down
Loading