aniani/ezstream
1
0
Fork 0
mirror of https://gitlab.xiph.org/xiph/ezstream.git synced 2024-11-03 04:17:18 -05:00
Code

Replace geteuid() check with stat(), and make it an error if the configuration

Browse Source 
file is group or world writeable. This is actually what the warning about root
was all about.


git-svn-id: https://svn.xiph.org/trunk/ezstream@12590 0101bb08-14d6-0310-b084-bc0e0c8e3800
This commit is contained in:
moritz 2007-02-28 15:35:07 +00:00
parent 159ebfdd91
commit 1712f4f88f
2 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.in
View File

@ -63,7 +63,7 @@ AC_CHECK_HEADERS(sys/time.h paths.h signal.h)
dnl LIBRARY FUNCTIONS
AC_CHECK_LIB(gen, basename)
AC_CHECK_FUNCS(arc4random geteuid gettimeofday random srandomdev)
AC_CHECK_FUNCS(arc4random gettimeofday random srandomdev stat)
AC_REPLACE_FUNCS(getopt strlcat strlcpy)
if test x"$ac_cv_header_signal_h" = "xyes"; then
AC_CHECK_FUNCS([sigaction], [

38
src/ezstream.c
View File

@ -25,6 +25,9 @@
#ifdef HAVE_SYS_TYPES_H
# include <sys/types.h>
#endif
#ifdef HAVE_SYS_STAT_H
# include <sys/stat.h>
#endif
#ifdef HAVE_SYS_TIME_H
# include <sys/time.h>
#endif
@ -825,14 +828,6 @@ main(int argc, char *argv[])
qFlag = 0;
vFlag = 0;
#ifdef HAVE_GETEUID
if (geteuid() == 0) {
printf("WARNING: You should not run %s as root. It can run other programs, which\n",
__progname);
printf(" may cause serious security problems.\n");
}
#endif
while ((c = getopt(argc, argv, "c:hqv")) != -1) {
switch (c) {
case 'c':
@ -870,16 +865,35 @@ main(int argc, char *argv[])
} else {
/*
* Attempt to open configFile here for a more meaningful error
* message.
* message. Where possible, do it with stat() and check for
* safe config file permissions.
*/
FILE *tmp;
#ifdef HAVE_STAT
struct stat st;
if (stat(configFile, &st) == -1) {
printf("%s: %s\n", configFile, strerror(errno));
usage();
return (2);
}
if (vFlag && (st.st_mode & (S_IRGRP | S_IROTH)))
printf("%s: Warning: %s is group and/or world readable.\n",
__progname, configFile);
if (st.st_mode & (S_IWGRP | S_IWOTH)) {
printf("%s: Error: %s is group and/or world writeable.\n",
__progname, configFile);
return (2);
}
#else
FILE *tmp;
if ((tmp = fopen(configFile, "r")) == NULL) {
printf("%s: %s\n", configFile, strerror(errno));
usage();
return (2);
} else
fclose(tmp);
}
fclose(tmp);
#endif /* HAVE_STAT */
}
if (!parseConfig(configFile))