commit b05da82dfc33bcf590fe5b21bc55023b0c6fb27d
author satish-csi <67928686+satish-csi@users.noreply.github.com> Sat Mar 06 03:59:04 2021 +0530
committer GitHub <noreply@github.com> Fri Mar 05 17:29:04 2021 -0500
tree c397f8267eb0db07cc1a0c0f4b702059d8b8d778
parent 6fe765a2242f8178fe930006768f79958f261e96

VFS-782 - Pass correct proxy authentication credentials (#117)

* VFS-782 - pass correct proxy authentication credentials

* Add test case for proxy authentication correction

* Revert unwanted changes

commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/http4/Http4FileProvider.java

diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/http4/Http4FileProvider.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/http4/Http4FileProvider.java
index 13516d8..ae01daa 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/http4/Http4FileProvider.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/http4/Http4FileProvider.java
@@ -248,9 +248,9 @@
                 if (proxyAuthData != null) {
                     final UsernamePasswordCredentials proxyCreds = new UsernamePasswordCredentials(
                             UserAuthenticatorUtils.toString(
-                                    UserAuthenticatorUtils.getData(authData, UserAuthenticationData.USERNAME, null)),
+                                    UserAuthenticatorUtils.getData(proxyAuthData, UserAuthenticationData.USERNAME, null)),
                             UserAuthenticatorUtils.toString(
-                                    UserAuthenticatorUtils.getData(authData, UserAuthenticationData.PASSWORD, null)));
+                                    UserAuthenticatorUtils.getData(proxyAuthData, UserAuthenticationData.PASSWORD, null)));
 
                     credsProvider.setCredentials(new AuthScope(proxyHost.getHostName(), proxyHost.getPort()),
                             proxyCreds);

commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/http5/Http5FileProvider.java

diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/http5/Http5FileProvider.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/http5/Http5FileProvider.java
index d3d2db4..37a41f6 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/http5/Http5FileProvider.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/http5/Http5FileProvider.java
@@ -259,8 +259,8 @@
                 if (proxyAuthData != null) {
                     final UsernamePasswordCredentials proxyCreds = new UsernamePasswordCredentials(
                             UserAuthenticatorUtils.toString(
-                                    UserAuthenticatorUtils.getData(authData, UserAuthenticationData.USERNAME, null)),
-                            UserAuthenticatorUtils.getData(authData, UserAuthenticationData.PASSWORD, null));
+                                    UserAuthenticatorUtils.getData(proxyAuthData, UserAuthenticationData.USERNAME, null)),
+                            UserAuthenticatorUtils.getData(proxyAuthData, UserAuthenticationData.PASSWORD, null));
 
                     // set proxy host port
                     credsProvider.setCredentials(new AuthScope(proxyHost.getHostName(), proxyHost.getPort()),