Tightened definition of easy connect string regular expression to avoid

parsing errors with connect descriptors containing the "/" character.

Author: anthony-tuininga

doc/src/release_notes.rst

@@ -34,6 +34,8 @@ Common Changes
     string`` is now raised consistently for both Thick and Thin modes.
     Previously, Thin mode was raising the error
     ``DPY-4030: invalid DRCP pool boundary {boundary}``.
+#)  Tightened definition of easy connect string regular expression to avoid
+    parsing errors with connect descriptors containing the ``/`` character.
 
 
 oracledb 2.1.1 (March 2024)

src/oracledb/impl/base/connect_params.pyx

@@ -51,7 +51,7 @@ CONTAINER_PARAM_NAMES = set((
 # regular expression used for determining if a connect string refers to an Easy
 # Connect string or not
 EASY_CONNECT_PATTERN = \
-        "((?P<protocol>\w+)://)?(?P<host>[^:/]+)(:(?P<port>\d+)?)?/" \
+        "^((?P<protocol>\w+)://)?(?P<host>[\w\d.-]+)(:(?P<port>\d+)?)?/" \
         "(?P<service_name>[^:?]*)(:(?P<server_type>\w+))?"
 
 # dictionary of tnsnames.ora files, indexed by the directory in which the file

tests/test_4500_connect_params.py

@@ -811,6 +811,24 @@ def test_4570(self):
         self.assertEqual(params.supershardingkey, super_sharding_key)
         self.assertEqual(params.ssl_context, ssl_context)
 
+    def test_4571(self):
+        "4571 - parse connect descriptor with / character in tnsnames.ora"
+        connect_string = """
+            (DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=my_host)(PORT=4571))
+            (CONNECT_DATA=(SERVICE_NAME=my_service_name))
+            (SECURITY=(MY_WALLET_DIRECTORY=/some/dir)))"""
+        network_service_name = "alias_4571"
+        with tempfile.TemporaryDirectory() as temp_dir:
+            file_name = os.path.join(temp_dir, "tnsnames.ora")
+            with open(file_name, "w") as f:
+                f.write(f"{network_service_name} = {connect_string}")
+            params = oracledb.ConnectParams(config_dir=temp_dir)
+            params.parse_connect_string(network_service_name)
+        self.assertEqual(params.host, "my_host")
+        self.assertEqual(params.port, 4571)
+        self.assertEqual(params.service_name, "my_service_name")
+        self.assertEqual(params.wallet_location, "/some/dir")
+
 
 if __name__ == "__main__":
     test_env.run_test_cases()