<!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>[14628] 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/14628">14628</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2015-03-26 16:17:24 -0700 (Thu, 26 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>add function to inquire on credentials
Contributed by rcritten@redhat.com</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#PyKerberostrunksetuppy">PyKerberos/trunk/setup.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="PyKerberostrunksetuppy"></a>
<div class="modfile"><h4>Modified: PyKerberos/trunk/setup.py (14627 => 14628)</h4>
<pre class="diff"><span>
<span class="info">--- PyKerberos/trunk/setup.py 2015-03-26 23:04:41 UTC (rev 14627)
+++ PyKerberos/trunk/setup.py 2015-03-26 23:17:24 UTC (rev 14628)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx">
</span><span class="cx"> project_name = "kerberos"
</span><span class="cx">
</span><del>-version_string = "1.2.1"
</del><ins>+version_string = "1.2.0"
</ins><span class="cx">
</span><span class="cx"> description = "Kerberos high-level interface"
</span><span class="cx">
</span></span></pre></div>
<a id="PyKerberostrunksrckerberosc"></a>
<div class="modfile"><h4>Modified: PyKerberos/trunk/src/kerberos.c (14627 => 14628)</h4>
<pre class="diff"><span>
<span class="info">--- PyKerberos/trunk/src/kerberos.c 2015-03-26 23:04:41 UTC (rev 14627)
+++ PyKerberos/trunk/src/kerberos.c 2015-03-26 23:17:24 UTC (rev 14628)
</span><span class="lines">@@ -380,6 +380,33 @@
</span><span class="cx"> return Py_BuildValue("i", result);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static PyObject *authGSSClientInquireCred(PyObject *self, PyObject *args)
+{
+ gss_client_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_client_state *)PyCObject_AsVoidPtr(pystate);
+ if (state == NULL) {
+ return NULL;
+ }
+
+ result = authenticate_gss_client_inquire_cred(state);
+ if (result == AUTH_GSS_ERROR) {
+ return NULL;
+ }
+
+ return Py_BuildValue("i", result);
+}
+
</ins><span class="cx"> static PyObject *authGSSServerInit(PyObject *self, PyObject *args)
</span><span class="cx"> {
</span><span class="cx"> const char *service = NULL;
</span><span class="lines">@@ -620,6 +647,10 @@
</span><span class="cx"> "Get the response from the last client-side GSSAPI step."
</span><span class="cx"> },
</span><span class="cx"> {
</span><ins>+ "authGSSClientInquireCred", authGSSClientInquireCred, METH_VARARGS,
+ "Get the current user name, if any, without a client-side GSSAPI step"
+ },
+ {
</ins><span class="cx"> "authGSSClientResponseConf",
</span><span class="cx"> authGSSClientResponseConf, METH_VARARGS,
</span><span class="cx"> "return 1 if confidentiality was set in the last unwrapped buffer, 0 otherwise."
</span><span class="lines">@@ -645,6 +676,10 @@
</span><span class="cx"> "Do a GSSAPI unwrap."
</span><span class="cx"> },
</span><span class="cx"> {
</span><ins>+ "authGSSClientInquireCred", authGSSClientInquireCred, METH_VARARGS,
+ "Get the current user name, if any."
+ },
+ {
</ins><span class="cx"> "authGSSServerClean",
</span><span class="cx"> authGSSServerClean, METH_VARARGS,
</span><span class="cx"> "Terminate server-side GSSAPI operations."
</span></span></pre></div>
<a id="PyKerberostrunksrckerberosgssc"></a>
<div class="modfile"><h4>Modified: PyKerberos/trunk/src/kerberosgss.c (14627 => 14628)</h4>
<pre class="diff"><span>
<span class="info">--- PyKerberos/trunk/src/kerberosgss.c 2015-03-26 23:04:41 UTC (rev 14627)
+++ PyKerberos/trunk/src/kerberosgss.c 2015-03-26 23:17:24 UTC (rev 14628)
</span><span class="lines">@@ -462,6 +462,62 @@
</span><span class="cx"> return ret;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+int authenticate_gss_client_inquire_cred(gss_client_state* state)
+{
+ OM_uint32 maj_stat;
+ OM_uint32 min_stat;
+ gss_cred_id_t client_creds = GSS_C_NO_CREDENTIAL;
+ gss_buffer_desc name_token = GSS_C_EMPTY_BUFFER;
+ gss_name_t name = GSS_C_NO_NAME;
+ int ret = AUTH_GSS_COMPLETE;
+
+ // Get credentials
+ maj_stat = gss_acquire_cred(
+ &min_stat, GSS_C_NO_NAME, GSS_C_INDEFINITE,
+ GSS_C_NO_OID_SET, GSS_C_INITIATE, &client_creds, NULL, NULL
+ );
+
+ if (GSS_ERROR(maj_stat)) {
+ set_gss_error(maj_stat, min_stat);
+ ret = AUTH_GSS_ERROR;
+ goto end;
+ }
+
+ // Get the name
+ maj_stat = gss_inquire_cred(
+ &min_stat, client_creds, &name, NULL, NULL, NULL);
+ }
+
+ if (GSS_ERROR(maj_stat))
+ {
+ set_gss_error(maj_stat, min_stat);
+ ret = AUTH_GSS_ERROR;
+ goto end;
+ }
+
+ maj_stat = gss_display_name(&min_stat, name, &name_token, NULL);
+
+ if (GSS_ERROR(maj_stat))
+ {
+ set_gss_error(maj_stat, min_stat);
+ ret = AUTH_GSS_ERROR;
+ goto end;
+ }
+
+ state->username = strndup(name_token.value, name_token.length);
+ if (!state->username) {
+ set_gss_error(GSS_S_FAILURE, ENOMEM);
+ ret = AUTH_GSS_ERROR;
+ }
+
+end:
+ (void)gss_release_cred(&min_stat, &client_creds);
+ (void)gss_release_buffer(&min_stat, &name_token);
+ (void)gss_release_name(&min_stat, &name);
+
+ return ret;
+}
+
</ins><span class="cx"> int authenticate_gss_server_init(const char *service, gss_server_state *state)
</span><span class="cx"> {
</span><span class="cx"> OM_uint32 maj_stat;
</span></span></pre></div>
<a id="PyKerberostrunksrckerberosgssh"></a>
<div class="modfile"><h4>Modified: PyKerberos/trunk/src/kerberosgss.h (14627 => 14628)</h4>
<pre class="diff"><span>
<span class="info">--- PyKerberos/trunk/src/kerberosgss.h 2015-03-26 23:04:41 UTC (rev 14627)
+++ PyKerberos/trunk/src/kerberosgss.h 2015-03-26 23:17:24 UTC (rev 14628)
</span><span class="lines">@@ -69,6 +69,9 @@
</span><span class="cx"> gss_client_state* state, const char* challenge, const char* user,
</span><span class="cx"> int protect
</span><span class="cx"> );
</span><ins>+int authenticate_gss_client_inquire_cred(
+ gss_client_state* state
+);
</ins><span class="cx">
</span><span class="cx"> int authenticate_gss_server_init(
</span><span class="cx"> const char* service, gss_server_state* state
</span></span></pre>
</div>
</div>
</body>
</html>