[CalendarServer-changes] [14619] PyKerberos/trunk/src
source_changes at macosforge.org
source_changes at macosforge.org
Thu Mar 26 14:33:56 PDT 2015
Revision: 14619
http://trac.calendarserver.org//changeset/14619
Author: wsanchez at apple.com
Date: 2015-03-26 14:33:56 -0700 (Thu, 26 Mar 2015)
Log Message:
-----------
cleanup
Modified Paths:
--------------
PyKerberos/trunk/src/base64.c
PyKerberos/trunk/src/base64.h
PyKerberos/trunk/src/kerberosbasic.c
Modified: PyKerberos/trunk/src/base64.c
===================================================================
--- 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)
@@ -81,32 +81,36 @@
unsigned char *result =(unsigned char *)malloc((vlen * 3) / 4 + 1);
unsigned char *out = result;
- while (1)
- {
- if (value[0]==0)
+ while (1) {
+ if (value[0]==0) {
return result;
+ }
c1 = value[0];
- if (CHAR64(c1) == -1)
+ if (CHAR64(c1) == -1) {
goto base64_decode_error;;
+ }
c2 = value[1];
- if (CHAR64(c2) == -1)
+ if (CHAR64(c2) == -1) {
goto base64_decode_error;;
+ }
c3 = value[2];
- if ((c3 != '=') && (CHAR64(c3) == -1))
+ if ((c3 != '=') && (CHAR64(c3) == -1)) {
goto base64_decode_error;;
+ }
c4 = value[3];
- if ((c4 != '=') && (CHAR64(c4) == -1))
+ if ((c4 != '=') && (CHAR64(c4) == -1)) {
goto base64_decode_error;;
+ }
value += 4;
*out++ = (CHAR64(c1) << 2) | (CHAR64(c2) >> 4);
*rlen += 1;
- if (c3 != '=')
- {
+
+ if (c3 != '=') {
*out++ = ((CHAR64(c2) << 4) & 0xf0) | (CHAR64(c3) >> 2);
*rlen += 1;
- if (c4 != '=')
- {
+
+ if (c4 != '=') {
*out++ = ((CHAR64(c3) << 6) & 0xc0) | CHAR64(c4);
*rlen += 1;
}
@@ -116,5 +120,6 @@
base64_decode_error:
*result = 0;
*rlen = 0;
+
return result;
}
Modified: PyKerberos/trunk/src/base64.h
===================================================================
--- 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)
@@ -15,5 +15,6 @@
**/
#include <stddef.h>
+
char *base64_encode(const unsigned char *value, size_t vlen);
unsigned char *base64_decode(const char *value, size_t *rlen);
Modified: PyKerberos/trunk/src/kerberosbasic.c
===================================================================
--- 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)
@@ -26,10 +26,15 @@
extern PyObject *BasicAuthException_class;
static void set_basicauth_error(krb5_context context, krb5_error_code code);
-static krb5_error_code verify_krb5_user(krb5_context context, krb5_principal principal, const char *password, krb5_principal server);
+static krb5_error_code verify_krb5_user(
+ krb5_context context, krb5_principal principal, const char *password,
+ krb5_principal server
+);
-int authenticate_user_krb5pwd(const char *user, const char *pswd, const char *service, const char *default_realm)
-{
+int authenticate_user_krb5pwd(
+ const char *user, const char *pswd, const char *service,
+ const char *default_realm
+) {
krb5_context kcontext = NULL;
krb5_error_code code;
krb5_principal client = NULL;
@@ -41,23 +46,25 @@
code = krb5_init_context(&kcontext);
if (code)
{
- PyErr_SetObject(BasicAuthException_class, Py_BuildValue("((s:i))",
- "Cannot initialize Kerberos5 context", code));
+ PyErr_SetObject(
+ BasicAuthException_class,
+ Py_BuildValue(
+ "((s:i))", "Cannot initialize Kerberos5 context", code
+ )
+ );
return 0;
}
ret = krb5_parse_name (kcontext, service, &server);
- if (ret)
- {
+ if (ret) {
set_basicauth_error(kcontext, ret);
ret = 0;
goto end;
}
code = krb5_unparse_name(kcontext, server, &name);
- if (code)
- {
+ if (code) {
set_basicauth_error(kcontext, code);
ret = 0;
goto end;
@@ -70,18 +77,14 @@
name = (char *)malloc(256);
p = strchr(user, '@');
- if (p == NULL)
- {
+ if (p == NULL) {
snprintf(name, 256, "%s@%s", user, default_realm);
- }
- else
- {
+ } else {
snprintf(name, 256, "%s", user);
}
code = krb5_parse_name(kcontext, name, &client);
- if (code)
- {
+ if (code) {
set_basicauth_error(kcontext, code);
ret = 0;
goto end;
@@ -89,8 +92,7 @@
code = verify_krb5_user(kcontext, client, pswd, server);
- if (code)
- {
+ if (code) {
ret = 0;
goto end;
}
@@ -99,22 +101,30 @@
end:
#ifdef PRINTFS
- printf("kerb_authenticate_user_krb5pwd ret=%d user=%s authtype=%s\n", ret, user, "Basic");
+ printf(
+ "kerb_authenticate_user_krb5pwd ret=%d user=%s authtype=%s\n",
+ ret, user, "Basic"
+ );
#endif
- if (name)
+ if (name) {
free(name);
- if (client)
+ }
+ if (client) {
krb5_free_principal(kcontext, client);
- if (server)
+ }
+ if (server) {
krb5_free_principal(kcontext, server);
+ }
krb5_free_context(kcontext);
return ret;
}
/* Inspired by krb5_verify_user from Heimdal */
-static krb5_error_code verify_krb5_user(krb5_context context, krb5_principal principal, const char *password, krb5_principal server)
-{
+static krb5_error_code verify_krb5_user(
+ krb5_context context, krb5_principal principal, const char *password,
+ krb5_principal server
+) {
krb5_creds creds;
krb5_get_init_creds_opt gic_options;
krb5_error_code ret;
@@ -123,8 +133,7 @@
memset(&creds, 0, sizeof(creds));
ret = krb5_unparse_name(context, principal, &name);
- if (ret == 0)
- {
+ if (ret == 0) {
#ifdef PRINTFS
printf("Trying to get TGT for user %s\n", name);
#endif
@@ -132,9 +141,11 @@
}
krb5_get_init_creds_opt_init(&gic_options);
- ret = krb5_get_init_creds_password(context, &creds, principal, (char *)password, NULL, NULL, 0, NULL, &gic_options);
- if (ret)
- {
+ ret = krb5_get_init_creds_password(
+ context, &creds, principal, (char *)password,
+ NULL, NULL, 0, NULL, &gic_options
+ );
+ if (ret) {
set_basicauth_error(context, ret);
goto end;
}
@@ -147,5 +158,8 @@
static void set_basicauth_error(krb5_context context, krb5_error_code code)
{
- PyErr_SetObject(BasicAuthException_class, Py_BuildValue("(s:i)", krb5_get_err_text(context, code), code));
+ PyErr_SetObject(
+ BasicAuthException_class,
+ Py_BuildValue("(s:i)", krb5_get_err_text(context, code), code)
+ );
}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20150326/d7c4018e/attachment.html>
More information about the calendarserver-changes
mailing list