Fix old gssapi version incompatibilities (#46)

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.5.4 - TBD
+
+* Fix str of enum values when running in Python 3.11 to be consistent with older versions
+* Support `gssapi` on 1.5.x which comes with RHEL 8.
+
+
 ## 0.5.3 - 2022-07-11
 
 * Fix heap allocation errors when running with heap allocation monitoring on Windows

src/spnego/_gss.py

@@ -142,7 +142,7 @@ def _get_gssapi_credential(
         https://github.com/gssapi/gss-ntlmssp
     """
     supported_cred_types: typing.List[typing.Type[Credential]] = [Password, CredentialCache]
-    if mech.dotted_form == GSSMech.kerberos:
+    if _oid_dotted_form(mech) == GSSMech.kerberos:
         supported_cred_types.insert(0, KerberosCCache)
         supported_cred_types.insert(1, KerberosKeytab)
 
@@ -320,18 +320,18 @@ def _gss_sasl_description(mech: "gssapi.OID") -> typing.Optional[bytes]:
     """Attempts to get the SASL description of the mech specified."""
     try:
         res = _gss_sasl_description.result  # type: ignore
-        return res[mech.dotted_form]
+        return res[_oid_dotted_form(mech)]
 
     except (AttributeError, KeyError):
         res = getattr(_gss_sasl_description, "result", {})
 
     try:
         sasl_desc = gssapi.raw.inquire_saslname_for_mech(mech).mech_description
     except Exception as e:
-        log.debug("gss_inquire_saslname_for_mech(%s) failed: %s" % (mech.dotted_form, str(e)))
+        log.debug("gss_inquire_saslname_for_mech(%s) failed: %s" % (_oid_dotted_form(mech), str(e)))
         sasl_desc = None
 
-    res[mech.dotted_form] = sasl_desc
+    res[_oid_dotted_form(mech)] = sasl_desc
     _gss_sasl_description.result = res  # type: ignore
     return _gss_sasl_description(mech)
 
@@ -441,6 +441,15 @@ def _gss_acquire_cred_from_ccache(
         return gssapi_creds
 
 
+def _oid_dotted_form(
+    oid: "gssapi.OID",
+) -> str:
+    # gssapi on RHEL 8 comes with 1.5.1 but dotted_form was added in 1.6.0.
+    # Use the fallback by parsing the repr output. Remove once minimum is 1.6.0
+    # https://github.com/jborean93/pyspnego/issues/43
+    return oid.dotted_form if hasattr(oid, "dotted_form") else repr(oid)[5:-1]
+
+
 class GSSAPIProxy(ContextProxy):
     """GSSAPI proxy class for GSSAPI on Linux.
 
@@ -526,7 +535,7 @@ def complete(self) -> bool:
     def negotiated_protocol(self) -> typing.Optional[str]:
         try:
             # For an acceptor this can be blank until the first token is received
-            oid = self._context.mech.dotted_form
+            oid = _oid_dotted_form(self._context.mech)
         except AttributeError:
             return None
 
@@ -536,7 +545,7 @@ def negotiated_protocol(self) -> typing.Optional[str]:
             # Only set until the negotiate process is complete, will change to one of the above once the context is
             # set up.
             GSSMech.spnego.value: "negotiate",
-        }.get(oid, "unknown: %s" % self._context.mech.dotted_form)
+        }.get(oid, "unknown: %s" % oid)
 
     @property  # type: ignore
     @wrap_system_error(NativeError, "Retrieving session key")