<!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>[12830] 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/12830">12830</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2014-03-06 10:41:23 -0800 (Thu, 06 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add support for delegation of credentials
Fixes: #842
Author: j.warburton@irax.com</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="PyKerberostrunkpysrckerberospy"></a>
<div class="modfile"><h4>Modified: PyKerberos/trunk/pysrc/kerberos.py (12829 => 12830)</h4>
<pre class="diff"><span>
<span class="info">--- PyKerberos/trunk/pysrc/kerberos.py 2014-03-06 04:18:19 UTC (rev 12829)
+++ PyKerberos/trunk/pysrc/kerberos.py 2014-03-06 18:41:23 UTC (rev 12830)
</span><span class="lines">@@ -234,3 +234,20 @@
</span><span class="cx"> @return: a string containing the target name.
</span><span class="cx"> """
</span><span class="cx">
</span><ins>+def authGSSServerStoreDelegate(context):
+ """
+ Save the ticket sent to the server in the file /tmp/krb5_pyserv_XXXXXX
+ his method must only be called after authGSSServerStep returns a complete or continue response code.
+
+ @param context: the context object returned from authGSSServerInit.
+ @return: a result code (see above).
+ """
+
+def authGSSServerCacheName(context):
+ """
+ Get the name of the credential cache created with authGSSServerStoreDelegate.
+ This method must only be called after authGSSServerStoreDelegate.
+
+ @param context: the context object returned from authGSSServerInit.
+ @return: a string containing the cache name.
+ """
</ins></span></pre></div>
<a id="PyKerberostrunksrckerberosc"></a>
<div class="modfile"><h4>Modified: PyKerberos/trunk/src/kerberos.c (12829 => 12830)</h4>
<pre class="diff"><span>
<span class="info">--- PyKerberos/trunk/src/kerberos.c 2014-03-06 04:18:19 UTC (rev 12829)
+++ PyKerberos/trunk/src/kerberos.c 2014-03-06 18:41:23 UTC (rev 12830)
</span><span class="lines">@@ -344,6 +344,31 @@
</span><span class="cx"> return Py_BuildValue("i", result);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static PyObject *authGSSServerStoreDelegate(PyObject *self, PyObject *args)
+{
+ gss_server_state *state;
+ PyObject *pystate;
+ int result = 0;
+
+ if (!PyArg_ParseTuple(args, "O", &pystate))
+ return NULL;
+
+ if (!PyCObject_Check(pystate)) {
+ PyErr_SetString(PyExc_TypeError, "Expected a context object");
+ return NULL;
+ }
+
+ state = (gss_server_state *)PyCObject_AsVoidPtr(pystate);
+ if (state == NULL)
+ return NULL;
+
+ result = authenticate_gss_server_store_delegate(state);
+ if (result == AUTH_GSS_ERROR)
+ return NULL;
+
+ return Py_BuildValue("i", result);
+}
+
</ins><span class="cx"> static PyObject *authGSSServerResponse(PyObject *self, PyObject *args)
</span><span class="cx"> {
</span><span class="cx"> gss_server_state *state;
</span><span class="lines">@@ -384,6 +409,26 @@
</span><span class="cx"> return Py_BuildValue("s", state->username);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static PyObject *authGSSServerCacheName(PyObject *self, PyObject *args)
+{
+ gss_server_state *state;
+ PyObject *pystate;
+
+ if (!PyArg_ParseTuple(args, "O", &pystate))
+ return NULL;
+
+ if (!PyCObject_Check(pystate)) {
+ PyErr_SetString(PyExc_TypeError, "Expected a context object");
+ return NULL;
+ }
+
+ state = (gss_server_state *)PyCObject_AsVoidPtr(pystate);
+ if (state == NULL)
+ return NULL;
+
+ return Py_BuildValue("s", state->ccname);
+}
+
</ins><span class="cx"> static PyObject *authGSSServerTargetName(PyObject *self, PyObject *args)
</span><span class="cx"> {
</span><span class="cx"> gss_server_state *state;
</span><span class="lines">@@ -433,10 +478,14 @@
</span><span class="cx"> "Terminate server-side GSSAPI operations."},
</span><span class="cx"> {"authGSSServerStep", authGSSServerStep, METH_VARARGS,
</span><span class="cx"> "Do a server-side GSSAPI step."},
</span><ins>+ {"authGSSServerStoreDelegate", authGSSServerStoreDelegate, METH_VARARGS,
+ "Store the delegated Credentials."},
</ins><span class="cx"> {"authGSSServerResponse", authGSSServerResponse, METH_VARARGS,
</span><span class="cx"> "Get the response from the last server-side GSSAPI step."},
</span><span class="cx"> {"authGSSServerUserName", authGSSServerUserName, METH_VARARGS,
</span><span class="cx"> "Get the user name from the last server-side GSSAPI step."},
</span><ins>+ {"authGSSServerCacheName", authGSSServerCacheName, METH_VARARGS,
+ "Get the location of the cache where delegated credentials are stored."},
</ins><span class="cx"> {"authGSSServerTargetName", authGSSServerTargetName, METH_VARARGS,
</span><span class="cx"> "Get the target name from the last server-side GSSAPI step."},
</span><span class="cx"> {NULL, NULL, 0, NULL} /* Sentinel */
</span></span></pre></div>
<a id="PyKerberostrunksrckerberosgssc"></a>
<div class="modfile"><h4>Modified: PyKerberos/trunk/src/kerberosgss.c (12829 => 12830)</h4>
<pre class="diff"><span>
<span class="info">--- PyKerberos/trunk/src/kerberosgss.c 2014-03-06 04:18:19 UTC (rev 12829)
+++ PyKerberos/trunk/src/kerberosgss.c 2014-03-06 18:41:23 UTC (rev 12830)
</span><span class="lines">@@ -26,6 +26,8 @@
</span><span class="cx">
</span><span class="cx"> static void set_gss_error(OM_uint32 err_maj, OM_uint32 err_min);
</span><span class="cx">
</span><ins>+int create_krb5_ccache(gss_server_state *state, krb5_context kcontext, krb5_principal princ, krb5_ccache *ccache);
+
</ins><span class="cx"> extern PyObject *GssException_class;
</span><span class="cx"> extern PyObject *KrbException_class;
</span><span class="cx">
</span><span class="lines">@@ -444,6 +446,7 @@
</span><span class="cx"> state->username = NULL;
</span><span class="cx"> state->targetname = NULL;
</span><span class="cx"> state->response = NULL;
</span><ins>+ state->ccname = NULL;
</ins><span class="cx">
</span><span class="cx"> // Server name may be empty which means we aren't going to create our own creds
</span><span class="cx"> size_t service_len = strlen(service);
</span><span class="lines">@@ -509,6 +512,12 @@
</span><span class="cx"> free(state->response);
</span><span class="cx"> state->response = NULL;
</span><span class="cx"> }
</span><ins>+
+ if (state->ccname != NULL)
+ {
+ free(state->ccname);
+ state->ccname = NULL;
+ }
</ins><span class="cx">
</span><span class="cx"> return ret;
</span><span class="cx"> }
</span><span class="lines">@@ -652,3 +661,106 @@
</span><span class="cx">
</span><span class="cx"> PyErr_SetObject(GssException_class, Py_BuildValue("((s:i)(s:i))", buf_maj, err_maj, buf_min, err_min));
</span><span class="cx"> }
</span><ins>+
+int
+authenticate_gss_server_store_delegate(gss_server_state *state)
+{
+ gss_cred_id_t delegated_cred = state->client_creds;
+ char *princ_name = state->username;
+ OM_uint32 maj_stat, min_stat;
+ krb5_principal princ = NULL;
+ krb5_ccache ccache = NULL;
+ krb5_error_code problem;
+ krb5_context context;
+ int ret = 500;
+
+ problem = krb5_init_context(&context);
+ if (problem) {
+ PyErr_SetObject(KrbException_class, Py_BuildValue("(s)", "Cannot initialize krb5 context"));
+ return AUTH_GSS_ERROR;
+ }
+
+ problem = krb5_parse_name(context, princ_name, &princ);
+ if (problem) {
+ PyErr_SetObject(KrbException_class, Py_BuildValue("(s:s)", "Cannot parse delegated username", krb5_get_err_text(context, problem)));
+ ret = AUTH_GSS_ERROR;
+ goto end;
+ }
+
+ problem = create_krb5_ccache(state, context, princ, &ccache);
+ if (problem) {
+ PyErr_SetObject(KrbException_class, Py_BuildValue("(s:s)", "Error in creating krb5 cache", krb5_get_err_text(context, problem)));
+ ret = AUTH_GSS_ERROR;
+ goto end;
+ }
+
+ maj_stat = gss_krb5_copy_ccache(&min_stat, delegated_cred, ccache);
+ if (GSS_ERROR(maj_stat)) {
+ set_gss_error(maj_stat, min_stat);
+ ret = AUTH_GSS_ERROR;
+ goto end;
+ }
+
+ krb5_cc_close(context, ccache);
+ ccache = NULL;
+ ret = 0;
+
+end:
+ if (princ)
+ krb5_free_principal(context, princ);
+ if (ccache)
+ krb5_cc_destroy(context, ccache);
+ krb5_free_context(context);
+ return ret;
+}
+
+int
+create_krb5_ccache(gss_server_state *state,
+ krb5_context kcontext,
+ krb5_principal princ,
+ krb5_ccache *ccache)
+{
+ int fd;
+ char ccname[32];
+ krb5_error_code problem;
+ int ret;
+ krb5_ccache tmp_ccache = NULL;
+
+ snprintf(ccname, sizeof(ccname), "/tmp/krb5cc_pyserv_XXXXXX");
+ fd = mkstemp(ccname);
+ if (fd < 0) {
+ PyErr_SetObject(KrbException_class, Py_BuildValue("(s:s)", "Error in mkstemp", strerror(errno)));
+ ret = 1;
+ goto end;
+ }
+ close(fd);
+
+ problem = krb5_cc_resolve(kcontext, ccname, &tmp_ccache);
+ if (problem) {
+ PyErr_SetObject(KrbException_class, Py_BuildValue("(s:s)", "Error resolving the credential cache", krb5_get_err_text(kcontext, problem)));
+ ret = 1;
+ unlink(ccname);
+ goto end;
+ }
+
+ problem = krb5_cc_initialize(kcontext, tmp_ccache, princ);
+ if (problem) {
+ PyErr_SetObject(KrbException_class, Py_BuildValue("(s:s)", "Error initialising the credential cache", krb5_get_err_text(kcontext, problem)));
+ ret = 1;
+ goto end;
+ }
+
+ *ccache = tmp_ccache;
+ tmp_ccache = NULL;
+
+ ret = 0;
+
+end:
+ if (tmp_ccache)
+ krb5_cc_destroy(kcontext, tmp_ccache);
+
+ state->ccname = (char *)malloc(32*sizeof(char));
+ strcpy(state->ccname, ccname);
+
+ return ret;
+}
</ins></span></pre></div>
<a id="PyKerberostrunksrckerberosgssh"></a>
<div class="modfile"><h4>Modified: PyKerberos/trunk/src/kerberosgss.h (12829 => 12830)</h4>
<pre class="diff"><span>
<span class="info">--- PyKerberos/trunk/src/kerberosgss.h 2014-03-06 04:18:19 UTC (rev 12829)
+++ PyKerberos/trunk/src/kerberosgss.h 2014-03-06 18:41:23 UTC (rev 12830)
</span><span class="lines">@@ -47,6 +47,7 @@
</span><span class="cx"> char* username;
</span><span class="cx"> char* targetname;
</span><span class="cx"> char* response;
</span><ins>+ char* ccname;
</ins><span class="cx"> } gss_server_state;
</span><span class="cx">
</span><span class="cx"> char* server_principal_details(const char* service, const char* hostname);
</span><span class="lines">@@ -60,3 +61,4 @@
</span><span class="cx"> int authenticate_gss_server_init(const char* service, gss_server_state* state);
</span><span class="cx"> int authenticate_gss_server_clean(gss_server_state *state);
</span><span class="cx"> int authenticate_gss_server_step(gss_server_state *state, const char *challenge);
</span><ins>+int authenticate_gss_server_store_delegate(gss_server_state *state);
</ins></span></pre>
</div>
</div>
</body>
</html>