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

webfs: simplify http basic auth code by using encodefmt()

Browse source
This commit is contained in:
cinap_lenrek 2015-03-12 17:26:49 +01:00
parent 69af2676b0
commit 7e7cc2c8d7
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
sys/src/cmd/webfs/fs.c
View file

@ -781,6 +781,7 @@ main(int argc, char *argv[])
fmtinstall('U', Ufmt);
fmtinstall('H', Hfmt);
fmtinstall('E', Efmt);
fmtinstall('[', encodefmt);
mtpt = "/mnt/web";
user = getuser();

14
sys/src/cmd/webfs/http.c
View file

@ -357,7 +357,6 @@ authenticate(Url *u, Url *ru, char *method, char *s)
pass = u->pass;
realm = nonce = opaque = nil;
if(!cistrncmp(s, "Basic ", 6)){
char cred[128], plain[128];
UserPasswd *up;
s += 6;
@ -380,19 +379,20 @@ authenticate(Url *u, Url *ru, char *method, char *s)
user = up->user;
pass = up->passwd;
}
n = snprint(plain, sizeof(plain), "%s:%s", user ? user : "", pass ? pass : "");
fmtstrinit(&fmt);
fmtprint(&fmt, "%s:%s", user ? user : "", pass ? pass : "");
if(up){
memset(up->user, 0, strlen(up->user));
memset(up->passwd, 0, strlen(up->passwd));
free(up);
}
n = enc64(cred, sizeof(cred), (uchar*)plain, n);
memset(plain, 0, sizeof(plain));
if(n == -1)
if((s = fmtstrflush(&fmt)) == nil)
return -1;
n = strlen(s);
fmtstrinit(&fmt);
fmtprint(&fmt, "Basic %s", cred);
memset(cred, 0, sizeof(cred));
fmtprint(&fmt, "Basic %.*[", n, s);
memset(s, 0, n);
free(s);
u = saneurl(url(".", u)); /* all uris below the requested one */
}else
if(!cistrncmp(s, "Digest ", 7)){