<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[15412] PyKerberos/trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.calendarserver.org//changeset/15412">15412</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2016-01-06 14:48:34 -0800 (Wed, 06 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add mech_oid parameter, per #930.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#PyKerberostrunkpysrckerberospy">PyKerberos/trunk/pysrc/kerberos.py</a></li>
<li><a href="#PyKerberostrunksrckerberosc">PyKerberos/trunk/src/kerberos.c</a></li>
<li><a href="#PyKerberostrunksrckerberosgssc">PyKerberos/trunk/src/kerberosgss.c</a></li>
<li><a href="#PyKerberostrunksrckerberosgssh">PyKerberos/trunk/src/kerberosgss.h</a></li>
<li><a href="#PyKerberostrunktestpy">PyKerberos/trunk/test.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="PyKerberostrunkpysrckerberospy"></a>
<div class="modfile"><h4>Modified: PyKerberos/trunk/pysrc/kerberos.py (15411 => 15412)</h4>
<pre class="diff"><span>
<span class="info">--- PyKerberos/trunk/pysrc/kerberos.py 2016-01-06 22:26:58 UTC (rev 15411)
+++ PyKerberos/trunk/pysrc/kerberos.py 2016-01-06 22:48:34 UTC (rev 15412)
</span><span class="lines">@@ -158,6 +158,8 @@
</span><span class="cx">
</span><span class="cx"> @param delegated: Optional server context containing delegated credentials
</span><span class="cx">
</span><ins>+ @param mech_oid: Optional GGS mech OID
+
</ins><span class="cx"> @return: A tuple of (result, context) where result is the result code (see
</span><span class="cx"> above) and context is an opaque value that will need to be passed to
</span><span class="cx"> subsequent functions.
</span></span></pre></div>
<a id="PyKerberostrunksrckerberosc"></a>
<div class="modfile"><h4>Modified: PyKerberos/trunk/src/kerberos.c (15411 => 15412)</h4>
<pre class="diff"><span>
<span class="info">--- PyKerberos/trunk/src/kerberos.c 2016-01-06 22:26:58 UTC (rev 15411)
+++ PyKerberos/trunk/src/kerberos.c 2016-01-06 22:48:34 UTC (rev 15412)
</span><span class="lines">@@ -57,7 +57,12 @@
</span><span class="cx"> ob = Py_InitModule3(name, methods, doc);
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+static char krb5_mech_oid_bytes [] = "\x2a\x86\x48\x86\xf7\x12\x01\x02\x02";
+gss_OID_desc krb5_mech_oid = { 9, &krb5_mech_oid_bytes };
</ins><span class="cx">
</span><ins>+static char spnego_mech_oid_bytes[] = "\x2b\x06\x01\x05\x05\x02";
+gss_OID_desc spnego_mech_oid = { 6, &spnego_mech_oid_bytes };
+
</ins><span class="cx"> PyObject *KrbException_class;
</span><span class="cx"> PyObject *BasicAuthException_class;
</span><span class="cx"> PyObject *PwdChangeException_class;
</span><span class="lines">@@ -133,15 +138,17 @@
</span><span class="cx"> PyObject *pystate = NULL;
</span><span class="cx"> gss_server_state *delegatestate = NULL;
</span><span class="cx"> PyObject *pydelegatestate = NULL;
</span><ins>+ gss_OID mech_oid = GSS_C_NO_OID;
+ PyObject *pymech_oid = NULL;
</ins><span class="cx"> static char *kwlist[] = {
</span><del>- "service", "principal", "gssflags", "delegated", NULL
</del><ins>+ "service", "principal", "gssflags", "delegated", "mech_oid", NULL
</ins><span class="cx"> };
</span><span class="cx"> long int gss_flags = GSS_C_MUTUAL_FLAG | GSS_C_SEQUENCE_FLAG;
</span><span class="cx"> int result = 0;
</span><span class="cx">
</span><span class="cx"> if (! PyArg_ParseTupleAndKeywords(
</span><del>- args, keywds, "s|slO", kwlist,
- &service, &principal, &gss_flags, &pydelegatestate
</del><ins>+ args, keywds, "s|slOO", kwlist,
+ &service, &principal, &gss_flags, &pydelegatestate, &pymech_oid
</ins><span class="cx"> )) {
</span><span class="cx"> return NULL;
</span><span class="cx"> }
</span><span class="lines">@@ -158,8 +165,13 @@
</span><span class="cx"> delegatestate = PyCObject_AsVoidPtr(pydelegatestate);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (pymech_oid != NULL && PyCapsule_CheckExact(pymech_oid)) {
+ const char * mech_oid_name = PyCapsule_GetName(pymech_oid);
+ mech_oid = PyCapsule_GetPointer(pymech_oid, mech_oid_name);
+ }
+
</ins><span class="cx"> result = authenticate_gss_client_init(
</span><del>- service, principal, gss_flags, delegatestate, state
</del><ins>+ service, principal, gss_flags, delegatestate, mech_oid, state
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> if (result == AUTH_GSS_ERROR) {
</span><span class="lines">@@ -818,6 +830,12 @@
</span><span class="cx"> PyDict_SetItemString(
</span><span class="cx"> d, "GSS_C_TRANS_FLAG", PyInt_FromLong(GSS_C_TRANS_FLAG)
</span><span class="cx"> );
</span><ins>+ PyDict_SetItemString(
+ d, "GSS_MECH_OID_KRB5", PyCapsule_New(&krb5_mech_oid, "kerberos.GSS_MECH_OID_KRB5", NULL)
+ );
+ PyDict_SetItemString(
+ d, "GSS_MECH_OID_SPNEGO", PyCapsule_New(&spnego_mech_oid, "kerberos.GSS_MECH_OID_SPNEGO", NULL)
+ );
</ins><span class="cx">
</span><span class="cx"> error:
</span><span class="cx"> if (PyErr_Occurred()) {
</span></span></pre></div>
<a id="PyKerberostrunksrckerberosgssc"></a>
<div class="modfile"><h4>Modified: PyKerberos/trunk/src/kerberosgss.c (15411 => 15412)</h4>
<pre class="diff"><span>
<span class="info">--- PyKerberos/trunk/src/kerberosgss.c 2016-01-06 22:26:58 UTC (rev 15411)
+++ PyKerberos/trunk/src/kerberosgss.c 2016-01-06 22:48:34 UTC (rev 15412)
</span><span class="lines">@@ -128,7 +128,7 @@
</span><span class="cx">
</span><span class="cx"> int authenticate_gss_client_init(
</span><span class="cx"> const char* service, const char* principal, long int gss_flags,
</span><del>- gss_server_state* delegatestate, gss_client_state* state
</del><ins>+ gss_server_state* delegatestate, gss_OID mech_oid, gss_client_state* state
</ins><span class="cx"> )
</span><span class="cx"> {
</span><span class="cx"> OM_uint32 maj_stat;
</span><span class="lines">@@ -138,6 +138,7 @@
</span><span class="cx"> int ret = AUTH_GSS_COMPLETE;
</span><span class="cx">
</span><span class="cx"> state->server_name = GSS_C_NO_NAME;
</span><ins>+ state->mech_oid = mech_oid;
</ins><span class="cx"> state->context = GSS_C_NO_CONTEXT;
</span><span class="cx"> state->gss_flags = gss_flags;
</span><span class="cx"> state->client_creds = GSS_C_NO_CREDENTIAL;
</span><span class="lines">@@ -265,7 +266,7 @@
</span><span class="cx"> state->client_creds,
</span><span class="cx"> &state->context,
</span><span class="cx"> state->server_name,
</span><del>- GSS_C_NO_OID,
</del><ins>+ state->mech_oid,
</ins><span class="cx"> (OM_uint32)state->gss_flags,
</span><span class="cx"> 0,
</span><span class="cx"> GSS_C_NO_CHANNEL_BINDINGS,
</span></span></pre></div>
<a id="PyKerberostrunksrckerberosgssh"></a>
<div class="modfile"><h4>Modified: PyKerberos/trunk/src/kerberosgss.h (15411 => 15412)</h4>
<pre class="diff"><span>
<span class="info">--- PyKerberos/trunk/src/kerberosgss.h 2016-01-06 22:26:58 UTC (rev 15411)
+++ PyKerberos/trunk/src/kerberosgss.h 2016-01-06 22:48:34 UTC (rev 15412)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> typedef struct {
</span><span class="cx"> gss_ctx_id_t context;
</span><span class="cx"> gss_name_t server_name;
</span><ins>+ gss_OID mech_oid;
</ins><span class="cx"> long int gss_flags;
</span><span class="cx"> gss_cred_id_t client_creds;
</span><span class="cx"> char* username;
</span><span class="lines">@@ -54,7 +55,7 @@
</span><span class="cx">
</span><span class="cx"> int authenticate_gss_client_init(
</span><span class="cx"> const char* service, const char* principal, long int gss_flags,
</span><del>- gss_server_state* delegatestate, gss_client_state* state
</del><ins>+ gss_server_state* delegatestate, gss_OID mech_oid, gss_client_state* state
</ins><span class="cx"> );
</span><span class="cx"> int authenticate_gss_client_clean(
</span><span class="cx"> gss_client_state *state
</span></span></pre></div>
<a id="PyKerberostrunktestpy"></a>
<div class="modfile"><h4>Modified: PyKerberos/trunk/test.py (15411 => 15412)</h4>
<pre class="diff"><span>
<span class="info">--- PyKerberos/trunk/test.py 2016-01-06 22:26:58 UTC (rev 15411)
+++ PyKerberos/trunk/test.py 2016-01-06 22:48:34 UTC (rev 15412)
</span><span class="lines">@@ -54,10 +54,11 @@
</span><span class="cx"> host = "host.example.com"
</span><span class="cx"> realm = "HOST.EXAMPLE.COM"
</span><span class="cx"> port = 8008
</span><ins>+ mech = None
</ins><span class="cx"> use_ssl = False
</span><span class="cx"> allowedActions = ("service", "basic", "gssapi", "server",)
</span><span class="cx">
</span><del>- options, args = getopt.getopt(sys.argv[1:], "u:p:s:h:i:r:x")
</del><ins>+ options, args = getopt.getopt(sys.argv[1:], "u:p:s:h:i:r:m:x")
</ins><span class="cx">
</span><span class="cx"> for option, value in options:
</span><span class="cx"> if option == "-u":
</span><span class="lines">@@ -72,6 +73,8 @@
</span><span class="cx"> port = value
</span><span class="cx"> elif option == "-r":
</span><span class="cx"> realm = value
</span><ins>+ elif option == "-m":
+ mech = value
</ins><span class="cx"> elif option == "-x":
</span><span class="cx"> use_ssl = True
</span><span class="cx">
</span><span class="lines">@@ -104,7 +107,7 @@
</span><span class="cx">
</span><span class="cx"> if "server" in actions:
</span><span class="cx"> print("\n*** Running HTTP test")
</span><del>- testHTTP(host, port, use_ssl, service)
</del><ins>+ testHTTP(host, port, use_ssl, service, mech)
</ins><span class="cx">
</span><span class="cx"> print("\n*** Done\n")
</span><span class="cx">
</span><span class="lines">@@ -182,7 +185,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-def testHTTP(host, port, use_ssl, service):
</del><ins>+def testHTTP(host, port, use_ssl, service, mech):
</ins><span class="cx">
</span><span class="cx"> class HTTPSConnectionSSLv3(HTTPSConnection):
</span><span class="cx"> "This class allows communication via SSL."
</span><span class="lines">@@ -243,7 +246,13 @@
</span><span class="cx"> return
</span><span class="cx">
</span><span class="cx"> try:
</span><del>- rc, vc = kerberos.authGSSClientInit(service=service)
</del><ins>+ mech_oid = None
+ if mech and mech.lower() == "krb5":
+ mech_oid = kerberos.GSS_MECH_OID_KRB5
+ elif mech and mech.lower() == "spnego":
+ mech_oid = kerberos.GSS_MECH_OID_SPNEGO
+
+ rc, vc = kerberos.authGSSClientInit(service=service, mech_oid=mech_oid)
</ins><span class="cx"> except kerberos.GSSError, e:
</span><span class="cx"> print("Could not initialize GSSAPI: %s/%s" % (e[0][0], e[1][0]))
</span><span class="cx"> return
</span></span></pre>
</div>
</div>
</body>
</html>