fixup! SNOW-1902886: Validate account input

Author: sfc-gh-turbaszek

src/snowflake/connector/connection.py

@@ -669,6 +669,13 @@ def __init__(
         self._file_operation_parser = FileOperationParser(self)
         self._stream_downloader = StreamDownloader(self)
 
+    @staticmethod
+    def _validate_account(account_str):
+        if not is_valid_account_identifier(account_str):
+            raise ValueError(
+                "Invalid account identifier: only letters, digits, '_' and '-' allowed; no dots or slashes"
+            )
+
     # Deprecated
     @property
     def insecure_mode(self) -> bool:
@@ -1628,6 +1635,7 @@ def __config(self, **kwargs):
             raise TypeError("auth_class must subclass AuthByPlugin")
 
         if "account" in kwargs:
+            self._validate_account(kwargs["account"])
             if "host" not in kwargs:
                 self._host = construct_hostname(kwargs.get("region"), self._account)
 
@@ -1748,20 +1756,8 @@ def __config(self, **kwargs):
                 ProgrammingError,
                 {"msg": "Account must be specified", "errno": ER_NO_ACCOUNT_NAME},
             )
-        if self._account:
-            # Allow legacy formats like "acc.region" to continue parsing into simple account id
-            if "." in self._account:
-                self._account = parse_account(self._account)
-            if not is_valid_account_identifier(self._account):
-                Error.errorhandler_wrapper(
-                    self,
-                    None,
-                    ProgrammingError,
-                    {
-                        "msg": "Invalid account identifier: only letters, digits, '_' and '-' allowed; no dots or slashes",
-                        "errno": ER_INVALID_VALUE,
-                    },
-                )
+        if self._account and "." in self._account:
+            self._account = parse_account(self._account)
 
         if not isinstance(self._backoff_policy, Callable) or not isinstance(
             self._backoff_policy(), Iterator

src/snowflake/connector/util_text.py

@@ -265,9 +265,11 @@ def is_valid_account_identifier(account: str) -> bool:
     """
     if not isinstance(account, str) or not account:
         return False
-    if "." in account or "/" in account or "\\" in account:
+
+    if "/" in account or "\\" in account:
         return False
-    return bool(ACCOUNT_ID_VALIDATOR_RE.fullmatch(account))
+
+    return all(bool(ACCOUNT_ID_VALIDATOR_RE.fullmatch(p)) for p in account.split("."))
 
 
 def parse_account(account):

test/unit/test_parse_account.py

@@ -3,6 +3,7 @@
 
 import pytest
 
+from snowflake.connector import connect
 from snowflake.connector.util_text import is_valid_account_identifier, parse_account
 
 
@@ -17,17 +18,43 @@ def test_parse_account_basic():
 
 
 @pytest.mark.parametrize(
-    "value,expected",
+    "value",
     [
-        ("abc", True),
-        ("ABC", True),
-        ("a_b-c1", True),
-        ("a.b", False),
-        ("a/b", False),
-        ("a\\b", False),
-        ("", False),
-        ("snowflakecomputing.com", False),
+        "abc",
+        "aaa.bbb.ccc",
+        "aaa.bbb.ccc.ddd" "ABC",
+        "a_b-c1",
+        "account1",
+        "my_account",
+        "my-account",
+        "account_123",
+        "ACCOUNT_NAME",
     ],
 )
-def test_is_valid_account_identifier(value, expected):
-    assert is_valid_account_identifier(value) is expected
+def test_is_valid_account_identifier(value):
+    assert is_valid_account_identifier(value) is True
+
+
+@pytest.mark.parametrize(
+    "value",
+    [
+        "a/b",
+        "a\\b",
+        "",
+        "aa.bb.ccc/dddd",
+        "account@domain",
+        "account name",
+        "account\ttab",
+        "account\nnewline",
+        "account:port",
+        "account;semicolon",
+        "account'quote",
+        'account"doublequote',
+    ],
+)
+def test_is_invalid_account_identifier(value):
+    assert is_valid_account_identifier(value) is False
+    with pytest.raises(ValueError) as err:
+        connect(account=value, user="jdoe", password="***")
+
+    assert "Invalid account identifier" in str(err)