Split pname_to_uid into its own module

Not available on Windows. Include it conditionally to prevent build
errors on Windows.

Signed-off-by: Jacob Henner <code@ventricle.us>

Author: JacobHenner

gssapi/raw/__init__.py

@@ -156,3 +156,9 @@
     from gssapi.raw.ext_localname_attr import *  # noqa
 except ImportError:
     pass
+
+# optional pname_to_uid support (not available on Windows)
+try:
+    from gssapi.raw.ext_pname_to_uid import *  # noqa
+except ImportError:
+    pass

gssapi/raw/ext_localname.pyi

@@ -66,28 +66,3 @@ def authorize_localname(
     Raises:
         ~gssapi.exceptions.GSSError
     """
-
-
-def pname_to_uid(
-    name: "Name",
-    mech: t.Optional["OID"] = None,
-) -> int:
-    """Get the local UID for a GSSAPI name.
-
-    This method determines the local UID associated with a GSSAPI
-    name, optionally for a given mechanism.
-
-    Note:
-        This function is not available on Windows.
-
-    Args:
-        name (Name): the GSSAPI name to map to a local UID
-        mech (~gssapi.OID): the mechanism to use for the mapping
-            (or None for the default)
-
-    Returns:
-        int: the local UID
-
-    Raises:
-        ~gssapi.exceptions.GSSError
-    """

gssapi/raw/ext_localname.pyx

@@ -7,8 +7,6 @@ from gssapi.raw.oids cimport OID
 from gssapi.raw.misc import GSSError
 from gssapi import _utils
 
-from posix.types cimport uid_t
-
 cdef extern from "python_gssapi_ext.h":
     OM_uint32 gss_localname(OM_uint32 *minor,
                             const gss_name_t name,
@@ -22,11 +20,6 @@ cdef extern from "python_gssapi_ext.h":
                                       const gss_name_t name,
                                       const gss_name_t user) nogil
 
-    OM_uint32 gss_pname_to_uid(OM_uint32 *minor,
-                               const gss_name_t name,
-                               const gss_OID mech_type,
-                               uid_t *uid_out) nogil
-
 
 def localname(Name name not None, OID mech=None):
     """Get the local name for a GSSAPI name.
@@ -118,39 +111,3 @@ def authorize_localname(Name name not None, Name user not None):
         return True
     else:
         raise GSSError(maj_stat, min_stat)
-
-
-def pname_to_uid(Name name not None, OID mech=None):
-    """Get the local UID for a GSSAPI name.
-
-    This method determines the local UID associated with a GSSAPI
-    name, optionally for a given mechanism.
-
-    Note:
-        This function is not available on Windows.
-
-    Args:
-        name (Name): the GSSAPI name to map to a local UID
-        mech (~gssapi.OID): the mechanism to use for the mapping
-            (or None for the default)
-
-    Returns:
-        int: the local UID
-
-    Raises:
-        ~gssapi.exceptions.GSSError
-    """
-    cdef gss_OID m = GSS_C_NO_OID
-    if mech is not None:
-        m = &mech.raw_oid
-
-    cdef uid_t uid_out
-    cdef OM_uint32 maj_stat, min_stat
-
-    with nogil:
-        maj_stat = gss_pname_to_uid(&min_stat, name.raw_name, m, &uid_out)
-
-    if maj_stat == GSS_S_COMPLETE:
-        return uid_out
-    else:
-        raise GSSError(maj_stat, min_stat)

gssapi/raw/ext_pname_to_uid.pyi

@@ -0,0 +1,30 @@
+import typing as t
+
+if t.TYPE_CHECKING:
+    from gssapi.raw.names import Name
+    from gssapi.raw.oids import OID
+
+
+def pname_to_uid(
+    name: "Name",
+    mech: t.Optional["OID"] = None,
+) -> int:
+    """Get the local UID for a GSSAPI name.
+
+    This method determines the local UID associated with a GSSAPI
+    name, optionally for a given mechanism.
+
+    Note:
+        This function is not available on Windows.
+
+    Args:
+        name (Name): the GSSAPI name to map to a local UID
+        mech (~gssapi.OID): the mechanism to use for the mapping
+            (or None for the default)
+
+    Returns:
+        int: the local UID
+
+    Raises:
+        ~gssapi.exceptions.GSSError
+    """

gssapi/raw/ext_pname_to_uid.pyx

@@ -0,0 +1,51 @@
+GSSAPI="BASE"  # This ensures that a full module is generated by Cython
+
+from posix.types cimport uid_t
+
+from gssapi.raw.cython_types cimport *
+from gssapi.raw.names cimport Name
+from gssapi.raw.oids cimport OID
+
+from gssapi.raw.misc import GSSError
+
+cdef extern from "python_gssapi_ext.h":
+    OM_uint32 gss_pname_to_uid(OM_uint32 *minor,
+                               const gss_name_t name,
+                               const gss_OID mech_type,
+                               uid_t *uid_out) nogil
+
+
+def pname_to_uid(Name name not None, OID mech=None):
+    """Get the local UID for a GSSAPI name.
+
+    This method determines the local UID associated with a GSSAPI
+    name, optionally for a given mechanism.
+
+    Note:
+        This function is not available on Windows.
+
+    Args:
+        name (Name): the GSSAPI name to map to a local UID
+        mech (~gssapi.OID): the mechanism to use for the mapping
+            (or None for the default)
+
+    Returns:
+        int: the local UID
+
+    Raises:
+        ~gssapi.exceptions.GSSError
+    """
+    cdef gss_OID m = GSS_C_NO_OID
+    if mech is not None:
+        m = &mech.raw_oid
+
+    cdef uid_t uid_out
+    cdef OM_uint32 maj_stat, min_stat
+
+    with nogil:
+        maj_stat = gss_pname_to_uid(&min_stat, name.raw_name, m, &uid_out)
+
+    if maj_stat == GSS_S_COMPLETE:
+        return uid_out
+    else:
+        raise GSSError(maj_stat, min_stat)

gssapi/tests/test_raw.py

@@ -1376,7 +1376,7 @@ def test_authorize_localname_fails(self):
         self.assertRaises(gb.GSSError, gb.authorize_localname,
                           canon_name, fake_local_name)
 
-    @ktu.gssapi_extension_test('localname', 'Local Name')
+    @ktu.gssapi_extension_test('pname_to_uid', 'pname_to_uid')
     def test_pname_to_uid(self):
         base_name = gb.import_name(self.USER_PRINC,
                                    gb.NameType.kerberos_principal)

setup.py

@@ -379,6 +379,7 @@ def gssapi_modules(lst):
 
         extension_file('localname', 'gss_localname'),
         extension_file('localname_attr', 'GSS_C_ATTR_LOCAL_LOGIN_USER'),
+        extension_file('pname_to_uid', 'gss_pname_to_uid'),
     ]),
     options=setup_options,
     keywords=['gssapi', 'security'],