Add fstat / S_ISDIR checks to make sure we're not trying to use a

bmomjian · bmomjian · commit 5f644ea699ae · 2002-02-23T21:46:03.000Z
directory for COPY TO/FROM.

Brent Verner
diff --git a/src/backend/commands/copy.c b/src/backend/commands/copy.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.145 2002/02/12 21:25:41 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.146 2002/02/23 21:46:02 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -326,12 +326,20 @@ DoCopy(char *relname, bool binary, bool oids, bool from, bool pipe,
 		}
 		else
 		{
+      struct stat st;
 			fp = AllocateFile(filename, PG_BINARY_R);
-			if (fp == NULL)
+			
+      if (fp == NULL)
 				elog(ERROR, "COPY command, running in backend with "
 					 "effective uid %d, could not open file '%s' for "
 					 "reading.  Errno = %s (%d).",
 					 (int) geteuid(), filename, strerror(errno), errno);
+      
+      fstat(fileno(fp),&st);
+      if( S_ISDIR(st.st_mode) ){
+        fclose(fp);
+        elog(ERROR,"COPY: %s is a directory.",filename);
+      }
 		}
 		CopyFrom(rel, binary, oids, fp, delim, null_print);
 	}
@@ -360,6 +368,7 @@ DoCopy(char *relname, bool binary, bool oids, bool from, bool pipe,
 		else
 		{
 			mode_t		oumask; /* Pre-existing umask value */
+      struct stat st;
 
 			/*
 			 * Prevent write to relative path ... too easy to shoot
@@ -378,6 +387,11 @@ DoCopy(char *relname, bool binary, bool oids, bool from, bool pipe,
 					 "effective uid %d, could not open file '%s' for "
 					 "writing.  Errno = %s (%d).",
 					 (int) geteuid(), filename, strerror(errno), errno);
+      fstat(fileno(fp),&st);
+      if( S_ISDIR(st.st_mode) ){
+        fclose(fp);
+        elog(ERROR,"COPY: %s is a directory.",filename);
+      }
 		}
 		CopyTo(rel, binary, oids, fp, delim, null_print);
 	}
diff --git a/src/bin/psql/copy.c b/src/bin/psql/copy.c
@@ -3,14 +3,15 @@
  *
  * Copyright 2000 by PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/psql/copy.c,v 1.19 2001/06/02 18:25:18 petere Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/copy.c,v 1.20 2002/02/23 21:46:03 momjian Exp $
  */
 #include "postgres_fe.h"
 #include "copy.h"
 
 #include <errno.h>
 #include <assert.h>
 #include <signal.h>
+#include <sys/stat.h>
 #ifndef WIN32
 #include <unistd.h>				/* for isatty */
 #else
@@ -233,6 +234,7 @@ do_copy(const char *args)
 	struct copy_options *options;
 	PGresult   *result;
 	bool		success;
+  struct stat st;
 
 	/* parse options */
 	options = parse_slash_copy(args);
@@ -292,7 +294,16 @@ do_copy(const char *args)
 		free_copy_options(options);
 		return false;
 	}
-
+  /* make sure the specified file is not a directory */
+  fstat(fileno(copystream),&st);
+  if( S_ISDIR(st.st_mode) ){
+    fclose(copystream);
+		psql_error("%s: cannot COPY TO/FROM a directory\n",
+				   options->file);
+		free_copy_options(options);
+		return false;
+  }
+  
 	result = PSQLexec(query);
 
 	switch (PQresultStatus(result))

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.145 2002/02/12 21:25:41 tgl Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.146 2002/02/23 21:46:02 momjian Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -326,12 +326,20 @@ DoCopy(char *relname, bool binary, bool oids, bool from, bool pipe,`
`326`	`326`	`}`
`327`	`327`	`else`
`328`	`328`	`{`
	`329`	`+ struct stat st;`
`329`	`330`	`fp = AllocateFile(filename, PG_BINARY_R);`
`330`		`- if (fp == NULL)`
	`331`	`+`
	`332`	`+ if (fp == NULL)`
`331`	`333`	`elog(ERROR, "COPY command, running in backend with "`
`332`	`334`	`"effective uid %d, could not open file '%s' for "`
`333`	`335`	`"reading. Errno = %s (%d).",`
`334`	`336`	`(int) geteuid(), filename, strerror(errno), errno);`
	`337`	`+`
	`338`	`+ fstat(fileno(fp),&st);`
	`339`	`+ if( S_ISDIR(st.st_mode) ){`
	`340`	`+ fclose(fp);`
	`341`	`+ elog(ERROR,"COPY: %s is a directory.",filename);`
	`342`	`+ }`
`335`	`343`	`}`
`336`	`344`	`CopyFrom(rel, binary, oids, fp, delim, null_print);`
`337`	`345`	`}`
`@@ -360,6 +368,7 @@ DoCopy(char *relname, bool binary, bool oids, bool from, bool pipe,`
`360`	`368`	`else`
`361`	`369`	`{`
`362`	`370`	`mode_t oumask; /* Pre-existing umask value */`
	`371`	`+ struct stat st;`
`363`	`372`
`364`	`373`	`/*`
`365`	`374`	`* Prevent write to relative path ... too easy to shoot`
`@@ -378,6 +387,11 @@ DoCopy(char *relname, bool binary, bool oids, bool from, bool pipe,`
`378`	`387`	`"effective uid %d, could not open file '%s' for "`
`379`	`388`	`"writing. Errno = %s (%d).",`
`380`	`389`	`(int) geteuid(), filename, strerror(errno), errno);`
	`390`	`+ fstat(fileno(fp),&st);`
	`391`	`+ if( S_ISDIR(st.st_mode) ){`
	`392`	`+ fclose(fp);`
	`393`	`+ elog(ERROR,"COPY: %s is a directory.",filename);`
	`394`	`+ }`
`381`	`395`	`}`
`382`	`396`	`CopyTo(rel, binary, oids, fp, delim, null_print);`
`383`	`397`	`}`