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

webcookies: create lockfile with 0600 permission, always use create() with perm 0600 for rewriting jar

Browse source
This commit is contained in:
cinap_lenrek 2015-08-01 03:18:44 +02:00
parent f42a7ade70
commit f62a2efb7a
1 changed files with 6 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

14
sys/src/cmd/webcookies.c
View file

@ -377,7 +377,7 @@ syncjar(Jar *jar)
fd = -1; fd = -1;
for(i=0; i<50; i++){ for(i=0; i<50; i++){
if((fd = create(jar->lockfile, OWRITE, DMEXCL|0666)) < 0){ if((fd = create(jar->lockfile, OWRITE, DMEXCL|0600)) < 0){
sleep(100); sleep(100);
continue; continue;
} }
@ -416,10 +416,12 @@ syncjar(Jar *jar)
purgejar(jar); purgejar(jar);
if(dowrite){ if(dowrite){
b = Bopen(jar->file, OTRUNC|OWRITE); i = create(jar->file, OWRITE, 0600);
if(b == nil){ if(i < 0 || (b = Bfdopen(i, OWRITE)) == nil){
if(debug) if(debug)
fprint(2, "Bopen write %s: %r", jar->file); fprint(2, "Bopen write %s: %r", jar->file);
if(i >= 0)
close(i);
close(fd); close(fd);
return -1; return -1;
} }
@ -1249,7 +1251,6 @@ void
main(int argc, char **argv) main(int argc, char **argv)
{ {
char *file, *mtpt, *home, *srv; char *file, *mtpt, *home, *srv;
int fd;
file = nil; file = nil;
srv = nil; srv = nil;
@ -1289,11 +1290,6 @@ main(int argc, char **argv)
strcpy(file, home); strcpy(file, home);
strcat(file, "/lib/webcookies"); strcat(file, "/lib/webcookies");
} }
if(access(file, AEXIST) < 0){
if((fd = create(file, OWRITE, 0600)) < 0)
sysfatal("create %s: %r", file);
close(fd);
}
jar = readjar(file); jar = readjar(file);
if(jar == nil) if(jar == nil)