xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

acmed: handle international domain names

Browse source
This commit is contained in:
cinap_lenrek 2021-10-31 00:12:36 +00:00
parent bda0561f45
commit a9e533ad1e
1 changed files with 22 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
sys/src/cmd/auth/acmed.c
View file

@ -741,9 +741,9 @@ fetchcert(char *url)
static void static void
getcert(char *csrpath) getcert(char *csrpath)
{ {
char *csr, *dom[64], name[2048]; char *csr, *dom[64], subj[2048];
uchar *der; uchar *der;
int nder, ndom, fd; int nder, i, ndom, fd;
RSApub *rsa; RSApub *rsa;
Hdr loc = { "location" }; Hdr loc = { "location" };
JSON *o; JSON *o;
@ -752,24 +752,39 @@ getcert(char *csrpath)
sysfatal("open %s: %r", csrpath); sysfatal("open %s: %r", csrpath);
if((der = slurp(fd, &nder)) == nil) if((der = slurp(fd, &nder)) == nil)
sysfatal("read %s: %r", csrpath); sysfatal("read %s: %r", csrpath);
if((rsa = X509reqtoRSApub(der, nder, name, sizeof(name))) == nil) close(fd);
if((rsa = X509reqtoRSApub(der, nder, subj, sizeof(subj))) == nil)
sysfatal("decode csr: %r"); sysfatal("decode csr: %r");
rsapubfree(rsa);
if((csr = encurl64(der, nder)) == nil) if((csr = encurl64(der, nder)) == nil)
sysfatal("encode %s: %r", csrpath); sysfatal("encode %s: %r", csrpath);
if((ndom = getfields(name, dom, nelem(dom), 1, ", ")) == nelem(dom))
sysfatal("too man domains");
rsapubfree(rsa);
close(fd);
free(der); free(der);
dprint("subject: %s\n", subj);
if((ndom = getfields(subj, dom, nelem(dom), 1, ", ")) == nelem(dom))
sysfatal("too man domains");
for(i = 0; i < ndom; i++){
char buf[256], *s = dom[i];
if(utf2idn(s, buf, sizeof(buf)) >= 0)
s = buf;
dprint("dom[%d]: %s\n", i, s);
dom[i] = strdup(s);
}
if((o = submitorder(dom, ndom, &loc)) == nil) if((o = submitorder(dom, ndom, &loc)) == nil)
sysfatal("order: %r"); sysfatal("order: %r");
if(dochallenges(dom, ndom, o) == -1) if(dochallenges(dom, ndom, o) == -1)
sysfatal("challenge: %r"); sysfatal("challenge: %r");
if(submitcsr(o, csr) == -1) if(submitcsr(o, csr) == -1)
sysfatal("signing cert: %r"); sysfatal("signing cert: %r");
if(fetchcert(loc.val) == -1) if(fetchcert(loc.val) == -1)
sysfatal("saving cert: %r"); sysfatal("saving cert: %r");
for(i = 0; i < ndom; i++)
free(dom[i]);
free(csr); free(csr);
} }