do not permit opening psk.txt with insufficient permission.

we may want to add safefile() calls to other locations as well.
(like certificates)

kame/kame/racoon/Makefile.in

@@ -1,4 +1,4 @@
-# YIPS $Id: Makefile.in,v 1.22 2000/06/08 21:30:38 itojun Exp $
+# YIPS $Id: Makefile.in,v 1.23 2000/06/13 05:01:41 itojun Exp $
 
 @SET_MAKE@
 srcdir=	@srcdir@
@@ -29,7 +29,7 @@ OBJS=	main.o session.o isakmp.o handler.o \
 	policy.o localconf.o remoteconf.o crypto_openssl.o algorithm.o \
 	proposal.o sainfo.o cfparse.o cftoken.o strnames.o \
 	vmbuf.o plog.o logger.o schedule.o str2val.o misc.o sockmisc.o \
-	@LIBOBJS@
+	safefile.o @LIBOBJS@
 # under samples
 CONF=	psk.txt racoon.conf remote.conf
 

kame/kame/racoon/localconf.c

@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
-/* YIPS @(#)$Id: localconf.c,v 1.13 2000/06/08 06:43:52 sakane Exp $ */
+/* YIPS @(#)$Id: localconf.c,v 1.14 2000/06/13 05:01:41 itojun Exp $ */
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -52,6 +52,7 @@
 #include "grabmyaddr.h"
 #include "vendorid.h"
 #include "str2val.h"
+#include "safefile.h"
 
 struct localconf *lcconf;
 
@@ -173,7 +174,10 @@ getpsk(str, len)
 	char *p, *q;
 	int keylen;
 
-	fp = fopen(lcconf->pathinfo[LC_PATHTYPE_PSK], "r");
+	if (safefile(lcconf->pathinfo[LC_PATHTYPE_PSK], 1) == 0)
+		fp = fopen(lcconf->pathinfo[LC_PATHTYPE_PSK], "r");
+	else
+		fp = NULL;
 	if (fp == NULL) {
 		plog(logp, LOCATION, NULL,
 			"failed to open pre_share_key file %s\n",

kame/kame/racoon/safefile.c

@@ -0,0 +1,88 @@
+/*	$KAME: safefile.c,v 1.1 2000/06/13 05:01:41 itojun Exp $	*/
+
+/*
+ * Copyright (C) 2000 WIDE Project.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the project nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <unistd.h>
+
+#include "plog.h"
+#include "debug.h"
+#include "misc.h"
+
+int
+safefile(path, secret)
+	const char *path;
+	int secret;
+{
+	struct stat s;
+	uid_t me;
+
+	/* no setuid */
+	if (getuid() != geteuid()) {
+		plog(logp, LOCATION, NULL,
+		    "setuid'ed execution not allowed\n");
+		return -1;
+	}
+
+	if (stat(path, &s) != 0)
+		return -1;
+
+	/* the file must be owned by the running uid */
+	me = getuid();
+	if (s.st_uid != me) {
+		plog(logp, LOCATION, NULL,
+		    "%s has invalid owner uid\n", path);
+		return -1;
+	}
+
+	switch (s.st_mode & S_IFMT) {
+	case S_IFREG:
+		break;
+	default:
+		plog(logp, LOCATION, NULL,
+		    "%s is an invalid file type 0x%x\n", path,
+		    (s.st_mode & S_IFMT));
+		return -1;
+	}
+
+	/* secret file should not be read by others */
+	if (secret) {
+		if ((s.st_mode & S_IRWXG) != 0 || (s.st_mode & S_IRWXO) != 0) {
+			plog(logp, LOCATION, NULL,
+			    "%s has weak file permission\n", path);
+			return -1;
+		}
+	}
+
+	return 0;
+}

kame/kame/racoon/safefile.h

@@ -0,0 +1,32 @@
+/*	$KAME: safefile.h,v 1.1 2000/06/13 05:01:41 itojun Exp $	*/
+
+/*
+ * Copyright (C) 2000 WIDE Project.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the project nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+extern int safefile __P((const char *, int));