Bug #21531 file_exists() and other filestat functions throw errors when in safe...

Extended php_checkuid function to add "flags" field via rename to php_checkuid_ex with alias for BC in functions that do want safe mode errors thrown.

diff --git a/ext/standard/filestat.c b/ext/standard/filestat.c
index 67313eff129f7c3a905c28f00f3f346d74f25947..349e4222d8811fcf5ac46483bbb57da84378f3bd 100644 (file)
--- a/ext/standard/filestat.c
+++ b/ext/standard/filestat.c
@@ -564,7 +564,7 @@ static void php_stat(const char *filename, php_stat_len filename_length, int typ
        char *stat_sb_names[13]={"dev", "ino", "mode", "nlink", "uid", "gid", "rdev",
                              "size", "atime", "mtime", "ctime", "blksize", "blocks"};
 
-       if (PG(safe_mode) &&(!php_checkuid(filename, NULL, CHECKUID_CHECK_FILE_AND_DIR))) {
+       if (PG(safe_mode) &&(!php_checkuid_ex(filename, NULL, CHECKUID_CHECK_FILE_AND_DIR, IS_EXISTS_CHECK(type) ? CHECKUID_NO_ERRORS : 0))) {
                RETURN_FALSE;
        }
 

diff --git a/main/safe_mode.c b/main/safe_mode.c
index a51c05dd2a883a8325cf7f54235aac7662000286..c778b71a92b27850958fea1d87c5814f565399a8 100644 (file)
--- a/main/safe_mode.c
+++ b/main/safe_mode.c
@@ -44,7 +44,7 @@
  * 5 - only check file
  */
 
-PHPAPI int php_checkuid(const char *filename, char *fopen_mode, int mode)
+PHPAPI int php_checkuid_ex(const char *filename, char *fopen_mode, int mode, int flags)
 {
        struct stat sb;
        int ret, nofile=0;
@@ -85,12 +85,16 @@ PHPAPI int php_checkuid(const char *filename, char *fopen_mode, int mode)
                ret = VCWD_STAT(path, &sb);
                if (ret < 0) {
                        if (mode == CHECKUID_DISALLOW_FILE_NOT_EXISTS) {
-                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to access %s", filename);
+                               if (flags & CHECKUID_NO_ERRORS == 0) {
+                                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to access %s", filename);
+                               }
                                return 0;
                        } else if (mode == CHECKUID_ALLOW_FILE_NOT_EXISTS) {
-                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to access %s", filename);
+                               if (flags & CHECKUID_NO_ERRORS == 0) {
+                                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to access %s", filename);
+                               }
                                return 1;
-                       }
+                       } 
                        nofile = 1;
                } else {
                        uid = sb.st_uid;
@@ -129,7 +133,9 @@ PHPAPI int php_checkuid(const char *filename, char *fopen_mode, int mode)
                /* check directory */
                ret = VCWD_STAT(path, &sb);
                if (ret < 0) {
-                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to access %s", filename);
+                       if (flags & CHECKUID_NO_ERRORS == 0) {
+                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to access %s", filename);
+                       }
                        return 0;
                }
                duid = sb.st_uid;
@@ -162,15 +168,21 @@ PHPAPI int php_checkuid(const char *filename, char *fopen_mode, int mode)
                gid = dgid;
                filename = path;
        }
-       
-       if (PG(safe_mode_gid)) {
-               php_error_docref(NULL TSRMLS_CC, E_WARNING, "SAFE MODE Restriction in effect.  The script whose uid/gid is %ld/%ld is not allowed to access %s owned by uid/gid %ld/%ld", php_getuid(), php_getgid(), filename, uid, gid);
-       } else {
-               php_error_docref(NULL TSRMLS_CC, E_WARNING, "SAFE MODE Restriction in effect.  The script whose uid is %ld is not allowed to access %s owned by uid %ld", php_getuid(), filename, uid);
-       }                       
+
+       if (flags & CHECKUID_NO_ERRORS == 0) {
+               if (PG(safe_mode_gid)) {
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "SAFE MODE Restriction in effect.  The script whose uid/gid is %ld/%ld is not allowed to access %s owned by uid/gid %ld/%ld", php_getuid(), php_getgid(), filename, uid, gid);
+               } else {
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "SAFE MODE Restriction in effect.  The script whose uid is %ld is not allowed to access %s owned by uid %ld", php_getuid(), filename, uid);
+               }                       
+       }
+
        return 0;
 }
 
+PHPAPI int php_checkuid(const char *filename, char *fopen_mode, int mode) {
+       return php_checkuid_ex(filename, fopen_mode, mode, 0);
+}
 
 PHPAPI char *php_get_current_user()
 {

diff --git a/main/safe_mode.h b/main/safe_mode.h
index 307c55707845ee66e8822c74a6f23423b66b8575..d6330accd57ac5c7dfe726e515aeec2c5069e727 100644 (file)
--- a/main/safe_mode.h
+++ b/main/safe_mode.h
@@ -9,7 +9,11 @@
 #define CHECKUID_CHECK_MODE_PARAM 4
 #define CHECKUID_ALLOW_ONLY_FILE 5
 
+/* flags for php_checkuid_ex() */
+#define CHECKUID_NO_ERRORS     0x01
+
 extern PHPAPI int php_checkuid(const char *filename, char *fopen_mode, int mode);
+extern PHPAPI int php_checkuid_ex(const char *filename, char *fopen_mode, int mode, int flags);
 extern PHPAPI char *php_get_current_user(void);
 
 #endif