From 0ce41bc82cf05ac4dcead4aaded112fc8c00da45 Mon Sep 17 00:00:00 2001
From: Miod Vallat <miod.vallat@open-xchange.com>
Date: Mon, 27 Jan 2025 12:47:06 +0100
Subject: [PATCH 1/2] Add test for the "Duplicate RW transaction" LMDB
 exception.

---
 .../test_LuaRecordsLMDB.py                    | 88 +++++++++++++++++++
 1 file changed, 88 insertions(+)
 create mode 100644 regression-tests.auth-py/test_LuaRecordsLMDB.py

diff --git a/regression-tests.auth-py/test_LuaRecordsLMDB.py b/regression-tests.auth-py/test_LuaRecordsLMDB.py
new file mode 100644
index 000000000000..942dd3d94630
--- /dev/null
+++ b/regression-tests.auth-py/test_LuaRecordsLMDB.py
@@ -0,0 +1,88 @@
+#!/usr/bin/env python
+import unittest
+import dns
+import os
+import subprocess
+
+from authtests import AuthTest
+
+class TestLuaRecordsLMDB(AuthTest):
+    # Copied from AuthTest, without the bind-config and bind-dnssec fields,
+    # since these tests target LMDB an a backend.
+    _config_template_default = """
+daemon=no
+socket-dir={confdir}
+cache-ttl=0
+negquery-cache-ttl=0
+query-cache-ttl=0
+log-dns-queries=yes
+log-dns-details=yes
+loglevel=9
+distributor-threads=1"""
+
+    _config_template = """
+launch=lmdb
+enable-lua-records
+"""
+
+    _zones = {
+        'example.org': """
+example.org.                 3600 IN SOA  {soa}
+example.org.                 3600 IN NS   ns1.example.org.
+example.org.                 3600 IN NS   ns2.example.org.
+ns1.example.org.             3600 IN A    {prefix}.10
+ns2.example.org.             3600 IN A    {prefix}.11
+
+config    IN    LUA    LUA ("settings={{stringmatch='Programming in Lua'}} "
+                            "EUWips={{'{prefix}.101','{prefix}.102'}}      "
+                            "EUEips={{'192.168.42.101','192.168.42.102'}}  "
+                            "NLips={{'{prefix}.111', '{prefix}.112'}}      "
+                            "USAips={{'{prefix}.103', '192.168.42.105'}}   ")
+
+nested-lua.example.org.      3600 IN LUA  A   ( ";include('config') "
+                                                "return pickrandom(EUWips)" )
+
+        """
+    }
+
+    @classmethod
+    def generateAllAuthConfig(cls, confdir):
+        # This is very similar to AuthTest.generateAllAuthConfig,
+        # but for lmdb backend, we ignore auth keys but need to load-zone
+        # into lmdb storage.
+        cls.generateAuthConfig(confdir)
+
+        for zonename, zonecontent in cls._zones.items():
+            cls.generateAuthZone(confdir,
+                                 zonename,
+                                 zonecontent)
+            pdnsutilCmd = [os.environ['PDNSUTIL'],
+                           '--config-dir=%s' % confdir,
+                           'load-zone',
+                           zonename,
+                           os.path.join(confdir, '%s.zone' % zonename)]
+
+            print(' '.join(pdnsutilCmd))
+            try:
+                subprocess.check_output(pdnsutilCmd, stderr=subprocess.STDOUT)
+            except subprocess.CalledProcessError as e:
+                raise AssertionError('%s failed (%d): %s' % (pdnsutilCmd, e.returncode, e.output))
+
+    def testPickRandomWithNestedLua(self):
+        """
+        Basic pickrandom() test with a set of A records, with a bit of lua inclusion
+        """
+
+        expected = [dns.rrset.from_text('nested-lua.example.org.', 0, dns.rdataclass.IN, 'A',
+                                        '{prefix}.101'.format(prefix=self._PREFIX)),
+                    dns.rrset.from_text('nested-lua.example.org.', 0, dns.rdataclass.IN, 'A',
+                                        '{prefix}.102'.format(prefix=self._PREFIX))]
+
+        query = dns.message.make_query('nested-lua.example.org', 'A')
+        res = self.sendUDPQuery(query)
+        self.assertRcodeEqual(res, dns.rcode.NOERROR)
+        self.assertAnyRRsetInAnswer(res, expected)
+
+if __name__ == '__main__':
+    unittest.main()
+    exit(0)

From e36e27e83cd431e1ecdcf0edd8d696b9f5140c8c Mon Sep 17 00:00:00 2001
From: Miod Vallat <miod.vallat@open-xchange.com>
Date: Mon, 27 Jan 2025 16:10:37 +0100
Subject: [PATCH 2/2] Fix "Duplicate RW transaction" LMDB exception.

The check was too strict and would prevent any RO transaction to coexist
with RW transactions. But LMDB is designed to allow this - on the other
hand there can be only one active RW transaction at a time.
---
 ext/lmdb-safe/lmdb-safe.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ext/lmdb-safe/lmdb-safe.cc b/ext/lmdb-safe/lmdb-safe.cc
index f0db35fd811e..7c4f2d300a8a 100644
--- a/ext/lmdb-safe/lmdb-safe.cc
+++ b/ext/lmdb-safe/lmdb-safe.cc
@@ -235,8 +235,9 @@ MDBRWTransactionImpl::MDBRWTransactionImpl(MDBEnv *parent, MDB_txn *txn):
 MDB_txn *MDBRWTransactionImpl::openRWTransaction(MDBEnv *env, MDB_txn *parent, int flags)
 {
   MDB_txn *result;
-  if(env->getROTX() || env->getRWTX())
+  if(env->getRWTX() != 0) {
     throw std::runtime_error("Duplicate RW transaction");
+  }
 
   if(int rc=mdb_txn_begin(env->d_env, parent, flags, &result))
     throw std::runtime_error("Unable to start RW transaction: "+std::string(mdb_strerror(rc)));