<!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>[14619] PyKerberos/trunk/src</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/14619">14619</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2015-03-26 14:33:56 -0700 (Thu, 26 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>cleanup</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#PyKerberostrunksrcbase64c">PyKerberos/trunk/src/base64.c</a></li>
<li><a href="#PyKerberostrunksrcbase64h">PyKerberos/trunk/src/base64.h</a></li>
<li><a href="#PyKerberostrunksrckerberosbasicc">PyKerberos/trunk/src/kerberosbasic.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="PyKerberostrunksrcbase64c"></a>
<div class="modfile"><h4>Modified: PyKerberos/trunk/src/base64.c (14618 => 14619)</h4>
<pre class="diff"><span>
<span class="info">--- PyKerberos/trunk/src/base64.c 2015-03-26 21:28:46 UTC (rev 14618)
+++ PyKerberos/trunk/src/base64.c 2015-03-26 21:33:56 UTC (rev 14619)
</span><span class="lines">@@ -81,32 +81,36 @@
</span><span class="cx"> unsigned char *result =(unsigned char *)malloc((vlen * 3) / 4 + 1);
</span><span class="cx"> unsigned char *out = result;
</span><span class="cx">
</span><del>- while (1)
- {
- if (value[0]==0)
</del><ins>+ while (1) {
+ if (value[0]==0) {
</ins><span class="cx"> return result;
</span><ins>+ }
</ins><span class="cx"> c1 = value[0];
</span><del>- if (CHAR64(c1) == -1)
</del><ins>+ if (CHAR64(c1) == -1) {
</ins><span class="cx"> goto base64_decode_error;;
</span><ins>+ }
</ins><span class="cx"> c2 = value[1];
</span><del>- if (CHAR64(c2) == -1)
</del><ins>+ if (CHAR64(c2) == -1) {
</ins><span class="cx"> goto base64_decode_error;;
</span><ins>+ }
</ins><span class="cx"> c3 = value[2];
</span><del>- if ((c3 != '=') && (CHAR64(c3) == -1))
</del><ins>+ if ((c3 != '=') && (CHAR64(c3) == -1)) {
</ins><span class="cx"> goto base64_decode_error;;
</span><ins>+ }
</ins><span class="cx"> c4 = value[3];
</span><del>- if ((c4 != '=') && (CHAR64(c4) == -1))
</del><ins>+ if ((c4 != '=') && (CHAR64(c4) == -1)) {
</ins><span class="cx"> goto base64_decode_error;;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> value += 4;
</span><span class="cx"> *out++ = (CHAR64(c1) << 2) | (CHAR64(c2) >> 4);
</span><span class="cx"> *rlen += 1;
</span><del>- if (c3 != '=')
- {
</del><ins>+
+ if (c3 != '=') {
</ins><span class="cx"> *out++ = ((CHAR64(c2) << 4) & 0xf0) | (CHAR64(c3) >> 2);
</span><span class="cx"> *rlen += 1;
</span><del>- if (c4 != '=')
- {
</del><ins>+
+ if (c4 != '=') {
</ins><span class="cx"> *out++ = ((CHAR64(c3) << 6) & 0xc0) | CHAR64(c4);
</span><span class="cx"> *rlen += 1;
</span><span class="cx"> }
</span><span class="lines">@@ -116,5 +120,6 @@
</span><span class="cx"> base64_decode_error:
</span><span class="cx"> *result = 0;
</span><span class="cx"> *rlen = 0;
</span><ins>+
</ins><span class="cx"> return result;
</span><span class="cx"> }
</span></span></pre></div>
<a id="PyKerberostrunksrcbase64h"></a>
<div class="modfile"><h4>Modified: PyKerberos/trunk/src/base64.h (14618 => 14619)</h4>
<pre class="diff"><span>
<span class="info">--- PyKerberos/trunk/src/base64.h 2015-03-26 21:28:46 UTC (rev 14618)
+++ PyKerberos/trunk/src/base64.h 2015-03-26 21:33:56 UTC (rev 14619)
</span><span class="lines">@@ -15,5 +15,6 @@
</span><span class="cx"> **/
</span><span class="cx">
</span><span class="cx"> #include <stddef.h>
</span><ins>+
</ins><span class="cx"> char *base64_encode(const unsigned char *value, size_t vlen);
</span><span class="cx"> unsigned char *base64_decode(const char *value, size_t *rlen);
</span></span></pre></div>
<a id="PyKerberostrunksrckerberosbasicc"></a>
<div class="modfile"><h4>Modified: PyKerberos/trunk/src/kerberosbasic.c (14618 => 14619)</h4>
<pre class="diff"><span>
<span class="info">--- PyKerberos/trunk/src/kerberosbasic.c 2015-03-26 21:28:46 UTC (rev 14618)
+++ PyKerberos/trunk/src/kerberosbasic.c 2015-03-26 21:33:56 UTC (rev 14619)
</span><span class="lines">@@ -26,10 +26,15 @@
</span><span class="cx"> extern PyObject *BasicAuthException_class;
</span><span class="cx"> static void set_basicauth_error(krb5_context context, krb5_error_code code);
</span><span class="cx">
</span><del>-static krb5_error_code verify_krb5_user(krb5_context context, krb5_principal principal, const char *password, krb5_principal server);
</del><ins>+static krb5_error_code verify_krb5_user(
+ krb5_context context, krb5_principal principal, const char *password,
+ krb5_principal server
+);
</ins><span class="cx">
</span><del>-int authenticate_user_krb5pwd(const char *user, const char *pswd, const char *service, const char *default_realm)
-{
</del><ins>+int authenticate_user_krb5pwd(
+ const char *user, const char *pswd, const char *service,
+ const char *default_realm
+) {
</ins><span class="cx"> krb5_context kcontext = NULL;
</span><span class="cx"> krb5_error_code code;
</span><span class="cx"> krb5_principal client = NULL;
</span><span class="lines">@@ -41,23 +46,25 @@
</span><span class="cx"> code = krb5_init_context(&kcontext);
</span><span class="cx"> if (code)
</span><span class="cx"> {
</span><del>- PyErr_SetObject(BasicAuthException_class, Py_BuildValue("((s:i))",
- "Cannot initialize Kerberos5 context", code));
</del><ins>+ PyErr_SetObject(
+ BasicAuthException_class,
+ Py_BuildValue(
+ "((s:i))", "Cannot initialize Kerberos5 context", code
+ )
+ );
</ins><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ret = krb5_parse_name (kcontext, service, &server);
</span><span class="cx">
</span><del>- if (ret)
- {
</del><ins>+ if (ret) {
</ins><span class="cx"> set_basicauth_error(kcontext, ret);
</span><span class="cx"> ret = 0;
</span><span class="cx"> goto end;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> code = krb5_unparse_name(kcontext, server, &name);
</span><del>- if (code)
- {
</del><ins>+ if (code) {
</ins><span class="cx"> set_basicauth_error(kcontext, code);
</span><span class="cx"> ret = 0;
</span><span class="cx"> goto end;
</span><span class="lines">@@ -70,18 +77,14 @@
</span><span class="cx">
</span><span class="cx"> name = (char *)malloc(256);
</span><span class="cx"> p = strchr(user, '@');
</span><del>- if (p == NULL)
- {
</del><ins>+ if (p == NULL) {
</ins><span class="cx"> snprintf(name, 256, "%s@%s", user, default_realm);
</span><del>- }
- else
- {
</del><ins>+ } else {
</ins><span class="cx"> snprintf(name, 256, "%s", user);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> code = krb5_parse_name(kcontext, name, &client);
</span><del>- if (code)
- {
</del><ins>+ if (code) {
</ins><span class="cx"> set_basicauth_error(kcontext, code);
</span><span class="cx"> ret = 0;
</span><span class="cx"> goto end;
</span><span class="lines">@@ -89,8 +92,7 @@
</span><span class="cx">
</span><span class="cx"> code = verify_krb5_user(kcontext, client, pswd, server);
</span><span class="cx">
</span><del>- if (code)
- {
</del><ins>+ if (code) {
</ins><span class="cx"> ret = 0;
</span><span class="cx"> goto end;
</span><span class="cx"> }
</span><span class="lines">@@ -99,22 +101,30 @@
</span><span class="cx">
</span><span class="cx"> end:
</span><span class="cx"> #ifdef PRINTFS
</span><del>- printf("kerb_authenticate_user_krb5pwd ret=%d user=%s authtype=%s\n", ret, user, "Basic");
</del><ins>+ printf(
+ "kerb_authenticate_user_krb5pwd ret=%d user=%s authtype=%s\n",
+ ret, user, "Basic"
+ );
</ins><span class="cx"> #endif
</span><del>- if (name)
</del><ins>+ if (name) {
</ins><span class="cx"> free(name);
</span><del>- if (client)
</del><ins>+ }
+ if (client) {
</ins><span class="cx"> krb5_free_principal(kcontext, client);
</span><del>- if (server)
</del><ins>+ }
+ if (server) {
</ins><span class="cx"> krb5_free_principal(kcontext, server);
</span><ins>+ }
</ins><span class="cx"> krb5_free_context(kcontext);
</span><span class="cx">
</span><span class="cx"> return ret;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /* Inspired by krb5_verify_user from Heimdal */
</span><del>-static krb5_error_code verify_krb5_user(krb5_context context, krb5_principal principal, const char *password, krb5_principal server)
-{
</del><ins>+static krb5_error_code verify_krb5_user(
+ krb5_context context, krb5_principal principal, const char *password,
+ krb5_principal server
+) {
</ins><span class="cx"> krb5_creds creds;
</span><span class="cx"> krb5_get_init_creds_opt gic_options;
</span><span class="cx"> krb5_error_code ret;
</span><span class="lines">@@ -123,8 +133,7 @@
</span><span class="cx"> memset(&creds, 0, sizeof(creds));
</span><span class="cx">
</span><span class="cx"> ret = krb5_unparse_name(context, principal, &name);
</span><del>- if (ret == 0)
- {
</del><ins>+ if (ret == 0) {
</ins><span class="cx"> #ifdef PRINTFS
</span><span class="cx"> printf("Trying to get TGT for user %s\n", name);
</span><span class="cx"> #endif
</span><span class="lines">@@ -132,9 +141,11 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> krb5_get_init_creds_opt_init(&gic_options);
</span><del>- ret = krb5_get_init_creds_password(context, &creds, principal, (char *)password, NULL, NULL, 0, NULL, &gic_options);
- if (ret)
- {
</del><ins>+ ret = krb5_get_init_creds_password(
+ context, &creds, principal, (char *)password,
+ NULL, NULL, 0, NULL, &gic_options
+ );
+ if (ret) {
</ins><span class="cx"> set_basicauth_error(context, ret);
</span><span class="cx"> goto end;
</span><span class="cx"> }
</span><span class="lines">@@ -147,5 +158,8 @@
</span><span class="cx">
</span><span class="cx"> static void set_basicauth_error(krb5_context context, krb5_error_code code)
</span><span class="cx"> {
</span><del>- PyErr_SetObject(BasicAuthException_class, Py_BuildValue("(s:i)", krb5_get_err_text(context, code), code));
</del><ins>+ PyErr_SetObject(
+ BasicAuthException_class,
+ Py_BuildValue("(s:i)", krb5_get_err_text(context, code), code)
+ );
</ins><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>