don't expose secstore secrets in /mnt/term/dev/secstore

this feature is too dangerous. i can imagine it being there so a server side factotum can use the drawterms secstore keys that it already loaded, but this makes it just too easy to steal the keys. now we zero the secstorebuf after we extracted the plan9 key from it so no secrets are left behind in drawterms memory after authentication is done.

cinap_lenrek committed 10 years ago

Commit 39347ab1 parent 162ce8d3 files · +3 −21Browse files

Unified · Split

3 files

cpu.c +2 −0
kern/devcons.c +0 −21
main.c +1 −0

cpu.c+2−0

@@ -637,6 +637,8 @@ p9any(int fd) · 636 unmodified lines
637		637
638	u = user;	638	u = user;
639	pass = findkey(&u, tr.authdom, proto);	639	pass = findkey(&u, tr.authdom, proto);
		640	memset(secstorebuf, 0, sizeof(secstorebuf)); /* forget secstore secrets */
		641
640	if(pass == nil)	642	if(pass == nil)
641	again:	643	again:
642	pass = getkey(u, tr.authdom, proto);	644	pass = getkey(u, tr.authdom, proto);

kern/devcons.c+0−21

 	Qppid,
 	Qrandom,
 	Qreboot,
-	Qsecstore,
 	Qshowfile,
 	Qsnarf,
 	Qswap,
 	"ppid",		{Qppid},	NUMSIZE,	0444,
 	"random",	{Qrandom},	0,		0444,
 	"reboot",	{Qreboot},	0,		0664,
-	"secstore",	{Qsecstore},	0,		0666,
 	"showfile",	{Qshowfile},	0,	0220,
 	"snarf",	{Qsnarf},		0,		0666,
 	"swap",		{Qswap},	0,		0664,
 	"zero",		{Qzero},	0,		0444,
 };
-char secstorebuf[65536];
-Dirtab *secstoretab = &consdir[Qsecstore];
 Dirtab *snarftab = &consdir[Qsnarf];
 int
 		c->iounit = qiomaxatomic;
 		break;
-	case Qsecstore:
-		if(omode == ORDWR)
-			error(Eperm);
-		if(omode != OREAD)
-			memset(secstorebuf, 0, sizeof secstorebuf);
-		break;
 	case Qsnarf:
 		if(omode == ORDWR)
 			error(Eperm);
 			return 0;
 		return readstr(offset, buf, n, c->aux);
-	case Qsecstore:
-		return readstr(offset, buf, n, secstorebuf);
 	case Qsysstat:
 		return 0;
 		free(cb);
 		break;
-	case Qsecstore:
-		if(offset >= sizeof secstorebuf || offset+n+1 >= sizeof secstorebuf)
-			error(Etoobig);
-		secstoretab->qid.vers++;
-		memmove(secstorebuf+offset, va, n);
-		return n;
 	case Qshowfile:
 		return showfilewrite(a, n);

main.c+1−0

@@ -8,6 +8,7 @@ · 7 unmodified lines
8		8
9	char *argv0;	9	char *argv0;
10	char *user;	10	char *user;
		11	char secstorebuf[65536];
11		12
12	extern int errfmt(Fmt*);	13	extern int errfmt(Fmt*);
13	void	14	void

don't expose secstore secrets in /mnt/term/dev/secstore

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code