|
 |
19e045b |
--- a/urllib2_kerberos.py
|
|
|
19e045b |
+++ b/urllib2_kerberos.py
|
|
|
19e045b |
@@ -34,7 +34,7 @@ class AbstractKerberosAuthHandler:
|
|
|
19e045b |
"""checks for "Negotiate" in proper auth header
|
|
|
19e045b |
"""
|
|
|
19e045b |
authreqs = headers.getheaders(self.auth_header)
|
|
|
19e045b |
- log.debug('authreqs = {}'.format(authreqs))
|
|
|
19e045b |
+ log.debug('authreqs = %s', authreqs)
|
|
|
19e045b |
|
|
|
19e045b |
if authreqs:
|
|
|
19e045b |
|
|
|
19e045b |
@@ -44,10 +44,10 @@ class AbstractKerberosAuthHandler:
|
|
|
19e045b |
if mo:
|
|
|
19e045b |
return mo.group(1)
|
|
|
19e045b |
else:
|
|
|
19e045b |
- log.debug("regex failed on: %s" % authreq)
|
|
|
19e045b |
+ log.debug("regex failed on: %s", authreq)
|
|
|
19e045b |
|
|
|
19e045b |
else:
|
|
|
19e045b |
- log.debug("%s header not found" % self.auth_header)
|
|
|
19e045b |
+ log.debug("%s header not found", self.auth_header)
|
|
|
19e045b |
|
|
|
19e045b |
return None
|
|
|
19e045b |
|
|
|
19e045b |
@@ -57,10 +57,10 @@ class AbstractKerberosAuthHandler:
|
|
|
19e045b |
|
|
|
19e045b |
def generate_request_header(self, req, headers, neg_value):
|
|
|
19e045b |
self.retried += 1
|
|
|
19e045b |
- log.debug("retry count: %d" % self.retried)
|
|
|
19e045b |
+ log.debug("retry count: %d", self.retried)
|
|
|
19e045b |
|
|
|
19e045b |
host = req.get_host()
|
|
|
19e045b |
- log.debug("req.get_host() returned %s" % host)
|
|
|
19e045b |
+ log.debug("req.get_host() returned %s", host)
|
|
|
19e045b |
|
|
|
19e045b |
tail, sep, head = host.rpartition(':')
|
|
|
19e045b |
domain = tail if tail else head
|
|
|
19e045b |
@@ -68,7 +68,7 @@ class AbstractKerberosAuthHandler:
|
|
|
19e045b |
result, self.context = k.authGSSClientInit("HTTP@%s" % domain)
|
|
|
19e045b |
|
|
|
19e045b |
if result < 1:
|
|
|
19e045b |
- log.warning("authGSSClientInit returned result %d" % result)
|
|
|
19e045b |
+ log.warning("authGSSClientInit returned result %d", result)
|
|
|
19e045b |
return None
|
|
|
19e045b |
|
|
|
19e045b |
log.debug("authGSSClientInit() succeeded")
|
|
|
19e045b |
@@ -76,7 +76,7 @@ class AbstractKerberosAuthHandler:
|
|
|
19e045b |
result = k.authGSSClientStep(self.context, neg_value)
|
|
|
19e045b |
|
|
|
19e045b |
if result < 0:
|
|
|
19e045b |
- log.warning("authGSSClientStep returned result %d" % result)
|
|
|
19e045b |
+ log.warning("authGSSClientStep returned result %d", result)
|
|
|
19e045b |
return None
|
|
|
19e045b |
|
|
|
19e045b |
log.debug("authGSSClientStep() succeeded")
|
|
|
19e045b |
@@ -97,7 +97,7 @@ class AbstractKerberosAuthHandler:
|
|
|
19e045b |
if result < 1:
|
|
|
19e045b |
# this is a critical security warning
|
|
|
19e045b |
# should change to a raise --Tim
|
|
|
19e045b |
- log.critical("mutual auth failed: authGSSClientStep returned result %d" % result)
|
|
|
19e045b |
+ log.critical("mutual auth failed: authGSSClientStep returned result %d", result)
|
|
|
19e045b |
pass
|
|
|
19e045b |
|
|
|
19e045b |
def clean_context(self):
|
|
|
19e045b |
@@ -133,7 +133,7 @@ class AbstractKerberosAuthHandler:
|
|
|
19e045b |
return resp
|
|
|
19e045b |
|
|
|
19e045b |
except k.GSSError, e:
|
|
|
19e045b |
- log.critical("GSSAPI Error: %s/%s" % (e[0][0], e[1][0]))
|
|
|
19e045b |
+ log.critical("GSSAPI Error: %s/%s", (e[0][0], e[1][0]))
|
|
|
19e045b |
return None
|
|
|
19e045b |
|
|
|
19e045b |
finally:
|