/*
* we shouldn't be writing nvram any more.
* the secstore/config field is now just secstore key.
- * we still use authid, authdom and machkey for authentication.
*/
int
uchar csum;
if (readnvram(&nvr, NVread) < 0) {
- print("nvrcheck: can't read nvram\n");
+ fprint(2, "nvrcheck: can't read nvram\n");
return 1;
} else
gotnvr = 1;
- print("nvr read\n");
+
+ if(chatty)
+ print("nvr read\n");
csum = nvcsum(nvr.machkey, sizeof nvr.machkey);
if(csum != nvr.machsum) {
- print("\n\n ** NVR key checksum is incorrect **\n");
- print(" ** set password to allow attaches **\n\n");
+ fprint(2, "\n\n ** NVR key checksum is incorrect **\n");
+ fprint(2, " ** set password to allow attaches **\n\n");
memset(nvr.machkey, 0, sizeof nvr.machkey);
return 1;
}
return 1;
}
-/* authentication structure */
-struct Auth
-{
- int inuse;
- char uname[NAMELEN]; /* requestor's remote user name */
- char aname[NAMELEN]; /* requested aname */
- Userid uid; /* uid decided on */
- AuthRpc *rpc;
-};
-
-Auth* auths;
-Lock authlock;
-
-void
-authinit(void)
-{
- auths = malloc(conf.nauth * sizeof(*auths));
-}
+static char *keyspec = "proto=p9any role=server";
-static int
-failure(Auth *s, char *why)
+void*
+authnew(void)
{
AuthRpc *rpc;
-
- if(why && *why)print("authentication failed: %s: %r\n", why);
- s->uid = -1;
- if(rpc = s->rpc){
- s->rpc = 0;
- auth_freerpc(rpc);
+ int fd;
+
+ if(access("/mnt/factotum", 0) < 0)
+ if((fd = open("/srv/factotum", ORDWR)) >= 0)
+ mount(fd, -1, "/mnt", MBEFORE, "");
+ if((fd = open("/mnt/factotum/rpc", ORDWR)) < 0)
+ return nil;
+ if((rpc = auth_allocrpc(fd)) == nil){
+ close(fd);
+ return nil;
}
- return -1;
-}
-
-Auth*
-authnew(char *uname, char *aname)
-{
- static int si = 0;
- int afd, i, nwrap;
- Auth *s;
-
- i = si;
- nwrap = 0;
- for(;;){
- if(i < 0 || i >= conf.nauth){
- if(++nwrap > 1)
- return nil;
- i = 0;
- }
- s = &auths[i++];
- if(s->inuse)
- continue;
- lock(&authlock);
- if(s->inuse == 0){
- s->inuse = 1;
- strncpy(s->uname, uname, NAMELEN-1);
- strncpy(s->aname, aname, NAMELEN-1);
- failure(s, "");
- si = i;
- unlock(&authlock);
- break;
- }
- unlock(&authlock);
- }
- if((afd = open("/mnt/factotum/rpc", ORDWR)) < 0){
- failure(s, "open /mnt/factotum/rpc");
- return s;
- }
- if((s->rpc = auth_allocrpc(afd)) == 0){
- failure(s, "auth_allocrpc");
- close(afd);
- return s;
+ if(auth_rpc(rpc, "start", keyspec, strlen(keyspec)) != ARok){
+ authfree(rpc);
+ return nil;
}
- if(auth_rpc(s->rpc, "start", "proto=p9any role=server", 23) != ARok)
- failure(s, "auth_rpc: start");
- return s;
+ return rpc;
}
void
-authfree(Auth *s)
+authfree(void *auth)
{
- if(s){
- failure(s, "");
- s->inuse = 0;
+ AuthRpc *rpc;
+
+ if(rpc = auth){
+ close(rpc->afd);
+ auth_freerpc(rpc);
}
}
int
-authread(File* file, uchar* data, int n)
+authread(File *file, uchar *data, int count)
{
AuthInfo *ai;
- Auth *s;
+ AuthRpc *rpc;
+ Chan *chan;
- s = file->auth;
- if(s == nil)
- return -1;
- if(s->rpc == nil)
+ chan = file->cp;
+ if((rpc = file->auth) == nil){
+ snprint(chan->err, sizeof(chan->err),
+ "not an auth fid");
return -1;
- switch(auth_rpc(s->rpc, "read", nil, 0)){
+ }
+
+ switch(auth_rpc(rpc, "read", nil, 0)){
default:
- failure(s, "auth_rpc: read");
- break;
+ snprint(chan->err, sizeof(chan->err),
+ "authread: auth protocol not finished");
+ return -1;
case ARdone:
- if((ai = auth_getinfo(s->rpc)) == nil){
- failure(s, "auth_getinfo failed");
- break;
- }
- if(ai->cuid == nil || *ai->cuid == '\0'){
- failure(s, "auth with no cuid");
+ if((ai = auth_getinfo(rpc)) == nil)
+ goto Phase;
+ file->uid = strtouid(ai->cuid);
+ if(file->uid < 0){
+ snprint(chan->err, sizeof(chan->err),
+ "unknown user '%s'", ai->cuid);
auth_freeAI(ai);
- break;
+ return -1;
}
- failure(s, "");
- s->uid = strtouid(ai->cuid);
auth_freeAI(ai);
return 0;
case ARok:
- if(n < s->rpc->narg)
- break;
- memmove(data, s->rpc->arg, s->rpc->narg);
- return s->rpc->narg;
+ if(count < rpc->narg){
+ snprint(chan->err, sizeof(chan->err),
+ "not enough data in auth read");
+ return -1;
+ }
+ memmove(data, rpc->arg, rpc->narg);
+ return rpc->narg;
+ case ARphase:
+ Phase:
+ rerrstr(chan->err, sizeof(chan->err));
+ return -1;
}
- return -1;
}
int
-authwrite(File* file, uchar *data, int n)
+authwrite(File *file, uchar *data, int count)
{
- Auth *s;
+ AuthRpc *rpc;
+ Chan *chan;
- s = file->auth;
- if(s == nil)
- return -1;
- if(s->rpc == nil)
+ chan = file->cp;
+ if((rpc = file->auth) == nil){
+ snprint(chan->err, sizeof(chan->err),
+ "not an auth fid");
return -1;
- if(auth_rpc(s->rpc, "write", data, n) != ARok){
- failure(s, "auth_rpc: write");
+ }
+ if(auth_rpc(rpc, "write", data, count) != ARok){
+ rerrstr(chan->err, sizeof(chan->err));
return -1;
}
- return n;
+ return count;
}
-int
-authuid(Auth* s)
-{
- return s->uid;
-}
-
-char*
-authaname(Auth* s)
-{
- return s->aname;
-}
-
-char*
-authuname(Auth* s)
-{
- return s->uname;
-}
projects / plan9front.git / blobdiff