TileDB: make its identify() method more restrictive

by not identifying /vsi file systems it doesn't handle Relates to conda-forge/tiledb-feedstock#228
rouault · Jan 31, 2024 · d7c93f0 · d7c93f0
1 parent b615a92
commit d7c93f0
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 6 deletions.
diff --git a/frmts/tiledb/tiledbcommon.cpp b/frmts/tiledb/tiledbcommon.cpp
@@ -133,9 +133,17 @@ int TileDBDataset::Identify(GDALOpenInfo *poOpenInfo)
             return TRUE;
         }
 
+        const bool bIsS3OrGS =
+            STARTS_WITH_CI(poOpenInfo->pszFilename, "/VSIS3/") ||
+            STARTS_WITH_CI(poOpenInfo->pszFilename, "/VSIGS/");
+        // If this is a /vsi virtual file systems, bail out, except if it is S3 or GS.
+        if (!bIsS3OrGS && STARTS_WITH(poOpenInfo->pszFilename, "/vsi"))
+        {
+            return false;
+        }
+
         if (poOpenInfo->bIsDirectory ||
-            ((STARTS_WITH_CI(poOpenInfo->pszFilename, "/VSIS3/") ||
-              STARTS_WITH_CI(poOpenInfo->pszFilename, "/VSIGS/")) &&
+            (bIsS3OrGS &&
              !EQUAL(CPLGetExtension(poOpenInfo->pszFilename), "tif")))
         {
             tiledb::Context ctx;

diff --git a/frmts/tiledb/tiledbdrivercore.cpp b/frmts/tiledb/tiledbdrivercore.cpp
@@ -51,10 +51,20 @@ static int TileDBDriverIdentifySimplified(GDALOpenInfo *poOpenInfo)
         return TRUE;
     }
 
-    if (poOpenInfo->bIsDirectory ||
-        ((STARTS_WITH_CI(poOpenInfo->pszFilename, "/VSIS3/") ||
-          STARTS_WITH_CI(poOpenInfo->pszFilename, "/VSIGS/")) &&
-         !EQUAL(CPLGetExtension(poOpenInfo->pszFilename), "tif")))
+    const bool bIsS3OrGS = STARTS_WITH_CI(poOpenInfo->pszFilename, "/VSIS3/") ||
+                           STARTS_WITH_CI(poOpenInfo->pszFilename, "/VSIGS/");
+    // If this is a /vsi virtual file systems, bail out, except if it is S3 or GS.
+    if (!bIsS3OrGS && STARTS_WITH(poOpenInfo->pszFilename, "/vsi"))
+    {
+        return false;
+    }
+
+    if (poOpenInfo->bIsDirectory)
+    {
+        return GDAL_IDENTIFY_UNKNOWN;
+    }
+
+    if (bIsS3OrGS && !EQUAL(CPLGetExtension(poOpenInfo->pszFilename), "tif"))
     {
         return GDAL_IDENTIFY_UNKNOWN;
     }