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

auth/httpauth: use auth_userpasswd() instead of AuthHttp request to AS

Browse source 
the /sys/lib/httppasswords will be removed soon from authsrv,
so we use auth_userpasswd() to verify a username/password pair
instead.
This commit is contained in:
cinap_lenrek 2015-12-16 21:27:44 +01:00
parent 8a60d9e2a8
commit e83c9b3e61
1 changed files with 2 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
sys/src/cmd/auth/httpauth.c
View file

@ -1,36 +1,6 @@
#include <u.h>
#include <libc.h>
#include <authsrv.h>
int
httpauth(char *name, char *password)
{
int afd;
Ticketreq tr;
Ticket t;
Authkey key;
afd = authdial(nil, nil);
if(afd < 0)
return -1;
passtokey(&key, password);
/* send ticket request to AS */
memset(&tr, 0, sizeof(tr));
strcpy(tr.uid, name);
tr.type = AuthHttp;
if(_asrequest(afd, &tr) < 0){
close(afd);
return -1;
}
_asgetresp(afd, &t, nil, &key);
close(afd);
if(t.num != AuthHr || strcmp(t.cuid, tr.uid) != 0)
return -1;
return 0;
}
#include <auth.h>
void
usage(void)
@ -73,7 +43,7 @@ main(int argc, char *argv[])
}
if(*s == '\0')
sysfatal("empty username");
if(httpauth(s, a))
if(auth_userpasswd(s, a) == nil)
sysfatal("bad password");
print("%s\n", s);
exits(nil);