[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - ucb/source

[Noel Grandin (via logerrit)]

 ucb/source/ucp/webdav-curl/CurlSession.cxx |   15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

New commits:
commit a721558ce2135bfd9ffe07da7a0bfff4b574086b
Author:     Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Fri Aug 18 13:49:54 2023 +0200
Commit:     Aron Budea <aron.bu...@collabora.com>
CommitDate: Fri Sep 29 02:45:00 2023 +0200

    Fix curl proxy access for non-authenticated proxy
    
    If rSession.m_Proxy.aName is a simple host-name, the CurlUri constructor
    will fail with CURLUE_BAD_SCHEME, so just ignore the error here,
    we only care about parsing out the username/password
    
    Change-Id: Iec2d6e7315a5899ddddf6120a43199b75bf62db2
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155834
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
    (cherry picked from commit 9b30b4b1678e8be15ba51d236bd9a3e693d8d3d6)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157318
    Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
    (cherry picked from commit 4b5e94e3d718b6afc571db3cff8321c44436c1ad)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157322
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
    Reviewed-by: Aron Budea <aron.bu...@collabora.com>

diff --git a/ucb/source/ucp/webdav-curl/CurlSession.cxx 
b/ucb/source/ucp/webdav-curl/CurlSession.cxx
index 98be7579a423..e9882f76acf5 100644
--- a/ucb/source/ucp/webdav-curl/CurlSession.cxx
+++ b/ucb/source/ucp/webdav-curl/CurlSession.cxx
@@ -1216,11 +1216,18 @@ auto CurlProcessor::ProcessRequest(
     ::std::optional<Auth> oAuthProxy;
     if (pEnv && !rSession.m_isAuthenticatedProxy && 
!rSession.m_Proxy.aName.isEmpty())
     {
-        // the hope is that this must be a URI
-        CurlUri const uri(rSession.m_Proxy.aName);
-        if (!uri.GetUser().isEmpty() || !uri.GetPassword().isEmpty())
+        try
+        {
+            // the hope is that this must be a URI
+            CurlUri const uri(rSession.m_Proxy.aName);
+            if (!uri.GetUser().isEmpty() || !uri.GetPassword().isEmpty())
+            {
+                oAuthProxy.emplace(uri.GetUser(), uri.GetPassword(), 
CURLAUTH_ANY);
+            }
+        }
+        catch (DAVException&)
         {
-            oAuthProxy.emplace(uri.GetUser(), uri.GetPassword(), CURLAUTH_ANY);
+            // ignore any parsing failure here
         }
     }
     decltype(CURLAUTH_ANY) const authSystem(CURLAUTH_NEGOTIATE | CURLAUTH_NTLM 
| CURLAUTH_NTLM_WB);