Merge pull request #14006 from rouault/vsis3_error_msg

/vsis3/: add compatibility for XML <Error> responses without <Message>

Author: rouault

autotest/gcore/vsis3.py

@@ -914,7 +914,7 @@ def method_req_1(self, request):
             request.send_response(307)
             response = """<?xml version="1.0" encoding="UTF-8"?>
             <Error>
-            <Message>bla</Message>
+            <!-- no <Message> to test compatibility with OpenStack Swift on CloudFerro -->
             <Code>TemporaryRedirect</Code>
             <Endpoint>localhost:%d</Endpoint>
             </Error>""" % request.server.port
@@ -984,6 +984,46 @@ def method_req_2(self, request):
     assert data == "bar"
 
 
+###############################################################################
+
+
+@pytest.mark.parametrize("with_error_message", [True, False])
+def test_vsis3_request_timeout(aws_test_config, webserver_port, with_error_message):
+    gdal.VSICurlClearCache()
+
+    error_msg = "<Message>message</Message>" if with_error_message else ""
+
+    handler = webserver.SequentialHandler()
+    handler.add(
+        "GET",
+        "/test_vsis3_request_timeout/?delimiter=%2F&list-type=2",
+        400,
+        {"Content-type": "application/xml"},
+        f"""<?xml version="1.0" encoding="UTF-8"?>
+            <Error>{error_msg}
+            <Code>RequestTimeout</Code>
+            </Error>""",
+    )
+    handler.add(
+        "GET",
+        "/test_vsis3_request_timeout/?delimiter=%2F&list-type=2",
+        200,
+        {"Content-type": "application/xml"},
+        """<?xml version="1.0" encoding="UTF-8"?>
+            <ListBucketResult>
+                <Prefix></Prefix>
+                <Contents>
+                    <Key>test.bin</Key>
+                    <LastModified>1970-01-01T00:00:01.000Z</LastModified>
+                    <Size>123456</Size>
+                </Contents>
+            </ListBucketResult>""",
+    )
+    with webserver.install_http_handler(handler):
+        with gdal.VSIFile("/vsis3/test_vsis3_request_timeout/test.bin", "rb"):
+            pass
+
+
 ###############################################################################
 # Test re-opening after changing configuration option (#2294)
 
@@ -1169,9 +1209,13 @@ def method(request):
     )
 
     with webserver.install_http_handler(handler):
-        f = open_for_read(
-            "/vsis3/s3_fake_bucket2/a_dir with_space/resource3 with_space.bin"
-        )
+        with gdaltest.error_raised(
+            gdal.CE_Warning,
+            match="Ignoring key 'a_dir with_space/../../not_ok' that has a path traversal pattern",
+        ):
+            f = open_for_read(
+                "/vsis3/s3_fake_bucket2/a_dir with_space/resource3 with_space.bin"
+            )
     if f is None:
         pytest.fail()
     gdal.VSIFCloseL(f)

port/cpl_aws.cpp

@@ -2761,17 +2761,26 @@ bool VSIS3HandleHelper::CanRestartOnError(const char *pszErrorMsg,
         return true;
     }
 
+    if (EQUAL(pszCode, "RequestTimeout"))
+    {
+        const char *pszMessage =
+            CPLGetXMLValue(psTree, "=Error.Message", nullptr);
+        if (pszMessage != nullptr)
+            CPLDebug("S3", "Request Timeout: %s", pszMessage);
+
+        CPLDestroyXMLNode(psTree);
+        return true;
+    }
+
     if (bSetError)
     {
         // Translate AWS errors into VSI errors.
+
         const char *pszMessage =
-            CPLGetXMLValue(psTree, "=Error.Message", nullptr);
+            CPLGetXMLValue(psTree, "=Error.Message", pszErrorMsg);
+        // Some S3 implementations (e.g. OpenStack) skip the Message part
 
-        if (pszMessage == nullptr)
-        {
-            VSIError(VSIE_ObjectStorageGenericError, "%s", pszErrorMsg);
-        }
-        else if (EQUAL(pszCode, "AccessDenied"))
+        if (EQUAL(pszCode, "AccessDenied"))
         {
             VSIError(VSIE_AccessDenied, "%s", pszMessage);
         }