Merge pull request #8075 from rouault/fix_qgis_53715

OpenFileGDB: make Open() to fail if requested to open in update mode …
OSGeo · Jul 8, 2023 · 301f31b · 301f31b
2 parents 441744a + 409a8de
commit 301f31b
Show file tree

Hide file tree

Showing 3 changed files with 71 additions and 3 deletions.
diff --git a/autotest/ogr/ogr_openfilegdb.py b/autotest/ogr/ogr_openfilegdb.py
@@ -31,6 +31,7 @@
 
 import os
 import shutil
+import sys
 
 import gdaltest
 import ogrtest
@@ -1731,6 +1732,7 @@ def test_ogr_openfilegdb_17():
 # Read curves
 
 
+@pytest.mark.require_driver("CSV")
 def test_ogr_openfilegdb_18():
 
     ds = ogr.Open("data/filegdb/curves.gdb")
@@ -1774,6 +1776,7 @@ def test_ogr_openfilegdb_19():
 # one of the starting point (#7017)
 
 
+@pytest.mark.require_driver("CSV")
 def test_ogr_openfilegdb_20():
 
     ds = ogr.Open("data/filegdb/filegdb_polygonzm_m_not_closing_with_curves.gdb")
@@ -2464,6 +2467,47 @@ def test_ogr_openfilegdb_read_relationships():
     assert rel.GetRelatedTableType() == "media"
 
 
+###############################################################################
+# Test opening a read-only database in update mode
+
+
+@pytest.mark.skipif(sys.platform != "linux", reason="Incorrect platform")
+def test_ogr_openfilegdb_read_readonly_in_update_mode():
+
+    if os.getuid() == 0:
+        pytest.skip("running as root... skipping")
+
+    shutil.copytree("data/filegdb/Domains.gdb", "tmp/testreadonly.gdb")
+    os.chmod("tmp/testreadonly.gdb", 0o555)
+    for f in os.listdir("tmp/testreadonly.gdb"):
+        os.chmod("tmp/testreadonly.gdb/" + f, 0o555)
+
+    try:
+        with pytest.raises(Exception):
+            ogr.Open("tmp/testreadonly.gdb", update=1)
+
+        assert ogr.Open("tmp/testreadonly.gdb")
+
+        # Only turn on a few system tables in read-write mode, but not the
+        # layer of interest
+        for f in os.listdir("tmp/testreadonly.gdb"):
+            if f.startswith("a00000001.") or f.startswith("a00000004."):
+                os.chmod("tmp/testreadonly.gdb/" + f, 0o755)
+        ds = ogr.Open("tmp/testreadonly.gdb", update=1)
+        lyr = ds.GetLayer(0)
+        with pytest.raises(
+            Exception, match="Cannot open Roads in update mode, but only in read-only"
+        ):
+            lyr.TestCapability(ogr.OLCSequentialWrite)
+        assert lyr.TestCapability(ogr.OLCSequentialWrite) == 0
+
+    finally:
+        os.chmod("tmp/testreadonly.gdb", 0o755)
+        for f in os.listdir("tmp/testreadonly.gdb"):
+            os.chmod("tmp/testreadonly.gdb/" + f, 0o755)
+        shutil.rmtree("tmp/testreadonly.gdb")
+
+
 ###############################################################################
 # Cleanup
 

diff --git a/ogr/ogrsf_frmts/openfilegdb/ogropenfilegdbdatasource.cpp b/ogr/ogrsf_frmts/openfilegdb/ogropenfilegdbdatasource.cpp
@@ -279,7 +279,8 @@ bool OGROpenFileGDBDataSource::Open(const GDALOpenInfo *poOpenInfo)
     m_osGDBSystemCatalogFilename =
         CPLFormFilename(m_osDirName, "a00000001", "gdbtable");
     if (!FileExists(m_osGDBSystemCatalogFilename.c_str()) ||
-        !oTable.Open(m_osGDBSystemCatalogFilename.c_str(), false))
+        !oTable.Open(m_osGDBSystemCatalogFilename.c_str(),
+                     poOpenInfo->eAccess == GA_Update))
     {
         if (nInterestTable > 0 && FileExists(poOpenInfo->pszFilename))
         {

diff --git a/ogr/ogrsf_frmts/openfilegdb/ogropenfilegdblayer.cpp b/ogr/ogrsf_frmts/openfilegdb/ogropenfilegdblayer.cpp
@@ -363,8 +363,31 @@ int OGROpenFileGDBLayer::BuildLayerDefinition()
         if (!(m_poLyrTable->Open(m_osGDBFilename, m_bEditable,
                                  GetDescription())))
         {
-            Close();
-            return FALSE;
+            if (m_bEditable)
+            {
+                // Retry in read-only mode
+                m_bEditable = false;
+                delete m_poLyrTable;
+                m_poLyrTable = new FileGDBTable();
+                if (!(m_poLyrTable->Open(m_osGDBFilename, m_bEditable,
+                                         GetDescription())))
+                {
+                    Close();
+                    return FALSE;
+                }
+                else
+                {
+                    CPLError(
+                        CE_Failure, CPLE_FileIO,
+                        "Cannot open %s in update mode, but only in read-only",
+                        GetDescription());
+                }
+            }
+            else
+            {
+                Close();
+                return FALSE;
+            }
         }
     }