Merge lp:~schuster/mysql-proxy/filemode into lp:mysql-proxy

[Michael Schuster]

[Jan Kneschke (jan-kneschke)]

chassis.c: In function 'main_cmdline':
chassis.c:509: warning: implicit declaration of function 'chassis_filemode_check'

chassis-filemode.c: In function 'chassis_filemode_check':
chassis-filemode.c:44: warning: implicit declaration of function 'strerror'
chassis-filemode.c:44: warning: format '%s' expects type 'char *', but argument 6 has type 'int'

review: Needs Fixing

[Jan Kneschke (jan-kneschke)]

> chassis.c: In function 'main_cmdline':
> chassis.c:509: warning: implicit declaration of function
> 'chassis_filemode_check'
>
> chassis-filemode.c: In function 'chassis_filemode_check':
> chassis-filemode.c:44: warning: implicit declaration of function 'strerror'
> chassis-filemode.c:44: warning: format '%s' expects type 'char *', but
> argument 6 has type 'int'

... which leads to:

Program received signal EXC_BAD_ACCESS, Could not access memory.
Reason: KERN_INVALID_ADDRESS at address: 0x00000000824d2df0
0x00007fff82390cc0 in strlen ()
...
#6 0x00000001000398d4 in g_log ()
#7 0x00000001000016e9 in chassis_filemode_check (filename=0x100001906 "/tmp/a_non_existent_file") at ../../src/chassis-filemode.c:44
#8 0x00000001000013e7 in test_file_permissions () at check_chassis_filemode.c:48
...

[lp:~schuster/mysql-proxy/filemode]

923. By Michael Schuster on 2009-12-09

fix for minor items

[Jan Kneschke (jan-kneschke)]

with the fixes from r923 this is approved.

review: Approve

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2009-11-24 11:47:17 +0000
+++ src/CMakeLists.txt	2009-12-09 14:44:10 +0000
@@ -27,6 +27,7 @@
 	chassis-mainloop.c
 	chassis-keyfile.c
 	chassis-path.c
+	chassis-filemode.c
 	chassis-limits.c
 	chassis-stats.c
 	chassis-timings.c
@@ -162,6 +163,7 @@
 	chassis-keyfile.h
 	chassis-mainloop.h
 	chassis-path.h
+	chassis-filemode.h
 	chassis-limits.h
 	chassis-event-thread.h
 	glib-ext.h

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2009-11-25 21:29:36 +0000
+++ src/Makefile.am	2009-12-09 14:44:10 +0000
@@ -15,7 +15,7 @@
 bin_PROGRAMS            = mysql-binlog-dump mysql-myisam-dump mysql-proxy
 endif
 
-mysql_proxy_SOURCES		= chassis.c 
+mysql_proxy_SOURCES		= chassis.c
 mysql_proxy_CPPFLAGS	= $(BUILD_CPPFLAGS)
 mysql_proxy_CFLAGS		= $(BUILD_CFLAGS)
 mysql_proxy_LDADD		= $(BUILD_LDADD)
@@ -58,6 +58,7 @@
 	chassis-event-thread.c \
 	chassis-keyfile.c \
 	chassis-path.c \
+	chassis-filemode.c \
 	chassis-limits.c \
 	chassis-stats.c
 
@@ -110,6 +111,7 @@
 	chassis-keyfile.h \
 	chassis-mainloop.h \
 	chassis-path.h \
+	chassis-filemode.h \
 	chassis-limits.h \
 	chassis-event-thread.h \
 	glib-ext.h \

=== added file 'src/chassis-filemode.c'
--- src/chassis-filemode.c	1970-01-01 00:00:00 +0000
+++ src/chassis-filemode.c	2009-12-09 14:44:10 +0000
@@ -0,0 +1,67 @@
+/* $%BEGINLICENSE%$
+ Copyright (C) 2009 MySQL AB, 2009 Sun Microsystems, Inc
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; version 2 of the License.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+ $%ENDLICENSE%$ */
+ 
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <errno.h>
+#include <string.h>
+
+#include <gmodule.h>
+
+/*
+ * check whether the given filename points to a file the permissions
+ * of which are 0 for group and other (ie read/writable only by owner).
+ * return 0 for "OK", -1 of the file cannot be accessed or is the wrong
+ * type of file, and 1 if permissions are wrong
+ *
+ * since Windows has no concept of owner/group/other, this function
+ * just return 0 for windows
+ *
+ * FIXME? this function currently ignores ACLs
+ */
+int
+chassis_filemode_check(gchar *filename)
+{
+#ifndef _WIN32
+	struct stat stbuf;
+	mode_t		fmode;
+	
+	if (stat(filename, &stbuf) == -1) {
+		g_critical("%s: cannot stat %s: %s", G_STRLOC, filename, 
+				strerror(errno));
+		return -1;
+	}
+
+	fmode = stbuf.st_mode;
+	if ((fmode & S_IFMT) != S_IFREG) {
+		g_critical("%s: %s is not a regular file", G_STRLOC, filename);
+		return -1;
+	}
+
+#define MASK (S_IROTH|S_IWOTH|S_IXOTH)
+
+	if ((fmode & MASK) != 0) {
+		g_critical("%s: %s permissions not secure", G_STRLOC, filename);
+		return 1;
+	}
+	
+#undef MASK
+
+#endif /* _WIN32 */
+	return 0;
+}

=== added file 'src/chassis-filemode.h'
--- src/chassis-filemode.h	1970-01-01 00:00:00 +0000
+++ src/chassis-filemode.h	2009-12-09 14:44:10 +0000
@@ -0,0 +1,28 @@
+/* $%BEGINLICENSE%$
+ Copyright (C) 2009 MySQL AB, 2009 Sun Microsystems, Inc
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; version 2 of the License.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+ $%ENDLICENSE%$ */
+ 
+
+#ifndef _CHASSIS_PERM_H_
+#define _CHASSIS_PERM_H_
+
+#include <glib.h>
+#include "chassis-exports.h"
+
+CHASSIS_API int chassis_filemode_check(gchar *filename);
+
+#endif

=== modified file 'src/chassis.c'
--- src/chassis.c	2009-11-27 10:15:08 +0000
+++ src/chassis.c	2009-12-09 14:44:10 +0000
@@ -79,6 +79,7 @@
 #include "chassis-mainloop.h"
 #include "chassis-path.h"
 #include "chassis-limits.h"
+#include "chassis-filemode.h"
 
 #ifdef _WIN32
 static char **shell_argv;
@@ -506,6 +507,11 @@
 	}
 
 	if (default_file) {
+		if (chassis_filemode_check(default_file) != 0) {
+			exit_code = EXIT_FAILURE; 
+			exit_location = G_STRLOC;
+			goto exit_nicely;
+		}
 		keyfile = g_key_file_new();
 		g_key_file_set_list_separator(keyfile, ',');
 

=== modified file 'tests/unit/CMakeLists.txt'
--- tests/unit/CMakeLists.txt	2009-11-25 21:37:02 +0000
+++ tests/unit/CMakeLists.txt	2009-12-09 14:44:10 +0000
@@ -93,6 +93,16 @@
 	${WINSOCK_LIBRARIES}
 )
 
+ADD_EXECUTABLE(check_chassis_filemode
+	check_chassis_filemode.c 
+	../../src/chassis-filemode.c 
+)
+
+TARGET_LINK_LIBRARIES(check_chassis_filemode
+	${GLIB_LIBRARIES}
+	${GTHREAD_LIBRARIES}
+)
+
 ADD_EXECUTABLE(t_network_injection
 	t_network_injection.c 
 	../../src/network-injection.c 
@@ -129,8 +139,11 @@
 
 IF(WIN32)
 # turn off _declspec(dllimport) in tests, since we link statically
-set_property(TARGET check_chassis_log check_plugin check_mysqld_proto check_loadscript check_chassis_path t_network_injection t_network_backend
-             APPEND PROPERTY COMPILE_DEFINITIONS "mysql_chassis_proxy_STATIC" COMPILE_DEFINITIONS "mysql_chassis_STATIC")
+set_property(TARGET check_chassis_log check_plugin check_mysqld_proto
+	check_loadscript check_chassis_path check_chassis_filemode
+	t_network_injection t_network_backend
+		APPEND PROPERTY COMPILE_DEFINITIONS "mysql_chassis_proxy_STATIC"
+		COMPILE_DEFINITIONS "mysql_chassis_STATIC")
 ENDIF(WIN32)
 
 ## adding all tests
@@ -141,6 +154,7 @@
 #ADD_TEST(check_sql_tokenizer check_sql_tokenizer)
 ADD_TEST(check_loadscript check_loadscript)
 ADD_TEST(check_chassis_path check_chassis_path)
+ADD_TEST(check_chassis_filemode check_chassis_filemode)
 ADD_TEST(t_network_injection t_network_injection)
 ADD_TEST(t_network_backend t_network_backend)
 

=== modified file 'tests/unit/Makefile.am'
--- tests/unit/Makefile.am	2009-11-26 12:35:27 +0000
+++ tests/unit/Makefile.am	2009-12-09 14:44:10 +0000
@@ -13,9 +13,20 @@
 	t_network_mysqld_packet \
 	t_network_mysqld_masterinfo \
 	t_chassis_timings \
+	check_chassis_filemode \
 	check_chassis_path
 
 check_PROGRAMS=$(TESTS)
+
+check_chassis_filemode_SOURCES = check_chassis_filemode.c \
+	$(top_srcdir)/src/chassis-filemode.c
+
+check_chassis_filemode_CPPFLAGS = \
+	-I$(top_srcdir)/src/ $(GLIB_CFLAGS) -I$(top_srcdir) \
+	$(MYSQL_CFLAGS)
+
+check_chassis_filemode_LDADD = $(GLIB_LIBS) $(GTHREAD_LIBS)
+
 check_sql_tokenizer_SOURCES  = check_sql_tokenizer.c \
 	$(top_srcdir)/lib/sql-tokenizer.l \
 	$(top_srcdir)/src/glib-ext.c

=== added file 'tests/unit/check_chassis_filemode.c'
--- tests/unit/check_chassis_filemode.c	1970-01-01 00:00:00 +0000
+++ tests/unit/check_chassis_filemode.c	2009-12-09 14:44:10 +0000
@@ -0,0 +1,86 @@
+/* $%BEGINLICENSE%$
+ Copyright (C) 2009 MySQL AB, 2009 Sun Microsystems, Inc
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; version 2 of the License.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+ $%ENDLICENSE%$ */
+
+/** @addtogroup unittests Unit tests */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/stat.h>
+#include <sys/param.h>
+#include <fcntl.h>
+
+#include <glib.h>
+
+#include "chassis-filemode.h"
+
+#if GLIB_CHECK_VERSION(2, 16, 0)
+
+#define TOO_OPEN	0666
+#define GOOD_PERMS	0660
+/**
+ * @test 
+ */
+void test_file_permissions(void)
+{
+	char filename[MAXPATHLEN] = "/tmp/permsXXXXX";
+	int	 fd;
+	
+	g_log_set_always_fatal(G_LOG_FATAL_MASK);
+
+	/* 1st test: non-existent file */
+	g_assert_cmpint(chassis_filemode_check("/tmp/a_non_existent_file"), ==, -1);
+
+	fd = mkstemp(filename);
+
+	/* 2nd test: too permissive */
+	chmod(filename, TOO_OPEN);
+	g_assert_cmpint(chassis_filemode_check(filename), ==, 1);
+
+	/* 3rd test: OK */
+	chmod(filename, GOOD_PERMS);
+	g_assert_cmpint(chassis_filemode_check(filename), ==, 0);
+
+	/* 4th test: non-regular file */
+	close (fd);
+	remove(filename);
+	mkdir(filename, GOOD_PERMS);
+	g_assert_cmpint(chassis_filemode_check(filename), ==, -1);
+
+	/* clean up */
+	rmdir(filename);
+}
+/*@}*/
+
+int main(int argc, char **argv) {
+	g_thread_init(NULL);
+
+	
+	g_test_init(&argc, &argv, NULL);
+	g_test_bug_base("http://bugs.mysql.com/");
+	
+	g_test_add_func("/core/basedir/fileperm", test_file_permissions);
+	
+	return g_test_run();
+}
+#else
+int main() {
+	return 77;
+}
+#endif