[commons-vfs] branch master updated: VFS-782 - Pass correct proxy authentication credentials (#117)

[ggregory]

This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-vfs.git


The following commit(s) were added to refs/heads/master by this push:
     new b05da82  VFS-782 - Pass correct proxy authentication credentials (#117)
b05da82 is described below

commit b05da82dfc33bcf590fe5b21bc55023b0c6fb27d
Author: satish-csi <67928686+satish-...@users.noreply.github.com>
AuthorDate: Sat Mar 6 03:59:04 2021 +0530

    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
---
 .../org/apache/commons/vfs2/provider/http4/Http4FileProvider.java     | 4 ++--
 .../org/apache/commons/vfs2/provider/http5/Http5FileProvider.java     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

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 @@ public class Http4FileProvider extends 
AbstractOriginatingFileProvider {
                 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);
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 @@ public class Http5FileProvider extends 
AbstractOriginatingFileProvider {
                 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()),