mongodb/mongo-python-driver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PYTHON-1354 - Work around WinKerberos deprecations

Browse Source 
The user, domain, and password arguments to authGSSClientInit
are deprecated. The principal argument works as of 0.5.0. Use
it instead.
This commit is contained in:
Bernie Hackett 2017-08-16 10:51:55 -07:00
parent 61ad5b223a
commit dbd39d9ac8
2 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
pymongo/auth.py
View File

@ -17,9 +17,17 @@
import hmac
import socket
try:
from urllib import quote
except ImportError:
from urllib.parse import quote
HAVE_KERBEROS = True
_USE_PRINCIPAL = False
try:
import winkerberos as kerberos
if tuple(map(int, kerberos.__version__.split('.')[:2])) >= (0, 5):
_USE_PRINCIPAL = True
except ImportError:
try:
import kerberos
@ -292,13 +300,21 @@ def _authenticate_gssapi(credentials, sock_info):
service = service + '@' + props.service_realm
if password is not None:
if '@' in username:
user, domain = username.split('@', 1)
if _USE_PRINCIPAL:
# Note that, though we use unquote_plus for unquoting URI
# options, we use quote here. Microsoft's UrlUnescape (used
# by WinKerberos) doesn't support +.
principal = ":".join((quote(username), quote(password)))
result, ctx = kerberos.authGSSClientInit(
service, principal, gssflags=kerberos.GSS_C_MUTUAL_FLAG)
else:
user, domain = username, None
result, ctx = kerberos.authGSSClientInit(
service, gssflags=kerberos.GSS_C_MUTUAL_FLAG,
user=user, domain=domain, password=password)
if '@' in username:
user, domain = username.split('@', 1)
else:
user, domain = username, None
result, ctx = kerberos.authGSSClientInit(
service, gssflags=kerberos.GSS_C_MUTUAL_FLAG,
user=user, domain=domain, password=password)
else:
result, ctx = kerberos.authGSSClientInit(
service, gssflags=kerberos.GSS_C_MUTUAL_FLAG)

2
setup.py
View File

@ -321,7 +321,7 @@ vi = sys.version_info
if vi[0] == 2:
extras_require['tls'].append("ipaddress")
if sys.platform == 'win32':
extras_require['gssapi'] = ["winkerberos>=0.3.0"]
extras_require['gssapi'] = ["winkerberos>=0.5.0"]
if vi[0] == 2 and vi < (2, 7, 9) or vi[0] == 3 and vi < (3, 4):
extras_require['tls'].append("wincertstore>=0.2")
else: