[_688] impl raw _server_version

Author: d-w-moore

irods/connection.py

@@ -82,30 +82,26 @@ def __init__(self, pool, account):
         self._server_version = self._connect()
         self._disconnected = False
 
-        scheme = self.account._original_authentication_scheme
-
-        # These variables are just useful diagnostics.  The login_XYZ() methods should fail by
-        # raising exceptions if they encounter authentication errors.
-        auth_module = auth_type = ""
-
-        if self.server_version >= (4, 3, 0):
-            auth_module = None
-            # use client side "plugin" module: irods.auth.<scheme>
-            irods.auth.load_plugins(subset=[scheme])
-            auth_module = getattr(irods.auth, scheme, None)
-            if auth_module:
-                auth_module.login(self)
-                auth_type = auth_module.__name__
-        else:
-            # use legacy (iRODS pre-4.3 style) authentication
-            auth_type = scheme
-            if scheme == NATIVE_AUTH_SCHEME:
-                self._login_native()
-            elif scheme == GSI_AUTH_SCHEME:
-                self.client_ctx = None
-                self._login_gsi()
-            elif scheme == PAM_AUTH_SCHEME:
-                self._login_pam()
+        if self.pool and not self.pool._need_auth:
+            return
+
+        try:
+            if not connect: return
+
+            scheme = self.account._original_authentication_scheme
+
+            # These variables are just useful diagnostics.  The login_XYZ() methods should fail by
+            # raising exceptions if they encounter authentication errors.
+            auth_module = auth_type = ''
+
+            if self.server_version >= (4,3,0):
+                auth_module = None
+                # use client side "plugin" module: irods.auth.<scheme>
+                irods.auth.load_plugins(subset=[scheme])
+                auth_module = getattr(irods.auth, scheme, None)
+                if auth_module:
+                    auth_module.login(self)
+                    auth_type = auth_module.__name__
             else:
                 auth_type = None
 

irods/pool.py

@@ -57,6 +57,7 @@ def __init__(
             or application_name
             or DEFAULT_APPLICATION_NAME
         )
+        self._need_auth = True
 
         if connection_refresh_time > 0:
             self.refresh_connection = True

irods/session.py

@@ -1,5 +1,6 @@
 import ast
 import atexit
+import contextlib
 import copy
 import errno
 import json
@@ -69,8 +70,29 @@ class NonAnonymousLoginWithoutPassword(RuntimeError):
     pass
 
 
+@contextlib.contextmanager
+def attr_changed(obj, attrname, value):
+   old = getattr(obj, attrname, None)
+   try:
+       setattr(obj, attrname, value)
+       yield
+   finally:
+       setattr(obj, attrname, old)
+
+
+def _raw_server_version( session ):
+    import irods.connection
+    s = session.clone()
+    with attr_changed(s.pool, '_need_auth', False):
+        conn = irods.connection.Connection(s.pool, s.pool.account)
+    return conn.server_version
+
+
 class iRODSSession:
 
+    def raw_server_version(self):
+        return _raw_server_version(self)
+
     def library_features(self):
         irods_version_needed = (4, 3, 1)
         if self.server_version < irods_version_needed:
@@ -354,11 +376,15 @@ def port(self):
         return self.pool.account.port
 
     @property
-    def server_version(self):
+    def server_version(self): return self._server_version()
+
+    RAW_SERVER_VERSION = staticmethod(lambda s:s.raw_server_version())
+
+    def _server_version(self, f = None):
         reported_vsn = os.environ.get("PYTHON_IRODSCLIENT_REPORTED_SERVER_VERSION", "")
         if reported_vsn:
             return tuple(ast.literal_eval(reported_vsn))
-        return self.__server_version()
+        return self.__server_version() if f is None else f(self)
 
     def __server_version(self):
         try:

irods/test/connection_test.py

@@ -1,11 +1,16 @@
 #! /usr/bin/env python
 
+import numbers
 import os
 import sys
 import tempfile
 import unittest
-from irods.exception import NetworkException
 from irods import MAXIMUM_CONNECTION_TIMEOUT
+from irods.exception import (
+    NetworkException,
+    CAT_INVALID_AUTHENTICATION
+)
+import irods.session
 import irods.test.helpers as helpers
 from irods.test.helpers import (
     server_side_sleep,
@@ -34,6 +39,29 @@ def test_connection_destructor(self):
         self.assertTrue(conn._disconnected)
         conn.release(destroy=True)
 
+    def test_server_version_without_authentication__issue_688 (self):
+        sess = self.sess
+
+        # Make a session object that cannot authenticate.
+        unauthenticated_session = irods.session.iRODSSession(
+            host = sess.host,
+            port = sess.port,
+            user = sess.username,
+            zone = sess.zone,
+            # No password.
+        )
+
+        # Test raw_server_version method returns a value.
+        version_tup = unauthenticated_session.raw_server_version()
+
+        # Test returned value is non-empty "version" tuple, i.e. holds only integer values.
+        self.assertTrue(len(version_tup) > 0)
+        self.assertFalse(any(not isinstance(_, numbers.Integral) for _ in version_tup))
+
+        # Test that the older server_version property fails for the unauthorized session object.
+        with self.assertRaises(CAT_INVALID_AUTHENTICATION):
+            unauthenticated_session.server_version
+
     def test_failed_connection(self):
         # Make sure no connections are cached in self.sess.pool.idle to be grabbed by get_connection().
         # (Necessary after #418 fix; make_session() can probe server_version, which then leaves an idle conn.)