Improve TOTP validation: trim whitespace and standardize auth error logs

Author: sharmagot

vertica_python/vertica/connection.py

@@ -313,13 +313,15 @@ def __init__(self, options: Optional[Dict[str, Any]] = None) -> None:
         if self.totp is not None:
             if not isinstance(self.totp, str):
                 raise TypeError('The value of connection option "totp" should be a string')
+            # Normalize: trim surrounding whitespace
+            self.totp = self.totp.strip()
             # Validate TOTP format: must be 6 numeric digits, with explicit non-numeric error
             if not self.totp.isdigit():
-                self._logger.error('Invalid TOTP: contains non-numeric characters')
-                raise errors.ConnectionError('Invalid TOTP: contains non-numeric characters')
+                self._logger.error('Authentication failed: Invalid TOTP: contains non-numeric characters')
+                raise errors.ConnectionError('Authentication failed: Invalid TOTP: contains non-numeric characters')
             if len(self.totp) != 6:
-                self._logger.error('Invalid TOTP format in connection options. Must be a 6-digit number.')
-                raise errors.ConnectionError('Invalid TOTP format: Must be a 6-digit number.')
+                self._logger.error('Authentication failed: Invalid TOTP: must be 6 digits')
+                raise errors.ConnectionError('Authentication failed: Invalid TOTP: must be 6 digits')
             self._logger.info('TOTP received in connection options')
 
         # OAuth authentication setup
@@ -981,10 +983,10 @@ def send_startup(totp_value=None):
                             short_msg = match.group(1).strip() if match else error_msg.strip()
 
                             if "Invalid TOTP" in short_msg:
-                                print("Authentication failed: Invalid TOTP token.")
-                                self._logger.error("Authentication failed: Invalid TOTP token.")
+                                print("Authentication failed: Invalid TOTP")
+                                self._logger.error("Authentication failed: Invalid TOTP")
                                 self.close_socket()
-                                raise errors.ConnectionError("Authentication failed: Invalid TOTP token.")
+                                raise errors.ConnectionError("Authentication failed: Invalid TOTP")
 
                             # Generic error fallback
                             print(f"Authentication failed: {short_msg}")
@@ -1012,14 +1014,16 @@ def send_startup(totp_value=None):
                                     self._logger.error("Invalid TOTP: Cannot be empty.")
                                     raise errors.ConnectionError("Invalid TOTP: Cannot be empty.")
 
+                                # ❌ Normalize: trim whitespace
+                                totp_input = totp_input.strip()
                                 # ❌ Validate TOTP format: explicit non-numeric error, then length check
                                 if not totp_input.isdigit():
-                                    self._logger.error("Invalid TOTP: contains non-numeric characters")
-                                    raise errors.ConnectionError("Invalid TOTP: contains non-numeric characters")
+                                    self._logger.error("Authentication failed: Invalid TOTP: contains non-numeric characters")
+                                    raise errors.ConnectionError("Authentication failed: Invalid TOTP: contains non-numeric characters")
                                 if len(totp_input) != 6:
                                     print("Invalid TOTP format. Please enter a 6-digit code.")
-                                    self._logger.error("Invalid TOTP format entered.")
-                                    raise errors.ConnectionError("Invalid TOTP format: Must be a 6-digit number.")
+                                    self._logger.error("Authentication failed: Invalid TOTP: must be 6 digits")
+                                    raise errors.ConnectionError("Authentication failed: Invalid TOTP: must be 6 digits")
                                 # ✅ Valid TOTP — retry connection
                                 totp = totp_input
                                 self.close_socket()