oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

bx509: Work around microhttpd bug

Browse Source
This commit is contained in:
Nicolas Williams
2019-12-20 15:54:27 -06:00
parent 73a9c95b7b
commit ee0a288f92
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
kdc/bx509d.c
View File

@@ -690,19 +690,33 @@ do_CA(struct bx509_request_desc *r, const char *csr)
hx509_certs certs = NULL; hx509_certs certs = NULL;
krb5_data d; krb5_data d;
ssize_t bytes; ssize_t bytes;
char *csr2, *q;
/*
* Work around bug where microhttpd decodes %2b to + then + to space. That
* bug does not affect other base64 special characters that get URI
* %-encoded.
*/
if ((csr2 = strdup(csr)) == NULL)
return bad_enomem(r, ENOMEM);
for (q = strchr(csr2, ' '); q; q = strchr(q + 1, ' '))
*q = '+';
ret = krb5_parse_name(r->context, r->cname, &p); ret = krb5_parse_name(r->context, r->cname, &p);
if (ret) if (ret) {
free(csr2);
return bad_req(r, ret, MHD_HTTP_SERVICE_UNAVAILABLE, return bad_req(r, ret, MHD_HTTP_SERVICE_UNAVAILABLE,
"Could not parse principal name"); "Could not parse principal name");
}
/* Set CSR */ /* Set CSR */
if ((d.data = malloc(strlen(csr))) == NULL) { if ((d.data = malloc(strlen(csr2))) == NULL) {
krb5_free_principal(r->context, p); krb5_free_principal(r->context, p);
return bad_enomem(r, ENOMEM); return bad_enomem(r, ENOMEM);
} }
bytes = rk_base64_decode(csr, d.data); bytes = rk_base64_decode(csr2, d.data);
free(csr2);
if (bytes < 0) if (bytes < 0)
ret = errno; ret = errno;
else else